stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-21 03:49:21 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,441 Commits 4 Branches 0 Tags
b184f995f8a9db78b0603a7c19e44f4e26d605cb
Commit Graph

3441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Almdal
b184f995f8 Correct indentation 2009-08-19 06:12:29 -07:00
Tim Almdal
bc42df35ee Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-19 05:14:05 -07:00
Chad Kieffer
3b8323d5b4 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-18 23:08:32 -06:00
Tim Almdal
2ac916783a Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-18 18:48:17 -07:00
Bharat Mediratta
67d770fb2a Don't call dirname() on the toolkit dir, it's already a directory! (Thanks Kaare) 2009-08-18 13:48:00 -07:00
Tim Almdal
6e054273f3 Change the setting of page type from "item" to "photo". Thre is no page type 
of item.  All other references use photo for non album and non dynamic pages.
 2009-08-18 08:40:52 -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
848c5439b3 Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-17 16:12:37 -07:00
Tim Almdal
24d7f5df8c Refactor the get maximum weight functionality into a method in the item helper, so that we can use it else where (i.e. the new organize module) 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-18 05:21:17 +08:00
Tim Almdal
afa8cade7f Fix for ticket #590. The gallery.dialog.js looks for an element "#dialog #gProgress" and if it finds it assumes that it is a progress dialog and removes the title. This pathc changes the name of the div containing the progress bar to gServerAddProgress and avoids the issue. 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-18 05:18:41 +08:00
Tim Almdal
8156eb9651 Fix for ticket #590. The gallery.dialog.js looks for an element "#dialog #gProgress" and if it finds it assumes that it is a progress dialog and removes the title. This pathc changes the name of the div containing the progress bar to gServerAddProgress and avoids the issue. 2009-08-17 14:16:11 -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
7fc833a392 Refactor the get maximum weight functionality into a method in the item helper, so that we can use it else where (i.e. the new organize module) 2009-08-17 08:47:39 -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
6281995385 Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-12 16:01:24 -07:00
Tim Almdal
693e95e7b0 Use the jquery-ui library that contains a prerelease version of the slectable component 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-13 05:20:38 +08:00
Tim Almdal
39b37cc585 Use the jquery-ui library that contains a prerelease version of the slectable component 2009-08-12 14:13:39 -07:00
Chad Kieffer
bb6bf17076 Move context menu to gallery.common, forgot to include in prior commit 2009-08-11 00:41:07 -06:00
Chad Kieffer
65e97fda48 Move context menu to gallery.common 2009-08-11 00:40:14 -06:00
Chad Kieffer
99d7a0c0db Make each context menu button clickable from side-to-side 2009-08-11 00:33:15 -06:00
Chad Kieffer
a10c309c36 Replace tabs w/ spaces. 2009-08-11 00:28:38 -06:00
Chad Kieffer
3e3bbd5d2e Merge branch 'master' of git@github.com:bharat/gallery3 2009-08-11 00:15:04 -06:00
Bharat Mediratta
cbba45fffc Create the concept of an "ajax link" and use it for thumbnail rotation 
and album covers in the context menu.

Notes:
- This requires context_menu() to have a CSS selector that refers to the
  <img> that we're operating on, otherwise we don't know how to find the
  thumbnail, etc.
- Create Menu_Element_Ajax_Link which has an ajax_handler attribute
  that contains a snippet of JS that we're going to run when the ajax
  call returns.
- Add $.gallery_replace_image in gallery.common.js
- Add lib/gallery.ajax.js which can be used to ajaxify any link, and have
  ui.init.js in the themes call that on all .gAjaxLink elements.
 2009-08-10 23:07:50 -07:00
Chad Kieffer
e3a58b76c1 Return .each() to work with more than an individual photo. 2009-08-10 23:11:31 -06:00
Bharat Mediratta
790545ac97 Add missing semicolons. 2009-08-10 10:49:50 -07:00
Bharat Mediratta
351532d858 Fix indentation. 2009-08-10 10:07:54 -07:00
Bharat Mediratta
f7a23e0a9c Fix up context menus a bit. 
- Update digibug_event::context_menu() to take the actual item
- Change gallery::context_menu() to not require the page_type as an argument
 2009-08-09 23:08:35 -07:00
Chad Kieffer
cea1d4f1f3 Forgot to commit the css for the resize photo view context menu. 2009-08-09 23:32:53 -06:00
Chad Kieffer
c85d9b41d9 First stab at context menu for resize. It's quirky and needs work. 2009-08-09 23:12:25 -06:00
Chad Kieffer
24e29b0b68 Rename fit_image to fit_photo for consistency. 2009-08-09 23:10:02 -06:00
Chad Kieffer
69b7b1803a Move hover effect to a function. 2009-08-09 23:08:18 -06:00
Chad Kieffer
a961211f56 Move the get photo filter out to it's own function for re-use. Docblock cleanup. 2009-08-09 22:51:21 -06:00
Chad Kieffer
13546d0be7 Fixed case 2009-08-09 13:59:48 -06:00
Chad Kieffer
85afa537df Add jquery ui print icon class to menu 2009-08-09 13:56:39 -06:00
Bharat Mediratta
1c4e1344c6 Update photo_menu() and context_menu() to work with recent menu changes. 2009-08-09 12:14:17 -07:00
Chad Kieffer
6404e75a0b Merge branch 'master' of git@github.com:bharat/gallery3 2009-08-09 13:02:35 -06:00
Chad Kieffer
1231e095c8 Keep image placement from shifting on hover, set gHoverItem height properly. 2009-08-09 12:46:17 -06:00
Bharat Mediratta
d3ea304f7d Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_branch 2009-08-09 11:13:41 -07:00
Chad Kieffer
de00a4ac39 Explicitly use gValign class rather than first child. 2009-08-09 11:40:39 -06:00
Chad Kieffer
2f4c4a3f70 Rename resizeImage gallery_fit_image to follow convention. Move the function to gallery.common.js. 2009-08-09 11:31:31 -06:00
Tim Almdal
39d0098038 Enable microthumbnail selection 2009-08-09 09:00:10 -07:00
Chad Kieffer
ea17a51148 Merge branch 'master' of git@github.com:bharat/gallery3 2009-08-09 09:51:40 -06:00