Commit Graph

4686 Commits

Author SHA1 Message Date
Tim Almdal
f83a080bf1 Change the page.html file so that if the type of page is login, the sidebar contents are are not shown
Signed-off-by:  <unostar@danalan.info>
2009-06-17 13:51:35 +08:00
Andy Staudacher
cbeee943b1 Beautify "Show All" link, and only show when it's not already showing all strings
Signed-off-by:  <unostar@danalan.info>
2009-06-17 13:51:32 +08:00
Andy Staudacher
022d12cb86 Add option to list *all* l10n messages (that have been indexed) in l10n UI
TODO: The "Show All" link is almost invisible (link color ~= background)

Signed-off-by:  <unostar@danalan.info>
2009-06-17 13:51:31 +08:00
Bharat Mediratta
236d5ff76d Add support for uploading .jpeg files (in addition to .jpg)
Fix for ticket #428

Signed-off-by:  <unostar@danalan.info>
2009-06-17 13:51:28 +08:00
Bharat Mediratta
04853f1996 Swap Jakob's placeholder in for mine.
Signed-off-by:  <unostar@danalan.info>
2009-06-17 13:51:27 +08:00
Bharat Mediratta
18a313c454 Use a placeholder image if ffmpeg is missing instead of throwing an
exception which would get silently swallowed by swfUpload.

Signed-off-by:  <unostar@danalan.info>
2009-06-17 13:51:26 +08:00
Bharat Mediratta
15f3d58b02 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.

Signed-off-by:  <unostar@danalan.info>
2009-06-17 13:51:21 +08:00
Bharat Mediratta
8af66822e2 Move all the fullsize code into the theme to make it less confusing.
Partial fix for ticket #427.

Signed-off-by:  <unostar@danalan.info>
2009-06-17 13:51:20 +08:00
Andy Staudacher
b48c4300d4 Fix html bug in l10n message
Signed-off-by:  <unostar@danalan.info>
2009-06-17 13:51:15 +08:00
Tim Almdal
1dccc0286f Change the page.html file so that if the type of page is login, the sidebar contents are are not shown 2009-06-16 22:09:02 -07:00
Andy Staudacher
452402293e Beautify "Show All" link, and only show when it's not already showing all strings 2009-06-16 20:33:44 -07:00
Andy Staudacher
06ed45f0cb Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-16 20:26:49 -07:00
Andy Staudacher
be226b9baa Add option to list *all* l10n messages (that have been indexed) in l10n UI
TODO: The "Show All" link is almost invisible (link color ~= background)
2009-06-16 20:25:01 -07:00
Bharat Mediratta
baea5e3a1b Add support for uploading .jpeg files (in addition to .jpg)
Fix for ticket #428
2009-06-16 20:10:25 -07:00
Bharat Mediratta
b5582b1d63 Swap Jakob's placeholder in for mine. 2009-06-16 19:50:26 -07:00
Bharat Mediratta
b4ef00c8d4 Use a placeholder image if ffmpeg is missing instead of throwing an
exception which would get silently swallowed by swfUpload.
2009-06-16 19:47:52 -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
821918cb65 Refactor common xxx_menu() code into private _menu() helper.
Signed-off-by:  <unostar@danalan.info>
2009-06-17 04:56:52 +08:00
Bharat Mediratta
ab38c92771 Refactor common xxx_menu() code into private _menu() helper. 2009-06-16 13:34:42 -07:00
Bharat Mediratta
a405e69dbb Refactor the comment_rss::feed() method to eliminate code duplication.
Signed-off-by:  <unostar@danalan.info>
2009-06-16 18:27:43 +08:00
Bharat Mediratta
0b05383c45 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

Signed-off-by:  <unostar@danalan.info>
2009-06-16 18:27:36 +08:00
Bharat Mediratta
4797f5b0cf 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.

Signed-off-by:  <unostar@danalan.info>
2009-06-16 18:27:34 +08:00
Bharat Mediratta
ce2fde5d37 Refactor the comment_rss::feed() method to eliminate code duplication. 2009-06-15 21:35:14 -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
unostar
1081eee201 Added "cutom_translations" instruction to Recaptcha to localize & cutomize recaptcha message. 2009-06-15 05:54:45 -07:00
Bharat Mediratta
2a5ffaae7e 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

Signed-off-by:  <unostar@danalan.info>
2009-06-15 17:31:24 +08:00
Bharat Mediratta
0051c2c89b 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.

Signed-off-by:  <unostar@danalan.info>
2009-06-15 17:31:22 +08:00
Bharat Mediratta
3b684655e2 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.

Signed-off-by:  <unostar@danalan.info>
2009-06-15 17:31:17 +08:00
Bharat Mediratta
2ecb00c492 Trap gallery2 errors when we try to load an invalid user id and abort loading that user.
Signed-off-by:  <unostar@danalan.info>
2009-06-15 17:31:15 +08:00
unostar
08a5b75345 Add string to localizer 2009-06-15 02:02:25 -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
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
Tim Almdal
83d1b15c1e Don't use stdClass to return the feed data. Just use an array.
Signed-off-by:  <unostar@danalan.info>
2009-06-15 04:26:07 +08:00
Tim Almdal
6007843c4a 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.

Signed-off-by:  <unostar@danalan.info>
2009-06-15 04:26:03 +08:00
Tim Almdal
fdbffc870d 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.

Signed-off-by:  <unostar@danalan.info>
2009-06-15 04:26:01 +08:00
Tim Almdal
879e81f0a1 Rename:
rss::get_feeds() -> rss::available_feeds()
 rss::process_feed() -> rss::feed_data()

Signed-off-by:  <unostar@danalan.info>
2009-06-15 04:26:00 +08:00
Tim Almdal
10d9c6a92a 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.

Signed-off-by:  <unostar@danalan.info>
2009-06-15 04:25:58 +08:00
Bharat Mediratta
fda706f55c Get rid of the word "items" in the delete confirmation dialog.
Signed-off-by:  <unostar@danalan.info>
2009-06-15 04:25:41 +08:00
Bharat Mediratta
b0e7dded23 Add a warning about eAccelerator interfering with g2_import.
Signed-off-by:  <unostar@danalan.info>
2009-06-15 04:25:40 +08: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