summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-08-07Refactor the gallery dialog into a jQuery widgetTim Almdal
2009-08-07Merge branch 'master' of git://github.com/gallery/gallery3Tim Almdal
2009-08-07Refactor the gallery.panel.js as a jQuery widget.Tim Almdal
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-08-07Refactor the gallery.panel.js as a jQuery widget.Tim Almdal
2009-08-06Merge branch 'master' of git@github.com:talmdal/gallery3Tim Almdal
2009-08-06Merge branch 'master' of git://github.com/gallery/gallery3Tim Almdal
Conflicts: modules/user/helpers/user_theme.php
2009-08-06Further streamline the code.Bharat Mediratta
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-06Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branchBharat Mediratta
2009-08-06* Rename setContents -> show_album to be consistent style wise (no camelBharat Mediratta
caps) and more explicit about what it's doing. * use toggleClass() to simplify the +/- css management.
2009-08-06If we fail the version check, at least show the version of PHP that the ↵Bharat Mediratta
server is using.
2009-08-06trying to restore the branch from a failed revertTim Almdal
2009-08-06Remove 6 more lines by removing the generalization of the close dialog ↵Tim Almdal
processing
2009-08-06Remove the complicated calculation to determine the height of theTim Almdal
micro thumb grid, by setting all the parent elements to 100% in the css and then subtract the height of the button bar
2009-08-06Don't show the ajaxy login link in the top right corner if we're on the ↵Bharat Mediratta
login page itself.
2009-08-06Fix indentation.Bharat Mediratta
2009-08-06Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branchBharat Mediratta
2009-08-06Leverage the gallery.dialog/js functionality in order to reduce duplicate codeTim Almdal
2009-08-06Merge branch 'master' of git://github.com/talmdal/gallery3 into talmdal_branchBharat Mediratta
2009-08-06Remove 6 more lines by removing the generalization of the close dialog ↵Tim Almdal
processing
2009-08-06Remove the complicated calculation to determine the height of theTim Almdal
micro thumb grid, by setting all the parent elements to 100% in the css and then subtract the height of the button bar
2009-08-06Cleanup the javascript for enabling dialog or panel links.Tim Almdal
1) We don't need to loop over the elements to bind the event handler. 2) Just include gallery.panel.js for all the admin pages. Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-08-06Cleanup the javascript for enabling dialog or panel links.Tim Almdal
1) We don't need to loop over the elements to bind the event handler. 2) Just include gallery.panel.js for all the admin pages.
2009-08-06Revert "Revert "Revert "Allow a theme to override the page refresh ↵Tim Almdal
mechanism. Create a new""" This reverts commit 7b1cca168cb9b29fcccdcdce9e32efb190e4575e. Basically remove it and Bharat and I will fight it out in SF for a resolution :-)
2009-08-06Tighten up the code by loading all the albums in the tree at once, removingTim Almdal
the events to populate the button bar.
2009-08-06Merge branch 'master' of git://github.com/gallery/gallery3Tim Almdal
2009-08-05Don't show the ajaxy login link in the top right corner if we're on the ↵Bharat Mediratta
login page itself.
2009-08-05Remove the resize dialog on window resize functionalityTim Almdal
2009-08-05Chain some jQuery calls together to reduce lines of code.Bharat Mediratta
2009-08-05Merge branch 'master' of git://github.com/gallery/gallery3Tim Almdal
2009-08-05Fix up formatting of items in thumbgridTim Almdal
2009-08-05Change the content pane based on the selection in the album treeTim Almdal
2009-08-05Change to use the new children and children_count APITim Almdal
2009-08-05Fix the default $orderby to be an associative array in descendants() and ↵Bharat Mediratta
children(), thanks Tim!
2009-08-05Merge branch 'master' of git://github.com/gallery/gallery3Tim Almdal
2009-08-05Change the children and descendants APIs to be more consistent and toBharat Mediratta
remove Gallery3 concepts from ORM_MPTT. The following API methods: ORM_MPTT::children ORM_MPTT::children_count ORM_MPTT::descendants ORM_MPTT::descendants_count All now take a $where clause that allow you to pass through additional field parameters. old API: $album->children(10, 0, "photos") $album->children_count("photos") new API: $album->children(10, 0, array("type" => "photos")) $album->children_count(array("type" => "photos")) This gives us a more flexible API and simplifies the code. While I was in there, I changed the way we deal with default orderby values so that we just assign the default value in the function definition, which allows us to get rid of all conditionals in the implementation which results in simpler code.
2009-08-05Revert "Revert "Enable the expand/collapse of branches by clicking on the ↵Tim Almdal
plus/minus"" This reverts commit e37526f94df74a52a9cf36f0a5a5e641958ebbb3.
2009-08-05Revert "Revert "Checkpoint the organize module rewrite. At this point, it ↵Tim Almdal
doesn't really do"" This reverts commit 397468c47b8fc3fefeb54ff19a73980ed1dd8c20.
2009-08-05Revert "Revert "Allow a theme to override the page refresh mechanism. ↵Tim Almdal
Create a new"" This reverts commit 9f396178cedc96abb282e72ff0e843e255c8225a.
2009-08-05Revert "Allow a theme to override the page refresh mechanism. Create a new"Tim Almdal
This reverts commit 1f014aae6c16bbda62d8f5937180f11ccb0eb1b1.
2009-08-05Revert "Checkpoint the organize module rewrite. At this point, it doesn't ↵Tim Almdal
really do" This reverts commit a25f08d433d504a53763feb358a1aa7f5f798de6.
2009-08-05Revert "Enable the expand/collapse of branches by clicking on the plus/minus"Tim Almdal
This reverts commit 869c3de9612a598dae0ce400991bdbe173a2decc.
2009-08-05Enable the expand/collapse of branches by clicking on the plus/minusTim Almdal
icons. Branches with no albums, will not have an icon.
2009-08-05Remove tabs as whitespaceTim Almdal
2009-08-05Remove the trigger definition codeTim Almdal
2009-08-05Change the children methods on Item_Core and ORM_MPTT in order toTim Almdal
specify a type parameter, so tht we can filter the children based on type (i.e. album, photo, etc). In addition, expose the sort order, so that we can specify the order we want to return the children.
2009-08-05Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2009-08-04Skip empty files, since we know they're broken. Fixes ticket #610.Bharat Mediratta
2009-08-04Dump any exceptions into the standard Kohana log as well as the taskBharat Mediratta
log for maximum exposure.
2009-08-04Merge branch 'master' of git@github.com:gallery/gallery3Bharat Mediratta
2009-08-04Check for the SimpleXML module, thanks to geekonek.Bharat Mediratta
Fixes ticket #599.