Commit Graph

111 Commits

Author SHA1 Message Date
Tim Almdal
82edd2a37b This patch adds some security to the organize dialog.
1) If images are dragged from the content pane and dropped on a branch in the
   tree that the user only has view priviledges, then the drop is cancelled
   and the images are reverted.
2) The user cannot click on a branch, to which they only have view priviledges,
   the content pane does not change to the new album
2009-08-17 19:52:40 -07:00
Tim Almdal
6f6d5b306b remove the batch start/stop and replace the ORM update of the weight, with a direct sql update. This bypasses the gallery3 event mechanism. Fire a album_rearrange event when the rearrangement is complete 2009-08-17 12:56:05 -07:00
Tim Almdal
69d1b16818 Change back to using the ORM to update the child weight, but use the batch::start() method so notifications are queued 2009-08-17 12:32:33 -07:00
Tim Almdal
5e9c602b09 Fix the performance problem related to setting the child weight, by bypassing ORM and generating the sql directly. 2009-08-17 11:46:10 -07:00
Tim Almdal
dd9f4b6d7f The rearrange functionality works. but it is slower than shit. I've left the debug statements in until we can solve this issue. 2009-08-17 08:49:37 -07:00
Tim Almdal
5f546050d1 The progress bar appears during a move. Still having an issue with unable to do a single select after a drop operation. I think its related to needing to destroy the existing selectable before creating the new one. The error I get is "this._selection[i].data("selectabe-item") is undefined." 2009-08-16 16:20:43 -07:00
Tim Almdal
76f320ab3d In this patch, drag now works to the album tree, but the progress bar is not
showing. As well fixed a problem where selectable single clink no longer
worked when the album was reloaded.
2009-08-16 12:36:14 -07:00
Tim Almdal
eeae2dc56c Added javascript portion of the drop functionality. At this point you can drag selected images and drop them on the micro thumb grid in a different position or onto a branch in the gallery tree. No ajax call is made, it just writes the generated url and post data to the console, so it only works in ff right now. 2009-08-13 21:31:20 -07:00
Tim Almdal
d758266fab Add a visual indicator of the insertion point 2009-08-13 18:58:40 -07:00
Tim Almdal
5a84df9ac5 Vertical scrolling of the thumb grid seems to work better now. Wasn't able to get the draggable autoscrolling working, so this is a poor replacemment. 2009-08-13 10:56:50 -07:00
Tim Almdal
3823f65dfb Implement the first part of drag functionality. Having trouble getting visual feedback of the drop position between thumbnails, so this commit provides a checkpoint for trying various options 2009-08-12 21:55:25 -07:00
Tim Almdal
39d0098038 Enable microthumbnail selection 2009-08-09 09:00:10 -07:00
Tim Almdal
1c5b04a2c5 Fix the problem where the login page and edit permission pages were
supersized based on ly last commit.
2009-08-08 16:26:34 -07:00
Tim Almdal
685b1ddf88 Enhance how the organize dialog degrades if the browser window is not optimal 2009-08-07 21:40:35 -07:00
Tim Almdal
7b0ea229b8 Make the organize dialog open properly in IE8, Chrome and FF. For some reason (probably a timing thing) the height of the contents was not being set correctly in FF. So we just hard code an estimate of the size of the Draw handle, and message areas. 2009-08-07 17:07:04 -07:00
Bharat Mediratta
a245c57400 Further streamline the code.
Organize_Controller:
* Remove unnecessary constants
* Rename index() to dialog()
* Simplify _get_micro_thumb_grid

organize.js:
* Move sizing code in here from organize_dialog.html.php

organize_dialog.html.php:
* Move CSS and JS links in here so that we only load them when we need them.
* Move sizing code into organize.js

organize_thumb_grid.html.php:
* Move pagination logic in here, since it's view centric
* Collapse the css class determination code and inline it
2009-08-06 21:52:23 -07:00
Bharat Mediratta
d3f4643699 * Rename setContents -> show_album to be consistent style wise (no camel
caps) and more explicit about what it's doing.
* use toggleClass() to simplify the +/- css management.
2009-08-06 21:02:22 -07:00
Bharat Mediratta
6e4023a720 Fix indentation. 2009-08-06 16:16:11 -07:00
Tim Almdal
794a7a5abf Leverage the gallery.dialog/js functionality in order to reduce duplicate code 2009-08-06 14:55:03 -07:00
Tim Almdal
7ed15ea481 Remove 6 more lines by removing the generalization of the close dialog processing 2009-08-06 10:03:38 -07:00
Tim Almdal
d7c7a06efe Remove the complicated calculation to determine the height of the
micro thumb grid, by setting all the parent elements to 100% in the
css and then subtract the height of the button bar
2009-08-06 09:46:39 -07:00
Tim Almdal
7bdf382e81 Revert "Revert "Revert "Allow a theme to override the page refresh mechanism. Create a new"""
This reverts commit 7b1cca168c.

