Merge branch 'master' of git@github.com:gallery/gallery3

2 files changed, 12 insertions, 8 deletions

diff --git a/modules/rss/helpers/rss_theme.php b/modules/rss/helpers/rss_theme.php
index d47d3313..54bba210 100644
--- a/modules/rss/helpers/rss_theme.php
+++ b/modules/rss/helpers/rss_theme.php
@@ -40,12 +40,16 @@ class rss_theme_Core {
     $block->css_id = "gRss";
     $block->title = t("Available RSS Feeds");
     $block->content = new View("rss_block.html");
-    $block->content->feeds = array(
-      t("New photos or movies") => url::site("rss/updates"),
-      t("All new comments") => url::site("rss/comments"),
-      sprintf(t("Comments on %s"),
-              $theme->item()->title) => url::site("rss/comments/{$theme->item()->id}")
-    );
+    // @todo consider pushing the code for the feeds back to the associated modules
+    // and create an event 'generate_rss_feeds' that modules can respond to create
+    // the list of feeds.
+    $feeds = array(t("New photos or movies") => url::site("rss/updates"));
+    if (module::is_active("comment")) {
+      $feeds[t("All new comments")] = url::site("rss/comments");
+      $feeds[sprintf(t("Comments on %s"), $theme->item()->title)] =
+        url::site("rss/comments/{$theme->item()->id}");
+    }
+    $block->content->feeds = $feeds;
     return $block;
   }
 }
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index f306f287..03c13cc1 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -92,11 +92,11 @@ a:hover,
   margin: .3em 1em;
 }
 
-.rtl #gDialog .gCancel {
+#gForgotPasswordLink, .rtl #gDialog .gCancel {
   float: right;
 }
 
-.rtl #gForgotPasswordLink {
+#gDialog .gCancel, .rtl #gForgotPasswordLink {
   float: left;
 }