Commit Graph

465 Commits

Author SHA1 Message Date
Tim Almdal
bc42df35ee Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-19 05:14:05 -07:00
Chad Kieffer
3b8323d5b4 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-18 23:08:32 -06:00
Tim Almdal
2ac916783a Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-18 18:48:17 -07:00
Bharat Mediratta
67d770fb2a Don't call dirname() on the toolkit dir, it's already a directory! (Thanks Kaare) 2009-08-18 13:48:00 -07:00
Tim Almdal
6e054273f3 Change the setting of page type from "item" to "photo". Thre is no page type
of item.  All other references use photo for non album and non dynamic pages.
2009-08-18 08:40:52 -07:00
Tim Almdal
24d7f5df8c Refactor the get maximum weight functionality into a method in the item helper, so that we can use it else where (i.e. the new organize module)
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-08-18 05:21:17 +08:00
Tim Almdal
7fc833a392 Refactor the get maximum weight functionality into a method in the item helper, so that we can use it else where (i.e. the new organize module) 2009-08-17 08:47:39 -07:00
Tim Almdal
76f320ab3d In this patch, drag now works to the album tree, but the progress bar is not
showing. As well fixed a problem where selectable single clink no longer
worked when the album was reloaded.
2009-08-16 12:36:14 -07:00
Bharat Mediratta
cbba45fffc Create the concept of an "ajax link" and use it for thumbnail rotation
and album covers in the context menu.

Notes:
- This requires context_menu() to have a CSS selector that refers to the
  <img> that we're operating on, otherwise we don't know how to find the
  thumbnail, etc.
- Create Menu_Element_Ajax_Link which has an ajax_handler attribute
  that contains a snippet of JS that we're going to run when the ajax
  call returns.
- Add $.gallery_replace_image in gallery.common.js
- Add lib/gallery.ajax.js which can be used to ajaxify any link, and have
  ui.init.js in the themes call that on all .gAjaxLink elements.
2009-08-10 23:07:50 -07:00
Bharat Mediratta
351532d858 Fix indentation. 2009-08-10 10:07:54 -07:00
Bharat Mediratta
f7a23e0a9c Fix up context menus a bit.
- Update digibug_event::context_menu() to take the actual item
- Change gallery::context_menu() to not require the page_type as an argument
2009-08-09 23:08:35 -07:00
Chad Kieffer
13546d0be7 Fixed case 2009-08-09 13:59:48 -06:00
Bharat Mediratta
d3ea304f7d Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_branch 2009-08-09 11:13:41 -07:00
Bharat Mediratta
12f25a7e55 Fix the after_install loader to immediately open the "Welcome to
Gallery 3!" dialog, but not immediately open the "change your
password" dialog.
2009-08-08 21:26:55 -07:00
Bharat Mediratta
7aac471b82 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_branch
Conflicts:
	modules/gallery/js/quick.js
2009-08-08 20:56:06 -07:00
Bharat Mediratta
c9f5000e65 Improve the graphics toolkit detection code so that properly
identifies situations where its restricted by open_basedir.

We now track more informatoin about the toolkit including the version
and any errors we encountered while doing the detection so that we can
provide more info downstream.  This makes graphics::detect_toolkits()
a little heavier, but that's ok because it should not be called very
often.

In the process, refactor the controller and view hierarchy so that
it's a little more straightforward in the code.

Fixes ticket #616.
2009-08-08 20:31:16 -07:00
Tim Almdal
e4fb6959af Forgot to save this one before committing the last two times... duh. Completes the conversion from using 1 to true for the immediate paramter to gallery_dialog 2009-08-08 16:18:33 -07:00
Tim Almdal
e04675470b Forgot to save this file when i changed the value from 1 to true 2009-08-08 16:01:20 -07:00
Tim Almdal
cb1ae141bb Create an new option 'immediate' and if set to true then don't try to set up click events, but just show the dialog. Also remove the destroy method and put all the cleanup into the dialog close handler 2009-08-08 15:46:53 -07:00
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
Tim Almdal
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 Almdal
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
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
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
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
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
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
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
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