Include the subreddit name in the header of BoringPages.

andrew-smith · Dec 1, 2011 · 2aba12f · 2aba12f
1 parent 50c51c2
commit 2aba12f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
@@ -654,7 +654,10 @@ def __init__(self, pagename, **context):
         Reddit.__init__(self, **context)
 
     def build_toolbars(self):
-        return [PageNameNav('nomenu', title = self.pagename)]
+        if not isinstance(c.site, DefaultSR) and not c.cname:
+            return [PageNameNav('subreddit', title = self.pagename)]
+        else:
+            return [PageNameNav('nomenu', title = self.pagename)]
 
 class HelpPage(BoringPage):
     def build_toolbars(self):

diff --git a/r2/r2/templates/pagenamenav.html b/r2/r2/templates/pagenamenav.html
@@ -25,6 +25,9 @@
 <%def name="subreddit()">
   <span class="hover pagename redditname">
     ${plain_link(c.site.name, c.site.path, _sr_path=False)}
+    % if hasattr(thing, "title"):
+      : ${thing.title}
+    % endif
   </span>
 </%def>