stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-25 17:24:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,995 Commits 4 Branches 0 Tags
b6c1ba7ea6416630b2a44b3df8400a2d48460b0a
Commit Graph
71 Commits
Author SHA1 Message Date
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
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 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 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 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 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 48e84243d2 Update help text to eliminate 'edit' since we don't do that yet, and change "items" to "photos". 2009-08-28 11:21:19 -07:00
Bharat Mediratta 8ca573741e Indentation fixes. 2009-08-28 10:48:53 -07:00
Bharat Mediratta e8a3fe97a4 Fix whitespace. 2009-08-28 09:09:33 -07:00
Bharat Mediratta 7c5275a63c Fix indentation. 2009-08-28 09:08:39 -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 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 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 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 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
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 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
Bharat Mediratta 050c82cf80 Escape bare & symbols so that we use valid entities. Fixes ticket #577. 2009-07-21 11:09:23 -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 54ffea2419 Split the clean method into two clean and purify. clean is a light weight 
approach using html::specialchars and purify uses HTMLPurifier to intelligently
cleanse the output fields. Use purifier for text and title fields where it is
likely that a user would enter html to format their data.
 2009-07-03 21:44:10 -07:00
Tim Almdal 0f987880e6 Fix for ticket #320 2009-06-02 12:08:47 -07:00
Bharat Mediratta 9369ccab7f Run all variables that come from user-entered data through p::clean() 2009-05-31 01:02:51 -07:00
Tim Almdal 09c8953af7 Provide delete confirmations in quick pane and organize features. If 
I've missed any spots let me know.
 2009-05-21 02:24:37 +00:00
Tim Almdal a9e3692027 1) This provides the editting functionality for albums and photos in the 
organize feature.
2) Remove the tag functionality at this point
3) Added a callback to handle validating conflicting names (only used
by organize at this point.
4) Closes #231
 2009-05-21 01:31:29 +00:00