jhilden
eb82f6a64a
added textual description of upload progress
...
moved the cancel link to above the upload queue (where the textual upload progress also is)
2009-06-29 16:02:11 -04:00
jhilden
a5b314e7e6
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-16 22:39:08 -04:00
jhilden
0054caa9a8
added movie placeholder icon
2009-06-16 22:35:44 -04:00
Bharat Mediratta
7ad5e9ee2c
Move the show_full_size code into gallery/lib so that it's generally
...
available to themes that want to use it. It should probably
eventually be generalized away from just being for full sized images,
but it's a step in the right direction.
Fixes ticket #427 .
2009-06-16 18:05:23 -07:00
Bharat Mediratta
f6e8f34bef
Add the real image url to the anchor elements for our full size links
...
so that right clicking works.
Turn the full size rendering code into a function and call it with
arguments, instead of creating a hacky named data structure to hold
the info.
Further partial fixes for ticket #427 .
2009-06-16 17:57:24 -07:00
Bharat Mediratta
51b9873041
Move all the fullsize code into the theme to make it less confusing.
...
Partial fix for ticket #427 .
2009-06-16 17:20:30 -07:00
Andy Staudacher
40b107dd64
Fix html bug in l10n message
2009-06-16 14:12:40 -07:00
Bharat Mediratta
2155a95620
Warn the end user not to run test or package targets.
2009-06-16 13:43:31 -07:00
Bharat Mediratta
ab38c92771
Refactor common xxx_menu() code into private _menu() helper.
2009-06-16 13:34:42 -07:00
Bharat Mediratta
f7a4ac2b8f
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-15 21:36:30 -07:00
Bharat Mediratta
ce2fde5d37
Refactor the comment_rss::feed() method to eliminate code duplication.
2009-06-15 21:35:14 -07:00
Tim Almdal
b6c3451231
Fix the bug introduced by r79582ee, where we try to set the title of the tag album to tag->title. which doesn't exist.
2009-06-15 20:47:36 -07:00
Bharat Mediratta
b8c68ce2f9
Don't try to require GalleryCommentHelper.class if the module is not
...
active, since the code may not even be present. This assumes that if
the G2 comment module *is* active that the code is present, but that's
part of the assumption that the G2 we're importing from is healthy.
Fixes ticket #409
2009-06-15 19:59:46 -07:00
Bharat Mediratta
79582ee5bf
Fix up the titles in the default theme. They've been broken for a
...
while. This fixes ticket #342 .
The bug is that we were using $item instead of $theme->item(). But we
were also not special casing tags properly, and they are effectively
first class citizens (at least for now) so treat them properly. Also,
set page_title by default in the theme so that we don't have to do an
empty() check on it (makes the theme easier to read) and move the
title out of Tags_Controller so that the theme has more control over
it.
2009-06-15 18:15:41 -07:00
Bharat Mediratta
ff74d2d809
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-14 22:28:40 -07:00
Bharat Mediratta
1b656be713
Create a sidebar for tag pages
...
Move the <link> for the container feed (either gallery/album/<id> or
tag/tag/<id>) back into gallery_theme
2009-06-14 22:27:26 -07:00
Bharat Mediratta
32ea4406c8
Refactor the way that the rss module works so that we're not allowing
...
the url to dictate arbitrary static method calls.
* Each xxx_rss helper has a single feed() call which takes an id as the argument
* xxx_rss::available_feedS() only returns feeds when they're applicable (ie
if you're viewing a tag, it won't show you an item feed).
* Feed urls are now in the module/feed_id form so that we can bind a
feed id to a given module
* Tightened up the Rss_Controller by using url::merge and some other tricks.
* Made the slideshow module express its own feed.
2009-06-14 21:51:54 -07:00
Chad Kieffer
3d4cbfa274
Move jquery local scroll module from default theme to lib, only load it if viewing photo view. White space cleanup, removed debug print from template.
2009-06-14 22:39:12 -06:00
Chad Kieffer
abd933d9be
Move jquery local scroll module from default theme to lib, only load it if viewing photo view. White space cleanup, removed debug print from template.
2009-06-14 22:35:12 -06:00
Bharat Mediratta
00fad54c0b
Refactor feed code to use stdClass everywhere. Fix bugs in the
...
max-pages calculation code. Move feed related data into the $feed
variable and only pass that to the view.
2009-06-14 16:40:57 -07:00
Bharat Mediratta
47bc53eb5c
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-14 15:58:02 -07:00
Bharat Mediratta
dc3ed06cd7
Trap gallery2 errors when we try to load an invalid user id and abort loading that user.
2009-06-14 12:43:06 -07:00
Tim Almdal
f18fb93442
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-14 12:40:42 -07:00
Tim Almdal
8b7f7a2fbe
Don't use stdClass to return the feed data. Just use an array.
2009-06-14 12:38:57 -07:00
Tim Almdal
76b89556fc
Remove the sidebar flag from the feed definition returned by available_feeds and
...
replace with a type field with one of two values (head and block). We need to
do this to determine what fields go in the rss block so we can ignore the
definitions that are related to the page head when creating the rss block that
goes into the sidebar.
2009-06-14 12:09:47 -07:00
Tim Almdal
484796e7cc
Remove rss:item_feed, rss::tag_fead and rss_theme::head and move that
...
functionality in the <module_name>_theme::head function. Created rss::feed_link
to wrap the module supplied uri in the html link element.
2009-06-14 11:39:53 -07:00
Tim Almdal
b32670f030
Rename:
...
rss::get_feeds() -> rss::available_feeds()
rss::process_feed() -> rss::feed_data()
2009-06-14 11:20:08 -07:00
Bharat Mediratta
80b464fdbd
Merge branch 'master' of git://github.com/dkm/gallery3
2009-06-14 11:02:08 -07:00
Bharat Mediratta
e7af4cd1b0
Merge branch 'master' of git://github.com/unostar/gallery3
2009-06-14 10:58:05 -07:00
Bharat Mediratta
aaa215a285
Get rid of the word "items" in the delete confirmation dialog.
2009-06-14 10:41:34 -07:00
Bharat Mediratta
7773d0afe8
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-14 10:38:02 -07:00
Tim Almdal
e581440c3d
Rename Rss_Controller::__call to Rss_Controller::feed, which changes the feed
...
url to rss/feed/<feed name>/[<id>]
Where feed name is the name of the feed (i.e. albums, updates, comments, tags
etc.) and id is the optional element id that the feed applies to.
2009-06-14 10:13:12 -07:00
Chad Kieffer and
b86e657194
Switch quick delete from JS confirm to jQuery UI dialog, closes ticket #355 .
...
Signed-off-by: <unostar@danalan.info >
2009-06-15 01:10:13 +08:00
Bharat Mediratta and
a89c871861
Remap mysql_xx() functions to their mysqli counterparts if the mysql
...
extension is unavailable. Fixes ticket #393 .
Signed-off-by: <unostar@danalan.info >
2009-06-15 01:10:09 +08:00
Chad Kieffer
390bc7c1f6
Switch quick delete from JS confirm to jQuery UI dialog, closes ticket #355 .
2009-06-14 10:42:14 -06:00
Bharat Mediratta
d95fcb189f
Add a warning about eAccelerator interfering with g2_import.
2009-06-13 17:15:32 -07:00
Bharat Mediratta
52ac0e7172
Remap mysql_xx() functions to their mysqli counterparts if the mysql
...
extension is unavailable. Fixes ticket #393 .
2009-06-13 17:06:34 -07:00
Bharat Mediratta and
db321863a6
Move date/time format strings into a setting and bump the gallery
...
module to version 2. First test of our upgrade code!
Signed-off-by: <unostar@danalan.info >
2009-06-13 20:10:27 +08:00
Bharat Mediratta and
2afa437aa9
Add a closing </b> to the warning.
...
Signed-off-by: <unostar@danalan.info >
2009-06-13 20:10:26 +08:00
Bharat Mediratta and
3d89951c77
Create gallery::date_time(), gallery::date() and gallery::time()
...
functions that format a unix timestamp into a date+time/date/time
string.
Partial fix for ticket #347 .
Signed-off-by: <unostar@danalan.info >
2009-06-13 20:10:24 +08:00
Bharat Mediratta and
96b533f1b2
Don't count the root as an album in the stats block. It'll just confuse our users.
...
Fixes ticket #369
Signed-off-by: <unostar@danalan.info >
2009-06-13 20:10:23 +08:00
unostar
8645473df0
Corrected my mistake.
2009-06-13 05:06:37 -07:00
Bharat Mediratta
5f878e169f
Move date/time format strings into a setting and bump the gallery
...
module to version 2. First test of our upgrade code!
2009-06-12 23:05:13 -07:00
Bharat Mediratta
3e71a44a96
Add a closing </b> to the warning.
2009-06-12 23:04:34 -07:00
Bharat Mediratta
26314d0ef8
Create gallery::date_time(), gallery::date() and gallery::time()
...
functions that format a unix timestamp into a date+time/date/time
string.
Partial fix for ticket #347 .
2009-06-12 22:44:51 -07:00
Bharat Mediratta
4166fbcd67
Don't count the root as an album in the stats block. It'll just confuse our users.
...
Fixes ticket #369
2009-06-12 21:42:01 -07:00
Bharat Mediratta
8a089310ce
Merge branch 'master' of git@github.com:gallery/gallery3
2009-06-12 18:08:37 -07:00
Bharat Mediratta
e076433383
Support imports from multisite G2 installs.
2009-06-12 18:08:14 -07:00
unostar and Bharat Mediratta
878d82cb46
Multi-byte safe function to support all other languages.
...
Signed-off-by: Bharat Mediratta <bharat@menalto.com >
2009-06-13 08:14:21 +08:00
Tim Almdal and
5f3d33b58e
Continue refactoring the rss module and distribute the creation of album and
...
tag feeds to the gallery and tag modules respectively. This chould close
ticket #388
Signed-off-by: <unostar@danalan.info >
2009-06-13 04:22:28 +08:00