stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-05 19:29:06 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,610 Commits 4 Branches 0 Tags
ae6af2f9b61d69a3adc36f52257cdbd9c4fedf4e
Commit Graph

98 Commits

Author SHA1 Message Date
Tim Almdal
f10d641044 Change the parameters for the organize dialog box. The baseUrl parameter was removed and replaced with the restUri, which contains the relative uri for the rest controller. The controller parameter is now the relative uri for the organize controller. The protocol parameter was added. In addition, there is not default size for the organize flex object. It attempts to fit within the gallery3 dialog box. 2010-06-14 13:07:58 -07:00
Tim Almdal
47aa651430 Fix problems ith IE and flex initialization when one of the flashvars contains a json encoded string. Also address the problem that IE returns the color values differently that Firefox and Chrome 2010-06-13 17:58:50 -07:00
Tim Almdal
6aab0cbec6 Review the code for xss exposures and provide the functionality to update the organize dialog bar when the selected album changes. 2010-06-10 13:12:10 -07:00
Tim Almdal
38e8ab3d71 Provide better handling and a progress dialog when loading or updating files. 2010-06-10 09:14:13 -07:00
Tim Almdal
56587febff Add a progress dialog box when deleting, uploading or updating items. 2010-05-28 09:42:26 -07:00
Tim Almdal
ffc3f9f41c checkpoint the new organize module. At this point rearrange and move work. Rearrange is moving items within the same album, move is moving to a different album. 2010-05-18 10:00:48 -07:00
Tim Almdal
7c84ee1b33 Organize now has the add album functionality. 2010-03-30 07:55:56 -07:00
Tim Almdal
0c1595d7e8 Clean up the organize_dialog file of some cruft and add the organize.swf file to the organize module. 2010-03-27 15:55:42 -07:00
Tim Almdal
67a8ef4277 Convert the old organize to the new flex based organize 2010-03-27 11:16:41 -07:00
Andy Staudacher
f116af5287 Fix for tickets #1024 and #1025: Fix formatting of album tree list in the organize dialog, and (magically) drag and drop move to another album works as well again. Tested in FF3.5, Chrome5 on Ubuntu Linux. 2010-02-18 17:54:29 -08:00
Tim Almdal
47293fcb03 Correct tree branch alignment in IE 2010-02-08 09:15:02 -08:00
Tim Almdal
15e2207655 correct layout of html for readability 2010-02-06 10:12:53 -08:00
Tim Almdal
83f61ff5cf Insure that the 'Ascending'/'Descending' string are translated on the organize dialog. 2010-02-06 09:47:56 -08:00
Tim Almdal
94cc061e8b Correct alignment in IE7. fixes ticket #795 2010-02-05 10:25:55 -08:00
Tim Almdal
c820613917 Don't change the current album when items are dragged to a different album in the album tree. Fixes ticket #959. 2010-02-04 08:24:02 -08:00
Tim Almdal
95b26db82c 1) Simplify the layout of the organize dialog content. 
2) Use CSS to layout the thmbnail grid to the full dialog size.  Fixes ticker #848.
3) Separate css that can be themed into organize_theme.css.  This isolates the themed components into a separate file for easy of overriding by a theme.
 2010-02-04 08:23:02 -08:00
Tim Almdal
aa4ed45473 Differentiate between selected and non selected items. 2010-02-04 07:46:41 -08:00
Tim Almdal
3060a6f662 Merge branch 'master' into talmdal_dev 
Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php
 2009-12-26 11:24:50 -08:00
Bharat Mediratta
a3d904bcba ORM::find_all() now uses null as the default value for offset. 2009-11-26 19:36:57 -08:00
Bharat Mediratta
e8fb773b68 Update all portable where clauses to the new Kohana 2.4 format. 2009-11-26 19:33:03 -08:00
Tim Almdal
72deeb1119 Remove all style from the organize.css file and make use of the themeroller styles as much as possible. 2009-11-20 10:26:11 -08:00
Chad Kieffer
33d2a2481e MInor message-block padding fixes in general and specifically for organize. 2009-11-15 23:27:37 -07:00
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
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
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