Commit Graph
1757 Commits
Author SHA1 Message Date
Tim AlmdalandBharat Mediratta 93138f6ae7 Don't display the slideshow icon if there are no descendants. ticket #660 2009-08-27 16:28:17 -07:00
Bharat Mediratta 4828db003f Remove 'ENGINE=InnoDB' specification from tables that we create. Use
the system's default table specification.  Fixes ticket #597.
2009-08-27 15:47:54 -07:00
Bharat Mediratta 7771d0cf83 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-27 13:30:22 -07:00
Bharat Mediratta e586389f65 Don't ask for csrf when we're resetting passwords. They're not gonna have one. Duh!
Fixes #642.
2009-08-27 13:29:45 -07:00
Chad Kieffer b7803e99c1 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-27 14:28:23 -06:00
Chad Kieffer ddddfc5e8e Make the info block display 'File name', instead of 'Folder name' when showing a photo. Fixes #631 2009-08-27 14:27:49 -06:00
Bharat Mediratta 5f86332db9 Convert tabs to spaces. 2009-08-27 11:41:19 -07:00
Andy Staudacher 0be38d143c Workaround to make G3 work with Turkish locale.
Thanks to katpatuka for providing the fix.
2009-08-25 13:32:57 -07:00
Tim Almdal 2da7f93784 Fix the setting of the mime type header. as per
http://gallery.menalto.com/node/90306
Thanks rWatcher

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-08-20 12:26:47 +08:00
Tim Almdal e3f5a8be90 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.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-08-19 21:16:02 +08:00
Chad Kieffer 3b8323d5b4 Merge branch 'master' of git@github.com:gallery/gallery3 2009-08-18 23:08:32 -06: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 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 afa8cade7f Fix for ticket #590. The gallery.dialog.js looks for an element "#dialog #gProgress" and if it finds it assumes that it is a progress dialog and removes the title. This pathc changes the name of the div containing the progress bar to gServerAddProgress and avoids the issue.
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-08-18 05:18:41 +08: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
Chad Kieffer 85afa537df Add jquery ui print icon class to menu 2009-08-09 13:56:39 -06:00
Bharat Mediratta 1c4e1344c6 Update photo_menu() and context_menu() to work with recent menu changes. 2009-08-09 12:14:17 -07: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 5c25973ee8 Require a valid url for users. Fixes ticket #612. 2009-08-09 00:02:17 -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 35c6bc3cfa Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-08 15:48:13 -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
Bharat Mediratta 7863aa16f9 Update tags module to notify modules when items related to a tag are
affected.  Practically speaking this means that we'll reindex items
when tags are added or removed from them.

API change:
  Remove item_related_updated_batch event.

Rationale:
  While this is an efficient event, it requires module developers to
  support two event APIs for staying up to date and increases the
  likelihood that they'll forget one and have data corruption.  Force
  them all through the slower but more reliable pipe, for now.  We
  can always try to improve efficiency by using the batch_start and
  batch_stop events.
2009-08-08 14:30:21 -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
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