Bharat Mediratta
e1e2d9448f
Merge branch 'master' into organize_dev
2011-01-07 20:29:06 -08:00
Bharat Mediratta
edcb3b6656
Make the CSS for the organize menu consistently g-organize-link. Fixes #1070 .
2011-01-07 20:23:49 -08:00
Bharat Mediratta
85ae320288
Keep Item_Model::scale_dimensions from upscaling. Fixes #1579 .
2011-01-07 20:18:24 -08:00
Bharat Mediratta
4756db435c
Minor style cleanup
2011-01-07 20:09:27 -08:00
Bharat Mediratta
e4c6662dae
Merge branch 'master' of git://github.com/ckieffer/gallery3
2011-01-07 20:03:26 -08:00
Joe7
e86e8b8bd1
Added missing spaces (manual merging from 0d36b97aca3b5ed53ea3ea398ce28b0f6198e577)
2011-01-07 17:53:37 +01:00
Joe7
5bfb7fb96a
Added batch importer for groups
...
Added missing ordering for comments and tags retrieving queries
(One might gets the same output without ordering especially if column is the primary key, but the only way to go for sure it by setting it)
2011-01-07 17:52:12 +01:00
Joe7
c338d3138e
Importing Gallery2 users in batches
...
Fixes Ticket #1554
2011-01-07 17:51:21 +01:00
Joe7
f2477703fa
Fix against ticket #1581 - based on https://github.com/Joe7/gallery3/commit/0d36b97aca3b5ed53ea3ea398ce28b0f6198e577
2011-01-07 17:33:37 +01:00
Bharat Mediratta
89597e7e70
Add a spinner to the dialog when loading the iframe so that it's not
...
just a blank dialog. Create separate CSS for dialog vs. frame.
Don't show the Loading message for the first load.
2011-01-06 23:43:26 -08:00
Bharat Mediratta
24b8e9b060
Make the sort column combobox wider.
2011-01-06 23:15:07 -08:00
Bharat Mediratta
8ece1e3a19
Create a custom bundle of ExtJS for organize. It's 18% smaller, but
...
still pretty large.
2011-01-06 23:10:42 -08:00
Bharat Mediratta
0c9dbc9663
Adjust CSS for IE compatibility while keeping the grid tight on non-IE.
2011-01-06 21:40:16 -08:00
Chad Kieffer
06d94065ce
Updates per Bharat's pull request review. Renamed info_block_metadata event to info_block_get_metadata.
2011-01-06 21:03:19 -07:00
Chad Kieffer
a897a9d53f
Also missed commiting this in a1e3b1ed17.
2011-01-06 21:00:28 -07:00
Chad Kieffer
740a6531fc
Missed this commiting this in a1e3b1ed17.
2011-01-06 20:57:56 -07:00
Bharat Mediratta
600e04b58c
Lock the drag zone if the album is not editable so that users don't
...
start illegal drags.
2011-01-06 12:02:17 -08:00
Bharat Mediratta
fc6907dcfe
Switch back to setting nodes as leaves, but fix the drop zone code to
...
allow dropping on leaves.
2011-01-06 11:46:15 -08:00
Bharat Mediratta
9682b7ea6e
Remove unnecessary leaf param from TreeNode results.
2011-01-06 09:59:08 -08:00
Bharat Mediratta
0abd77c9e5
Fix typo.
2011-01-06 09:58:21 -08:00
Bharat Mediratta
7600e22433
Whitespace fix.
2011-01-06 09:58:14 -08:00
Bharat Mediratta
514d5affa6
When generating the tree, don't mark nodes with no children as a leaf
...
because that confuses the TreeDropZone JS into thinking that it can't
ever have children.
2011-01-06 09:49:37 -08:00
Bharat Mediratta
84f287865e
Don't allow moving an item into its own hierarchy. Just silently skip
...
those sources for now.
2011-01-06 08:17:01 -08:00
Bharat Mediratta
56c4997663
Merge branch 'organize_dev' of github.com:gallery/gallery3 into organize_dev
2011-01-06 08:12:54 -08:00
Bharat Mediratta
84f73fbe9e
Merge branch 'master' into organize_dev
2011-01-06 00:14:59 -08:00
Bharat Mediratta
edf2a46b02
horizontally center thumbnails
2011-01-06 00:05:35 -08:00
Bharat Mediratta
9e6e2138df
Only mask the data view on changes, it's a little less jarring.
2011-01-05 23:55:21 -08:00
Bharat Mediratta
33b8ec7a62
Add a label for the sort order
2011-01-05 23:47:14 -08:00
Bharat Mediratta
b424cac5c5
Double clicking on an album switches to that album, selects it in the
...
tree and expands it if it's not already expanded.
2011-01-05 22:48:27 -08:00
Bharat Mediratta
2167168f51
Get rid of the expando caret in front of empty folders
2011-01-05 22:32:33 -08:00
Bharat Mediratta
aebcd44513
Swap organize_frame and organize_dialog since they were semantically
...
reversed. organize_dialog contains the stuff that pops up in the dialog,
organize_frame contains the stuff that's in the embedded iframe.
2011-01-05 22:19:33 -08:00
Bharat Mediratta
e6b3886f8f
Functional improvements:
...
- Add support for dragging a selection box.
Visual improvements;
- The "ghost" selection now has minimized thumbnails so that
you're dragging a smaller div around the screen.
2011-01-05 22:15:13 -08:00
Bharat Mediratta
9863743001
Only refresh the tree when we move albums around.
2011-01-05 21:22:41 -08:00
Bharat Mediratta
ce70669b8f
Visual tweaks for IE8 compatibility.
...
Set the min width and min height to what IE8 wants the thumbnail's box
to be when the inner image maxes out at 120 pixels (specified in
Organize_Controller::album_info()).
Avoid using inline-block.
2011-01-05 21:17:27 -08:00
Bharat Mediratta
e2b0f92007
Keep Item_Model::scale_dimensions from upscaling. Fixes #1579 .
2011-01-05 21:05:20 -08:00
Bharat Mediratta
b8124efbd8
Refactor generic error handling code. It still shows a pretty lame error message.
...
Add a comment explaining the TreeLoader preload hack.
2011-01-05 20:37:14 -08:00
Bharat Mediratta
28760daaef
Improve IE grid compatibility by forcing a regular width/height for
...
thumbnails and using float: left.
2011-01-05 20:11:32 -08:00
Chad Kieffer
a1e3b1ed17
Added info module show metadata options and set all to true. Admins may turn off display of items from the Advanced Settings list.
2011-01-05 16:00:35 -07:00
Bharat Mediratta
372905bd13
Support moving an item before or after the target.
2011-01-05 02:00:40 -08:00
Bharat Mediratta
c590f881eb
single -> double quotes.
2011-01-05 01:25:17 -08:00
Bharat Mediratta
3a11e0d825
This was left out of 31652eae44.
2011-01-04 22:21:02 -08:00
Bharat Mediratta
bd5e71ba6a
More drag/drop tweaks.
...
- Fix a bug in the prior commit where we could no longer drag/drop in
the thumb_data_view.
- Change the CSS class when dropping items in the tree panel to be a
check box, not a plus symbol.
2011-01-04 22:20:24 -08:00
Bharat Mediratta
31652eae44
Drag/drop improvements:
...
- Restrict drag and drop to albums where the user has edit permissions.
- Use the existing TreeDropZone instead of making a new DropZone to take
advantage of TreeDropZone features.
- Properly use dropConfig in TreePanel.
2011-01-04 22:00:30 -08:00
Chad Kieffer
2e5d4a59b1
Display an item's tags in the info block.
2011-01-04 19:52:25 -07:00
Chad Kieffer
1d2e583c31
Pass the whole item, not just it's ID, to the info_block_metadata event.
2011-01-04 19:25:02 -07:00
Chad Kieffer
e921c3c5b5
Merge branch 'master' of git://github.com/gallery/gallery3
2011-01-04 15:59:26 -07:00
Chad Kieffer
dbff45cc91
Add an info_block_metadata event to allow other modules to add to the item info block.
2011-01-04 15:56:16 -07:00
Bharat Mediratta
b692d55ad4
Convert "\w-" in regexes to "\w\-" for compatibility with some versions
...
of Chrome 10.x.
references:
http://www.sencha.com/forum/showthread.php?117836-3.3.1-Invalid-regular-expression
http://code.google.com/p/v8/source/detail?r=5911
http://trac.webkit.org/changeset/73594
http://codereview.chromium.org/5703001/
This change has been reverted in Chrome, and the regex was fixed in ExtJS so
this patch should be short lived.
2011-01-04 11:50:25 -08:00
Bharat Mediratta
caf454f326
Add missing images
2011-01-04 00:15:56 -08:00
Bharat Mediratta
51d66df192
Switch to using Ext.Element.mask for a custom busy message that looks
...
a little cleaner.
2011-01-04 00:15:05 -08:00
Bharat Mediratta
Joe7
Chad Kieffer