Commit Graph
3951 Commits
Author SHA1 Message Date
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 63ddac5d01 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_branch
Conflicts:
	themes/default/js/ui.init.js
2009-08-07 12:37:25 -07:00
Bharat Mediratta e4eec71efa Rename gallery.common.js functions to conform to our naming standards
and have some basic namespacing:
  showMessage --> gallery_show_message
  vAlign      --> gallery_valign
  showLoading --> gallery_show_loading

Convert gallery.show_full_size.js to be a jQuery function and give it a namespace:
  show_full_size --> gallery_show_full_size
2009-08-07 11:53:40 -07:00
Tim AlmdalandBharat Mediratta 445a8fb1b6 Change galleryPanel and galleryDialog widgets to gallery_panel and gallery_dialog respectively
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-08-08 02:08:42 +08:00
Tim AlmdalandBharat Mediratta a302a9c3fa Refactor the gallery dialog into a jQuery widget
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-08-08 02:08:28 +08:00
Tim Almdal 49d46e4010 Change galleryPanel and galleryDialog widgets to gallery_panel and gallery_dialog respectively 2009-08-07 10:47:56 -07:00
Bharat Mediratta 1591c3871a Don't show the ajaxy login link in the top right corner if we're on the login page itself.
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
2009-08-08 01:40:54 +08:00
Tim Almdal bc6c5207be Refactor the gallery dialog into a jQuery widget 2009-08-07 08:58:57 -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
Bharat Mediratta d3f4643699 * Rename setContents -> show_album to be consistent style wise (no camel
caps) and more explicit about what it's doing.
* use toggleClass() to simplify the +/- css management.
2009-08-06 21:02:22 -07:00
Bharat Mediratta 6e4023a720 Fix indentation. 2009-08-06 16:16:11 -07:00
Bharat Mediratta 3850587519 Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch 2009-08-06 16:15:40 -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
Bharat Mediratta c09e2ef7af Merge branch 'master' of git@github.com:bharat/gallery3 into bharat_branch 2009-08-06 12:44:39 -07:00
Bharat Mediratta 7ea05eacd7 Merge branch 'master' of git://github.com/talmdal/gallery3 into talmdal_branch 2009-08-06 11:21:18 -07:00
Tim Almdal 7ed15ea481 Remove 6 more lines by removing the generalization of the close dialog processing 2009-08-06 10:03:38 -07:00
Tim Almdal d7c7a06efe Remove the complicated calculation to determine the height of the
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-06 09:46:39 -07:00
Tim Almdal b826182b7a Cleanup the javascript for enabling dialog or panel links.
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-06 22:28:05 +08:00
Tim Almdal 5997f57323 Cleanup the javascript for enabling dialog or panel links.
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-06 07:22:24 -07:00
Tim Almdal 7bdf382e81 Revert "Revert "Revert "Allow a theme to override the page refresh mechanism. Create a new"""
This reverts commit 7b1cca168c.

Basically remove it and Bharat and I will fight it out in SF for a resolution :-)
2009-08-06 07:02:41 -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 26362ae7e2 Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-06 04:50:30 -07:00
Bharat Mediratta cd5c99668b Don't show the ajaxy login link in the top right corner if we're on the login page itself. 2009-08-05 22:32:41 -07:00
Tim Almdal cab46cf038 Remove the resize dialog on window resize functionality 2009-08-05 22:28:37 -07:00
Bharat Mediratta f0b3d37d18 Chain some jQuery calls together to reduce lines of code. 2009-08-05 22:17:03 -07:00
Tim Almdal a6fb9a69a0 Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-05 17:47:33 -07:00
Tim Almdal a03f8b1003 Fix up formatting of items in thumbgrid 2009-08-05 16:45:44 -07:00
Tim Almdal 824a80b0d4 Change the content pane based on the selection in the album tree 2009-08-05 15:24:31 -07:00
Tim Almdal a92a46b0cd Change to use the new children and children_count API 2009-08-05 11:04:42 -07:00
Bharat Mediratta b394b0b2c6 Fix the default $orderby to be an associative array in descendants() and children(), thanks Tim! 2009-08-05 11:01:48 -07:00
Tim Almdal fb4bfa5711 Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-05 10:45:38 -07:00
Bharat Mediratta e8c57290a2 Change the children and descendants APIs to be more consistent and to
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-05 10:38:53 -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 7b1cca168c Revert "Revert "Allow a theme to override the page refresh mechanism. Create a new""
This reverts commit 9f396178ce.
2009-08-05 10:25:23 -07:00
Tim Almdal 9f396178ce Revert "Allow a theme to override the page refresh mechanism. Create a new"
This reverts commit 1f014aae6c.
2009-08-05 09:24:27 -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 5f47271e32 Remove tabs as whitespace 2009-08-05 07:51:19 -07:00
Tim Almdal 81d39a9bb1 Remove the trigger definition code 2009-08-05 07:47:17 -07:00
Tim Almdal 187d4b209d Change the children methods on Item_Core and ORM_MPTT in order to
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-05 07:38:35 -07:00
Tim Almdal 2f63a5379f Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-05 06:51:27 -07:00
Chad Kieffer 58dbee03e5 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-04 23:38:11 -06:00
Bharat Mediratta b9a6cd45ba Skip empty files, since we know they're broken. Fixes ticket #610. 2009-08-04 20:35:13 -07:00
Bharat Mediratta a03b9273b2 Dump any exceptions into the standard Kohana log as well as the task
log for maximum exposure.
2009-08-04 20:34:46 -07:00
Andy Staudacher 703e84a94d Fix l10n message for akismet, extracting URLs from the message
Signed-off-by: Andy Staudacher <andy.st@gmail.com>
2009-08-05 10:21:57 +08:00
Andy Staudacher 2d63348ef6 Fix l10n message for akismet, extracting URLs from the message 2009-08-04 18:58:49 -07:00
Bharat Mediratta 52147cf6f8 Combine the quick menu and the thumb menu into a single menu called
the "context" menu.

This new context menu is generated using the typical event processing
system, like our other menus.  The specialized quick CSS and JS is now
gone, replaced by our generic menu handling code.  It's all rolled
together currently using the thumb_menu UI for easy packaging.  All
the CSS and JS is updated.

NOTE: the non-dialog links (rotate, album_cover) have a broken UI
because they return JSON which the quick.js code handled specially,
but we don't handle properly now.  I need to fix this.
2009-08-03 21:45:54 -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