Commit Graph

26 Commits

Author SHA1 Message Date
Chad Kieffer
fb2c365d8f Fix outstanding issues in the organize dialog. Tighten up the layout a bit so that more microthumbs will display. 2009-11-15 22:55:09 -07:00
Chad Kieffer
3e6ba7acc3 Renamed most, if not all css selectors from gName to g-name. Moved a few shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features. 2009-10-04 00:27:22 -06:00
Bharat Mediratta
752c857116 Rename ORM_MPTT::is_descendant() to ORM_MPTT::contains() to make the
API a little clearer.  Write a test for it, too.
2009-09-10 10:28:43 -07:00
Bharat Mediratta
7015948357 Merge branch 'master' of git@github.com:/gallery/gallery3 2009-08-30 16:20:52 -07:00
Andy Staudacher
e7f5e0a9a3 Merge commit 'upstream/master'
Conflicts:

	modules/gallery/views/l10n_client.html.php
	modules/organize/views/organize_tree.html.php
	modules/server_add/helpers/server_add_event.php
2009-08-30 18:27:40 -07:00
Bharat Mediratta
2cf52a4718 Tighten up a class attr. 2009-08-30 15:54:56 -07:00
Bharat Mediratta
5cce88cd04 Rename gAlbumText to gOrganizeAlbumText for consistency since this is
an organize-only construct.
2009-08-30 14:50:53 -07:00
Bharat Mediratta
c615918829 Manage the selection so we don't automatically select an album
whenever we expand a tree.
2009-08-30 14:40:55 -07:00
Bharat Mediratta
d1ade6620e Precalculate the organize tree based on the selected album and render
it right away while still allowing incremental tree loading.
2009-08-30 14:35:27 -07:00
Andy Staudacher
b9bd1681a3 Update all code to use helper method html::clean(), html::purify(), ... instead of SafeString directly. 2009-08-29 22:54:20 -07:00
Bharat Mediratta
483d8df91b Change the organize tree to expand/collapse. It doesn't properly open
up to the album that you're viewing, and if you move a photo to a
different album it'll reload the entire album tree.
2009-08-29 16:33:22 -07:00
Andy Staudacher
c4d5ecde66 L10n fixes for the admin_languages page, and JS/XSS cleanup of the organize views. 2009-08-29 14:38:47 -07:00
Bharat Mediratta
775987dff9 Fix a bug where organize doesn't properly generate the tree at the root album. 2009-08-29 11:29:38 -07:00
Bharat Mediratta
4408ed0684 Remove stray blank line. 2009-08-29 10:56:35 -07:00
Bharat Mediratta
f257cd3d69 Major refactor of organize:
* Clean up naming conventions for variables in the controller
  so that we specifically refer to albums with $album_id, etc.

* Move complexity for drawing tree out of the controller and into
  the view.

* Simplify task definitions to get rid of extraneous text

* Change __PLACEHOLDERS__ to clearly define which is the album
  and which is the item that we're moving before/after

* Remove as many CSS ids as we can from the tree view to keep
  things simple
2009-08-29 10:00:47 -07:00
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
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
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
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
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
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
f1cb43430b First iteration of the organize functionality (orginally called bulk
edit).  There is limited functionality in no edits work.  This is
primary a chance for the team to review the ui.  It is in a separate
module to isolate the changes.  Eventually, it will be moved back into core.
2009-04-03 00:50:43 +00:00