From 2aba12f6e671c2beb0b3432658fd5051ca03f497 Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Wed, 23 Nov 2011 19:23:26 -0800
Subject: [PATCH] Include the subreddit name in the header of BoringPages.

---
 r2/r2/lib/pages/pages.py         | 5 ++++-
 r2/r2/templates/pagenamenav.html | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index bf296fda3..6c63ce9d5 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -654,7 +654,10 @@ class BoringPage(Reddit):
         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
index 29876c190..c9d0f49f0 100644
--- 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>