Basically remove it and Bharat and I will fight it out in SF for a resolution :-)
2009-08-06 07:02:41 -07:00
Tim Almdal
8131e6fa38 Tighten up the code by loading all the albums in the tree at once, removing
the events to populate the button bar.
2009-08-06 06:33:17 -07:00
Tim Almdal
cab46cf038 Remove the resize dialog on window resize functionality 2009-08-05 22:28:37 -07:00
Tim Almdal
a03f8b1003 Fix up formatting of items in thumbgrid 2009-08-05 16:45:44 -07:00
Tim Almdal
824a80b0d4 Change the content pane based on the selection in the album tree 2009-08-05 15:24:31 -07:00
Tim Almdal
a92a46b0cd Change to use the new children and children_count API 2009-08-05 11:04:42 -07:00
Tim Almdal
63f3efef37 Revert "Revert "Enable the expand/collapse of branches by clicking on the plus/minus""
This reverts commit e37526f94d.
2009-08-05 10:26:49 -07:00
Tim Almdal
65c850c393 Revert "Revert "Checkpoint the organize module rewrite. At this point, it doesn't really do""
This reverts commit 397468c47b.
2009-08-05 10:26:11 -07:00
Tim Almdal
7b1cca168c Revert "Revert "Allow a theme to override the page refresh mechanism. Create a new""
This reverts commit 9f396178ce.
2009-08-05 10:25:23 -07:00
Tim Almdal
9f396178ce Revert "Allow a theme to override the page refresh mechanism. Create a new"
This reverts commit 1f014aae6c.
2009-08-05 09:24:27 -07:00
Tim Almdal
397468c47b Revert "Checkpoint the organize module rewrite. At this point, it doesn't really do"
This reverts commit a25f08d433.
2009-08-05 09:23:32 -07:00
Tim Almdal
e37526f94d Revert "Enable the expand/collapse of branches by clicking on the plus/minus"
This reverts commit 869c3de961.
2009-08-05 09:23:01 -07:00
Tim Almdal
869c3de961 Enable the expand/collapse of branches by clicking on the plus/minus
icons.  Branches with no albums, will not have an icon.
2009-08-05 08:31:58 -07:00
Tim Almdal
a25f08d433 Checkpoint the organize module rewrite. At this point, it doesn't really do
anything, but get the dialog up, populate the album tree and intelligently
populate the micro thumb grid.
Still to do:
1) get the microthumbs laided out ptoperly
2) expand and collapse functionality in the album tree
3) use the album tree to change the content of the micro thumb grid
4) Actually add some functionality

At the moment, it supports a callback "" to allow modules to add icons
to the organize drawer label.  The close button is added outside of this
framework as it will always be last.
2009-08-03 09:19:17 -07:00
Tim Almdal
3461b4e8e6 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-28 20:49:50 -07:00
Bharat Mediratta
1e90e40d3a Use events to generate menus, instead of having xxx_menu helpers.
This is the first step towards having a simple, lightweight and
unified API for module interaction.
2009-07-28 13:47:22 -07:00
Tim Almdal
1f014aae6c Allow a theme to override the page refresh mechanism. Create a new
javascript lib (gallery.reload.js) which defines the functions
gallery_reload() and gallery_location(new_location).  They just
do a window.location.reload() and window.location = new_location.

This change breaks the assumption that all themes will handle page reloads
the same and allows the theme to customize the page refresh.
2009-07-27 12:39:12 -07:00
Bharat Mediratta
dbeadc1407 Use the Kohana cascading filesystem to locate resources loaded by the
theme.  Because the theme comes first, this means that themes can
override any module resources, at the cost that we no longer have
namespacing for JS and CSS files.

The only file getting used outside of this model is
themes/default/screen.css which is used in the admin theme.  I fixed
that by copying screen.css into admin_default and renaming its
screen.css to admin_screen.css.  I also copied over all the images
that it was referencing.

Fixes tickets #48 and #539.

Theme API changes:
- theme_script(), theme_url() and theme_css() are no longer needed
- script(), url() and css() now refer to the first matching asset in
  the module load path, where gallery3/lib is at the end of the path
2009-07-22 14:27:57 -07:00
Bharat Mediratta
050c82cf80 Escape bare & symbols so that we use valid entities. Fixes ticket #577. 2009-07-21 11:09:23 -07:00
Shai Ben-Naphtali
5a0424f458 Fix some consistency in text.
This fixes ticket #546

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-07-21 13:18:59 +08:00
Bharat Mediratta
0f766b149d Second non-trivial change to the event code. We now publish model
related events from within the model handling code.  The only
exception to this currently is item_created which is challenging
because we have to save the item using ORM_MPTT::add_to_parent()
before the object itself is fully set up.  When we get that down to
one call to save() we can publish that event from within the model
also.
2009-07-16 12:31:40 -07:00
Bharat Mediratta
5b3b675b6d Non-trivial changes to the event handling code:
1) The item_updated event no longer takes the old and new items.
   Instead we overload ORM to track the original data and make
   that available via the item.  This will allow us to move event
   publishing down into the API methods which in turn will give us
   more stability since we won't require each controller to remember
   to do it.

2) ORM class now tracks the original values.  It doesn't track
   the original relationships (no need for that, yet)

3) Added new events:
     item_deleted
     group_deleted
     user_deleted
2009-07-16 11:19:34 -07:00
Bharat Mediratta
768a1485e1 Remove references to missing organize_edit_drawer.png 2009-07-14 12:07:29 -07:00
Bharat Mediratta
8cfb067709 Revert "Remove the reference to organize.css is it is no longer used and is"
This reverts commit 31ffb82382.
2009-07-14 12:03:31 -07:00
Bharat Mediratta
e2a9a1d284 Add quotes around all values that contain spaces in them, and add a
test to make sure that we continue to do so.

This makes sure that we don't have problems with 5.3 which treats the
literal "on" as a boolean.
2009-07-13 10:36:55 -07:00
Tim Almdal
fe6320ef4c Fix for ticket #341.
Change the wording for the sort order from "Default" to "Order Added"
2009-07-10 18:11:12 -07:00
Tim Almdal
15bb52a776 Change the word "Done" to "Close" to make translations easier 2009-07-10 14:12:13 -07:00
Tim Almdal
577a56603a Remove the reference to organize.css is it is no longer used and is
producing errors in the log.
2009-07-09 10:35:51 -07:00
Tim Almdal
fcb031c2b6 Rename the get_url function in organize.js so that it doesn't collide with the
one in server_add
2009-07-04 22:47:43 -07:00