Commit Graph

169 Commits

Author SHA1 Message Date
Chad Kieffer
66e1e32f34 Removed YUI grids. Added g- prefix to selected class. Layout almost completely restored, still need to fix action-status message box 2009-10-28 23:34:53 -06:00
Chad Kieffer
e72d3532f7 Amazing what a two character change can do. It should be g-first now, not first. 2009-10-28 22:57:36 -06:00
Chad Kieffer
b118d56e9a Added type attribute to script tag. 2009-10-28 22:52:17 -06:00
Chad Kieffer
02b6366dd2 Switch instances of first to g-first. 2009-10-27 07:37:04 -07:00
Chad Kieffer
02ecf5749c Make menu label adhere to our capitalization standard. 2009-10-25 18:34:36 -06:00
Chad Kieffer
859f8dc558 Consolidated the rest of the base message styles into lib/gallery.common.css and applied updates to views. Moved over draggable/droppable styles. Use g-target consistently for drag/drop interactions. Minor re-ordering of selectors in gallery.common.css. Updates to css comments. 2009-10-07 00:21:23 -06:00
Chad Kieffer
d581bbbd1e Renamed more CSS selectors from gName to g-name. 2009-10-04 15:53:00 -06: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
Chad Kieffer
e1e8904e4a Convert gDialog and gCancel over to g-dialog and g-cancel. Refactor CSS id's and classes in the login/reset password dialog. 2009-09-30 22:49:36 -06:00
Chad Kieffer
72672bda39 Replaced gButtonLink with g-button. 2009-09-30 08:04:49 -06:00
Andy Staudacher
7608870537 Controller auth / CSRF fixes 2009-09-15 22:51:49 -07:00
Tim Almdal
5f343ab8a0 Change the variable to to resolve ticket #769 2009-09-14 08:11:12 -07:00
Tim Almdal
6c0732e16f Set the AlbumTreeContainer instead of the height. This fixes ticket #755 2009-09-13 16:24:03 -07:00
Tim Almdal
1d40c77c4c Update the organize module to use the release version of jquery Selectable. Unfortunately this does not have the functionality to select additional thumbnails using the ctrl or alt-keys, it is preferable to forking the Selectable component. This functionality should arrive with ui.jquery 1.8.x 2009-09-12 08:53:24 -07:00
Tim Almdal
25ea6085b7 Reset the margins when the mouse is over a thumbnail when dragging. When the border is displayed then adjust the margin to account for the border. Just hidding the border causes things to move. 2009-09-10 21:26:07 -07: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
b550a06045 Rename $album to $target in move_to() 2009-09-10 10:08:29 -07:00
Tim Almdal
2bbe162339 A better fix for #741... the original problem was that the source and album variables were reversed 2009-09-10 10:09:09 -07:00
Tim Almdal
bea89be268 If the current drop target is not defined, in that we have moved out of the range of the current li elements, then assume the drop is occurring at the end of the list items. Fixes #742 2009-09-10 07:59:29 -07:00
Tim Almdal
eb345cb870 Changed the check in organize_Controller::move_to:
1) check that target and source are not the same.
2) check that the source is not already a child of the target (use to be a
   descendant) Fixes #741.
2009-09-10 06:17:21 -07:00
Bharat Mediratta
9fbdcf3efd Change the module installer so that you don't need to provide your own
install() function if all you're going to do is to set the version of
the module from module.info into the database.  This means that for some
simple modules, you don't need an install.php file at all.
2009-09-05 13:39:30 -07:00
Bharat Mediratta
ab7323d17b Fix the url in the call to get subsequent entries to have the right
url, and to be json.  Fixes #719, which I introduced in my refactor.
2009-09-04 21:27:23 -07:00
Bharat Mediratta
dfb2e3dd02 Add an icon to the context menu option. 2009-08-31 23:27:46 -07:00
Bharat Mediratta
0513713fde Add 'organize album' to the context menu. 2009-08-31 21:05:21 -07:00
Bharat Mediratta
c10b5cc69c Minor refactoring. 2009-08-30 17:00:33 -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
74e204b557 Don't mark colors !important. 2009-08-30 16:17:53 -07:00
Bharat Mediratta
0dba5857fa Make comments consistent. 2009-08-30 16:16:39 -07:00
Bharat Mediratta
4593297533 Remove extra padding line 2009-08-30 16:15:54 -07:00
Bharat Mediratta
d47a4de029 Get rid of as much jitter as possible in the organize tree. 2009-08-30 16:11:28 -07:00
Bharat Mediratta
2cf52a4718 Tighten up a class attr. 2009-08-30 15:54:56 -07:00
Bharat Mediratta
6fdb5cddf8 Make the lasso more prominent and the colors consistent. 2009-08-30 15:45:35 -07:00
Bharat Mediratta
a015078cca Change the higlight/selection behavior so that we don't use opacity to
indicate selection state.  It's too difficult to tell opacity
differences on light colored photos.  This approach models what
WinXP does.
2009-08-30 15:42:43 -07:00
Bharat Mediratta
64d40397fe Simplify over-targetted CSS. 2009-08-30 15:34:47 -07:00
Bharat Mediratta
db03c5d799 Don't try to move an item into its own descendant hierarchy. Just leave it out of the move for now. 2009-08-30 15:09:13 -07:00
Bharat Mediratta
53390ba79a CSS rename: gMicroThumbXxx -> gOrganizeMicroThumbXxx to make it clear
that this is organize only.
2009-08-30 14:58:26 -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
a498d37763 remove unused #gOrganizeDialog 2009-08-30 14:49:51 -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
b833cb6073 Get rid of the task infrastructure. The multiple requests greatly
slow down simple operations.  We may run into problems with more
complex operations, but let's only add tasks into the mix when it's
clear that we need them.
2009-08-29 10:48:23 -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
Bharat Mediratta
cb2171d082 Display the sort order in the Organize dialog, and allow users to
change the sort order on the fly.
2009-08-28 14:27:37 -07:00
Bharat Mediratta
b9aca313fa Fix a couple of off-by-one errors. 2009-08-28 11:41:06 -07:00