Added navigation bar to Dashboard.

r2/r2/config/routing.py

@@ -94,7 +94,7 @@ def make_map(global_conf={}, app_conf={}):
     mc('/dashboard/comments', action='listing', controller='interestingcomments')
     mc('/dashboard/subscribed', action='listing', controller='interestingsubscribed')
     mc('/dashboard/posts', action='listing', controller='interestingposts')
-    mc('/dashboard', action='listing', controller='listingtest')
+    mc('/dashboard/', action='listing', controller='listingtest')
 
     # Can't use map.resource because the version of the Routing module we're
     # using doesn't support the controller_action kw arg

r2/r2/controllers/dashboardcontroller.py

@@ -27,7 +27,8 @@ class InterestingcommentsController(CommentsController):
 
     @property
     def header_sub_nav(self):
-	    return [NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
+	    return [NamedButton("dashboard", dest="dashboard"),
+                NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
                 NamedButton("leadingposts", dest="dashboard/posts"),
                 NamedButton("leadingcomments", dest="dashboard/comments")]
 
@@ -84,7 +85,8 @@ class InterestingsubscribedController(CommentsController):
 
     @property
     def header_sub_nav(self):
-	    return [NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
+	    return [NamedButton("dashboard", dest="dashboard"),
+                NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
                 NamedButton("leadingposts", dest="dashboard/posts"),
                 NamedButton("leadingcomments", dest="dashboard/comments")]
 
@@ -153,7 +155,8 @@ class InterestingpostsController(CommentsController):
 
     @property
     def header_sub_nav(self):
-	    return [NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
+	    return [NamedButton("dashboard", dest="dashboard"),
+                NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
                 NamedButton("leadingposts", dest="dashboard/posts"),
                 NamedButton("leadingcomments", dest="dashboard/comments")]
 
@@ -205,6 +208,13 @@ def GET_listing(self, time, **env):
         return CommentsController.GET_listing(self, **env)
 
 class ListingtestController(CommentsController):
+    @property
+    def header_sub_nav(self):
+	    return [NamedButton("dashboard", dest="dashboard"),
+                NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
+                NamedButton("leadingposts", dest="dashboard/posts"),
+                NamedButton("leadingcomments", dest="dashboard/comments")]
+
     render_cls = FormPage
     builder_cls = UnbannedCommentBuilder
 
@@ -266,5 +276,5 @@ def content(self):
     def GET_listing(self, time, **env):
         self.time = time
         content = self.content()
-        res = FormPage("Dashboard", content = content).render()
+        res = FormPage("Dashboard", content = content, header_sub_nav = self.header_sub_nav).render()
         return res

r2/r2/lib/menus.py

@@ -73,6 +73,7 @@ def __getattr__(self, attr):
                      posts        = _('Posts'),
                      topcomments     = _('Top Comments'),
                      newcomments     = _('New Comments'),
+                     dashboard    = _('Dashboard'),
                      leadingsubscribed = _('Leading Subscribed'),
                      leadingcomments = _('Leading Comments'),
                      leadingposts = _('Leading Posts'),