stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-11 09:43:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,357 Commits 4 Branches 0 Tags
7b0ea229b8591c3fba5eb3cb853aa2ac3efd2d97
Commit Graph

3357 Commits

This Branch
This Branch
All Branches
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
Tim Almdal
85d07d0f90 Merge branch 'master' of git@github.com:talmdal/gallery3 2009-08-07 13:52:55 -07:00
Tim Almdal
10c98a3944 Merge branch 'master' of git://github.com/gallery/gallery3 
Conflicts:
	lib/gallery.common.js
	lib/gallery.dialog.js
	modules/organize/js/organize.js
	modules/organize/js/organize_init.js
 2009-08-07 13:52:30 -07:00
Bharat Mediratta
34d4675baf Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_branch 
Conflicts:
	lib/gallery.common.js
	lib/gallery.dialog.js
	modules/organize/js/organize.js
	modules/organize/js/organize_init.js
 2009-08-07 12:20:43 -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
Bharat Mediratta
a5137f5972 Remove boilerplate comment. 2009-08-07 11:17:07 -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
30b77b5714 Forgot this file on the gallery dialog commit 
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
 2009-08-08 02:08:34 +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
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
46b9375d90 Forgot this file on the gallery dialog commit 2009-08-07 10:33:11 -07:00
Tim Almdal
bc6c5207be Refactor the gallery dialog into a jQuery widget 2009-08-07 08:58:57 -07:00
Tim Almdal
9dce5685af Merge branch 'master' of git://github.com/gallery/gallery3 2009-08-07 06:29:57 -07:00
Tim Almdal
6abcc06e21 Refactor the gallery.panel.js as a jQuery widget. 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-08-07 21:22:14 +08:00
Tim Almdal
2f3cef44cc Refactor the gallery.panel.js as a jQuery widget. 2009-08-07 06:15:07 -07:00
Tim Almdal
36a46de190 Merge branch 'master' of git@github.com:talmdal/gallery3 2009-08-06 22:15:17 -07:00
Tim Almdal
99c57b2036 Merge branch 'master' of git://github.com/gallery/gallery3 
Conflicts:
	modules/user/helpers/user_theme.php
 2009-08-06 21:58:45 -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
b2ef37f612 Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch 2009-08-06 21:02:52 -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
87598288f4 If we fail the version check, at least show the version of PHP that the server is using. 2009-08-06 20:38:42 -07:00
Tim Almdal
144a0d7d34 trying to restore the branch from a failed revert 2009-08-06 19:28:37 -07:00
Tim Almdal
362b4d70f7 Remove 6 more lines by removing the generalization of the close dialog processing 2009-08-06 19:21:30 -07:00
Tim Almdal
93c0dffab3 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 19:21:29 -07:00
Bharat Mediratta
0fc96621d5 Don't show the ajaxy login link in the top right corner if we're on the login page itself. 2009-08-06 19:19:14 -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
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