Commit Graph

65 Commits

Author SHA1 Message Date
Bharat Mediratta
cc4a54a3d6 Fix bug introduced in b6fa33faf7. Don't
try to use $(this).data("reload.location") if it hasn't been set,
which can happen if Flash isn't available.  Fixes #1362
2010-09-11 22:18:53 -07:00
Tim Almdal
b6fa33faf7 Create a setLocation javascript callback which is called everytime with the full url of the current album(non-REST). When the dialog is closed the window location is set to this value and the page gets loaded appropriately. 2010-09-07 18:53:17 -07:00
Bharat Mediratta
5568ab24de Normalize the "flash missing" message string with the one in the
uploader for convenient localization.
2010-08-30 22:21:00 -07:00
Bharat Mediratta
2c717b18d3 Don't concatenate two strings together as an argument for t() or t2();
the l10n_scanner cannot parse it properly and drops those from the
localization list.  Fixes ticket #1284.
2010-08-29 20:04:02 -07:00
Bharat Mediratta
04add75f6f Get rid of the move dialog and move option. Instead, replace it with
a call to Organize with the appropriate album open.  I have not yet
figured out how to get the SWF code to highlight the active image, but
that's coming.  Partial fix for #1204.
2010-08-22 00:27:24 -07:00
Bharat Mediratta
84a50e737b Fix the "get flashplayer" button. It was throwing a JS error before.
Not sure why it was done in JS in the first place.  Fixes ticket #1256.
2010-07-27 11:18:55 -07:00
Tim Almdal
f699d2b385 Fix missing quoate in the organize dialog html template. 2010-07-23 05:56:59 -07:00
Bharat Mediratta
96bcc8146c Style and text cleanup. Parameterize the minimum flash value so that we can use it in the internationalized string. Fix capitalization. 2010-07-20 07:03:43 -07:00
Tim Almdal
bd969a6ffa Fix for ticket #1202. Set the minimum flash version 10.0.0 and display a message and a button to download the latest version if the minimum versiion is not installed. 2010-07-16 07:37:24 -07:00
Tim Almdal
545a91270d 1) Change how the size of the flexstage is calculated. (Basically remove the
dialogWidth and dialogHeight and adjsut the internal controls when added to
   the stage.
2) Cleanup the controller code
2010-06-18 19:05:59 -07:00
Bharat Mediratta
ec40e03a37 Use request::protocol(). 2010-06-18 15:20:32 -07:00
Tim Almdal
fce95785be Remove duplicate trailing slash on the controllerUri parameter 2010-06-17 17:41:35 -07:00
Tim Almdal
070db2a97a Rearrange the adding of fields to the template so that they match the order of appearance in the template. Also remove the @todo's 2010-06-17 10:21:37 -07:00
Bharat Mediratta
359235182e Add a cache-buster to the SWF url so that it'll refresh in the browser
every time the SWF file changes.
2010-06-17 09:57:38 -07:00
Tim Almdal
172c3fd209 Fix a typo... The controller parameter to the flex organize module should be controllerUri instead. 2010-06-16 17:31:31 -07:00
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
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
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
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
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
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
53390ba79a CSS rename: gMicroThumbXxx -> gOrganizeMicroThumbXxx to make it clear
that this is organize only.
2009-08-30 14:58:26 -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
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
e8a3fe97a4 Fix whitespace. 2009-08-28 09:09:33 -07:00
Bharat Mediratta
7c5275a63c Fix indentation. 2009-08-28 09:08:39 -07:00