summaryrefslogtreecommitdiff
path: root/modules/organize/controllers
AgeCommit message (Collapse)Author
2013-01-25Fix an assignment-instead-of-comparison bug. I wish PHP had a betterBharat Mediratta
warning system for this stuff. In this case it's innocuous because the UI only allows you to rearrange stuff inside a single album, so the assignment doesn't do anything. Fixes #1914.
2013-01-24Add back a comment that I accidentally removed in the last commit.Bharat Mediratta
2013-01-23Extract reweighting logic out of Organize_Controller intoBharat Mediratta
item::reweight_all_children as an API and write a test for it. Work in progress on #1914.
2013-01-23Merge pull request #97 from mikeage/organize_tag2Bharat Mediratta
Add batch tagging via the organize module
2013-01-23 #1952 Add bulk tagging to the Organize module.Mike Miller
Allow a user to highlight one or more items (images, videos, or albums), and enter a tag (or tags, comma delimited) and apply it to all of the selected items. The code is based on the batchtag module. If the tags module is not enabled, no changes to the Organize UI will be shown.
2013-01-21Update copyright to 2013. Fixes #1953.Bharat Mediratta
2012-05-08Fix up a title that I overlooked in 581d9a58db6a18a2597ee5487e57716f367c884bBharat Mediratta
2012-05-05Remove debug line added in 581d9a58db6a18a2597ee5487e57716f367c884bBharat Mediratta
2012-05-05Clean up title handling code in organize and wind theme for consistency.Bharat Mediratta
Fixes #1847.
2012-04-30Guard reparent/rearrange against bad values in source_id. Fixes #1843.Bharat Mediratta
2012-02-27Update copyright to 2012. #1822Bharat Mediratta
2011-01-21Update copyright to 2011.Bharat Mediratta
2011-01-09Merge commit 'upstream/master'Beckett Madden-Woods
2011-01-09Add item delete support to the organize module. Fixes #1588.Beckett Madden-Woods
2011-01-08Put up a more visually pleasing placeholder for items that areBharat Mediratta
missing a thumbnail. Fixes #1591.
2011-01-08Update the dialog title to reflect the album we're currentlyBharat Mediratta
organizing.
2011-01-06Lock the drag zone if the album is not editable so that users don'tBharat Mediratta
start illegal drags.
2011-01-06Switch back to setting nodes as leaves, but fix the drop zone code toBharat Mediratta
allow dropping on leaves.
2011-01-06Remove unnecessary leaf param from TreeNode results.Bharat Mediratta
2011-01-06When generating the tree, don't mark nodes with no children as a leafBharat Mediratta
because that confuses the TreeDropZone JS into thinking that it can't ever have children.
2011-01-06Don't allow moving an item into its own hierarchy. Just silently skipBharat Mediratta
those sources for now.
2011-01-05Get rid of the expando caret in front of empty foldersBharat Mediratta
2011-01-05Support moving an item before or after the target.Bharat Mediratta
2011-01-04This was left out of 31652eae44bdd93b45d965a8288a3069e37d1934.Bharat Mediratta
2011-01-03Complete rewrite of the organize module in Javascript using the SenchaBharat Mediratta
JavaScript library. It's got all the functionality from the Flash version except it doesn't support creating new albums or uploading photos. Only tested in Chrome 10.0.x so far.
2010-08-22Get rid of the move dialog and move option. Instead, replace it withBharat Mediratta
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-21Tighten up whitespace.Bharat Mediratta
2010-08-17use HTTP_HOST instead of SERVER_NAME so that we're sending requestsBharat Mediratta
back to the same canonical domain that we came from. Else Flash makes crossdomain.xml requests, fails, and falls over. Fixes ticket #1298.
2010-07-31Full pass over all the JSON encoding and JS dialog code. We now abideBharat Mediratta
by the following rules: 1) An initial dialog or panel load can take either HTML or JSON, but the mime type must accurately reflect its payload. 2) dialog form submits can handle a pure HTML response, but the mime type must also be correct. This properly resolves the problem where the reauth code gets a JSON response first from the reauth code, and then an HTML response when you reauth and continue on to a given form -- try it out with Admin > Settings > Advanced. 3) All JSON replies must set the mime type correctly. The json::reply convenience function does this for us. 4) By default, any HTML content sent back in the JSON response should be in the "html" field, no longer the "form" field. The combination of these allows us to stop doing boilerplate code like this in our controllers: // Print our view, JSON encoded json::reply(array("form" => (string) $view)); instead, controllers can just return HTML, eg: // Print our view print $view; That's much more intuitive for developers.
2010-07-31More patches as part of #1225. Change the 'core' modules to use the json::replyTim Almdal
method to set the content type header and encode the response as a json object
2010-07-11Merge branch 'master' into talmdal_devTim Almdal
2010-07-10Accept extension .m4v as video/mp4Romain LE DISEZ
2010-07-06Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the ↵Tim Almdal
dialog. Convert all the controllers that create the data to go into a dialog to return the html as part of a json object.
2010-06-18Simplify rest::get_access_key($user) to rest::access_key() thatBharat Mediratta
returns just the access key string for the active user. That's how we use the API, so keep it simple.
2010-06-181) Change how the size of the flexstage is calculated. (Basically remove theTim Almdal
dialogWidth and dialogHeight and adjsut the internal controls when added to the stage. 2) Cleanup the controller code
2010-06-18Use request::protocol().Bharat Mediratta
2010-06-17Rearrange the adding of fields to the template so that they match the order ↵Tim Almdal
of appearance in the template. Also remove the @todo's
2010-06-17Add a cache-buster to the SWF url so that it'll refresh in the browserBharat Mediratta
every time the SWF file changes.
2010-06-14Change the parameters for the organize dialog box. The baseUrl parameter was ↵Tim Almdal
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-13Remove a debugging statement.Tim Almdal
2010-06-13Fix problems ith IE and flex initialization when one of the flashvars ↵Tim Almdal
contains a json encoded string. Also address the problem that IE returns the color values differently that Firefox and Chrome
2010-05-20Add items and add albums are now working. What still needs to be done is ↵Tim Almdal
add a progress bar for longer running tasks
2010-05-18checkpoint the new organize module. At this point rearrange and move work. ↵Tim Almdal
Rearrange is moving items within the same album, move is moving to a different album.
2010-03-30add a controller method to return the translated labels for the add album ↵Tim Almdal
dialog.
2010-03-27Convert the old organize to the new flex based organizeTim Almdal
2010-03-03Update the copyright to 2010. It's only 3 months into the year :-)Bharat Mediratta
2010-02-15Input sanitizationAndy Staudacher
2010-02-07The adjustment for before or after based on whether the locales rtl or not ↵Tim Almdal
is now done in the browser.
2010-02-04If the locale is rtl then change 'after' to 'before' or vice-versa. Fixes ↵Tim Almdal
ticket #939.
2010-02-04Don't change the current album when items are dragged to a different album ↵Tim Almdal
in the album tree. Fixes ticket #959.