Commit Graph
1727 Commits
Author SHA1 Message Date
Chad Kieffer ed6302a0ad Merge branch 'master' of git@github.com:bharat/gallery3 2009-08-08 01:14:51 -06:00
Chad Kieffer 6357f3332b Added basic context menu affects and styles. Simplified some of the action labels in the menu. 2009-08-08 01:14:22 -06: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
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
Bharat Mediratta c09e2ef7af Merge branch 'master' of git@github.com:bharat/gallery3 into bharat_branch 2009-08-06 12:44: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
Bharat Mediratta f0b3d37d18 Chain some jQuery calls together to reduce lines of code. 2009-08-05 22:17:03 -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
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 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
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
Tim Almdal 2e82c5e9ca Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-03 08:12:39 -07:00
Bharat Mediratta 7ad0808a11 Change the API for getting to the original state of an ORM.
Old API:  $obj->original("field_name")
  New API:  $obj->original()->field_name

This allows us to revert the varous xxx_updated events back to passing
an original ORM as well as the the updated one.  This makes for a
cleaner event API.

  Old API:  comment_updated($comment) { $comment->original("field_name") }
  Old API:  comment_updated($old, $new) { $old->field_name }
2009-08-02 12:09:00 -07:00
Tim Almdal bb8c83db81 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-31 14:51:37 -07:00
Bharat Mediratta f034c6c534 Add new events:
graphics_resize
  graphics_resize_completed
  graphics_rotate
  graphics_rotate_completed
  graphics_composite
  graphics_composite_completed
2009-07-31 13:32:07 -07:00
Tim Almdal 7aa03e59ba Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-30 19:25:43 -07:00
Bharat Mediratta 19d89f94f9 Remove debug statements 2009-07-30 09:57:24 -07:00
Bharat Mediratta 031a19724a Update golden file 2009-07-30 09:55:09 -07:00
Bharat Mediratta 0f43b35747 Fix a static function declaration. 2009-07-30 09:54:59 -07:00
Tim Almdal d3ce7f7e36 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-30 08:09:40 -07:00
Bharat Mediratta fc3273da4d Add some code to guard the weight calculation against zero rows when
we're doing an initial install.
2009-07-30 08:02:54 -07:00
Tim Almdal fc7ef17e0f Remove try statement w/o catch 2009-07-30 05:27:19 -07:00
Tim Almdal 29f5a231c7 Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
	modules/gallery/models/item.php
2009-07-30 05:15:24 -07:00
Bharat Mediratta 67d4ae21d5 Clean up user form events. Thanks to Ben Smith (glooper). 2009-07-29 17:43:12 -07:00
Bharat Mediratta 2473418ea3 Show the author's username if the author has no fullname. Fixes ticket #601. 2009-07-29 17:35:56 -07:00
Bharat Mediratta 15f148349e Make body_attributes() a theme callback instead of a method on the
View.  This allows modules to piggyback on it.
2009-07-29 17:25:53 -07:00
Bharat Mediratta ca96d47196 Oops, I removed too much in my last change. Put talmdal's query back,
but change it to use Database instead of ORM for a little more
efficiency.
2009-07-29 16:58:29 -07:00
Tim Almdal 6f1da3aba4 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-29 16:47:16 -07:00
Bharat Mediratta 5d0413631f Bump the gallery version to 10 in install() 2009-07-29 16:44:51 -07:00
Bharat Mediratta 7438a9c889 Remove some scary debug code. 2009-07-29 16:40:01 -07:00
Tim Almdal ead6a61d9e Fix for ticket #576
Add a weight index to the item table and changed the retrieval of the maximum
weight to select weight from items order by weight desc limit 1.

Upgrades the gallery module to version 10

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-30 01:59:07 +08:00
Tim Almdal 653c291d94 Fix for ticket #576
Add a weight index to the item table and changed the retrieval of the maximum
weight to select weight from items order by weight desc limit 1.

Upgrades the gallery module to version 10
2009-07-29 10:55:56 -07:00
Tim Almdal eb90fc9e63 Remove debugging print statement in search.php
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-30 01:32:24 +08:00
Tim Almdal 5a677975d0 Remove debugging print statement in search.php 2009-07-29 10:25:50 -07:00
Tim Almdal a533099e8a Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-29 05:17:25 -07:00