From 1e4590c980ab6b8adb940f14cf00626dd70033b1 Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Thu, 15 Aug 2013 14:45:25 -0700
Subject: [PATCH 1/4] Created dashboard listing containing both leading
 comments and posts.

---
 r2/r2/config/routing.py                  |   1 +
 r2/r2/controllers/__init__.py            |   8 +-
 r2/r2/controllers/dashboardcontroller.py | 219 +++++++++++++++++++++++
 r2/r2/controllers/listingcontroller.py   | 159 +---------------
 r2/r2/lib/pages/pages.py                 |  50 ++++++
 r2/r2/models/listing.py                  |   2 +
 r2/r2/templates/dashboardlisting.html    |  41 +++++
 7 files changed, 321 insertions(+), 159 deletions(-)
 create mode 100644 r2/r2/controllers/dashboardcontroller.py
 create mode 100644 r2/r2/templates/dashboardlisting.html

diff --git a/r2/r2/config/routing.py b/r2/r2/config/routing.py
index 1603d86e..73dfa90c 100644
--- a/r2/r2/config/routing.py
+++ b/r2/r2/config/routing.py
@@ -94,6 +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')
 
     # Can't use map.resource because the version of the Routing module we're
     # using doesn't support the controller_action kw arg
diff --git a/r2/r2/controllers/__init__.py b/r2/r2/controllers/__init__.py
index d00b3734..14c62d02 100644
--- a/r2/r2/controllers/__init__.py
+++ b/r2/r2/controllers/__init__.py
@@ -40,9 +40,11 @@
 from listingcontroller import EditsController
 from listingcontroller import MeetupslistingController
 from listingcontroller import KarmaawardController
-from listingcontroller import InterestingcommentsController
-from listingcontroller import InterestingsubscribedController
-from listingcontroller import InterestingpostsController
+
+from dashboardcontroller import InterestingcommentsController
+from dashboardcontroller import InterestingsubscribedController
+from dashboardcontroller import InterestingpostsController
+from dashboardcontroller import ListingtestController
 
 from listingcontroller import MyredditsController
 
diff --git a/r2/r2/controllers/dashboardcontroller.py b/r2/r2/controllers/dashboardcontroller.py
new file mode 100644
index 00000000..e34d3715
--- /dev/null
+++ b/r2/r2/controllers/dashboardcontroller.py
@@ -0,0 +1,219 @@
+from r2.controllers.listingcontroller import CommentsController
+from r2.models import *
+from validator import *
+from r2.lib.pages import *
+from r2.lib.menus import DashboardTimeMenu
+from r2.lib.db import queries
+
+from pylons.i18n import _
+
+from datetime import datetime
+
+def last_dashboard_visit():
+    hc_key = "dashboard_visit-%s" % c.user.name
+    cache_visit = g.permacache.get(hc_key, None)
+    if cache_visit:
+        return cache_visit
+    else:
+        last_visit = c.user.dashboard_visit
+        g.permacache.set(hc_key, last_visit, time = int(g.dashboard_visits_period)) 
+        c.user.dashboard_visit = datetime.now(g.tz)
+        c.user._commit()
+        return last_visit
+
+class InterestingcommentsController(CommentsController):
+    title_text = _('Leading Comments')
+    builder_cls = UnbannedCommentBuilder
+
+    @property
+    def header_sub_nav(self):
+	    return [NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
+                NamedButton("leadingposts", dest="dashboard/posts"),
+                NamedButton("leadingcomments", dest="dashboard/comments")]
+
+    def query(self):
+        q = Comment._query(Comment.c._spam == (True,False),
+                           sort = desc('_interestingness'),
+                           eager_load = True, data = True)
+        if not c.user_is_admin:
+            q._filter(Comment.c._spam == False)
+
+        if self.time == 'last':
+            q._filter(Thing.c._date >= last_dashboard_visit())
+        elif self.time != 'all':
+            q._filter(queries.db_times[self.time])
+
+        return q
+
+    def builder(self):
+        b = self.builder_cls(self.query_obj,
+                             num = self.num,
+                             skip = self.skip,
+                             after = self.after,
+                             count = self.count,
+                             reverse = self.reverse,
+                             wrap = self.builder_wrapper,
+                             sr_ids = [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id])
+        return b
+
+    @property
+    def top_filter(self):
+        return DashboardTimeMenu(default = self.time, title = _('Filter'), type='dropdown2')
+
+    @validate(VUser(),
+              time = VMenu('where', DashboardTimeMenu))
+    def GET_listing(self, time, **env):
+        self.time = time
+        return CommentsController.GET_listing(self, **env)
+
+class ListingtestController(CommentsController):
+    def commentquery(self):
+        q = Comment._query(Comment.c._spam == (True,False),
+                           sort = desc('_interestingness'),
+                           eager_load = True, data = True)
+        if not c.user_is_admin:
+            q._filter(Comment.c._spam == False)
+
+        if self.time == 'last':
+            q._filter(Thing.c._date >= last_dashboard_visit())
+        elif self.time != 'all':
+            q._filter(queries.db_times[self.time])
+
+        return q
+
+    def linkquery(self):
+        q = Link._query(Link.c._spam == (True,False),
+                        sort = desc('_interestingness'),
+                        eager_load = True, data = True)
+        if not c.user_is_admin:
+            q._filter(Link.c._spam == False)
+
+        if self.time == 'last':
+            q._filter(Thing.c._date >= last_dashboard_visit())
+        elif self.time != 'all':
+            q._filter(queries.db_times[self.time])
+
+        return q
+
+    def builder(self, query):
+        b = self.builder_cls(query,
+                             num = 3,
+                             wrap = self.builder_wrapper,
+                             sr_ids = [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id])
+        return b
+
+    def content(self):
+        lb = self.builder(self.linkquery())
+        cb = self.builder(self.commentquery())
+
+        ll = DashboardListing(lb)
+        cl = DashboardListing(cb)
+        
+        displayPane = PaneStack()
+
+        displayPane.append(ll.listing())
+        displayPane.append(cl.listing())
+
+        return displayPane
+
+    @validate(VUser(),
+              time = VMenu('where', DashboardTimeMenu))
+    def GET_listing(self, time, **env):
+        self.time = time
+        return CommentsController.GET_listing(self, **env)
+
+class InterestingsubscribedController(CommentsController):
+    title_text = _('Leading Subscribed Comments')
+    builder_cls = UnbannedCommentBuilder
+
+    @property
+    def header_sub_nav(self):
+	    return [NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
+                NamedButton("leadingposts", dest="dashboard/posts"),
+                NamedButton("leadingcomments", dest="dashboard/comments")]
+
+    def query(self):
+        q = SubscriptionStorage._query(SubscriptionStorage.c._thing1_id == c.user._id,
+                                       SubscriptionStorage.c._t2_deleted == False,
+                                       SubscriptionStorage.c._name == 'subscriptionstorage',
+                                       sort = desc('_t2_interestingness'),
+                                       eager_load = True,
+                                       thing_data = not g.use_query_cache
+                                       )
+        #if not c.user_is_admin:
+        #    q._filter(Comment.c._spam == False)
+
+        q.prewrap_fn = lambda x: x._thing2
+
+        if self.time == 'last':
+            q._filter(SubscriptionStorage.c._date >= last_dashboard_visit())
+        elif self.time != 'all':
+            q._filter(SubscriptionStorage.c._date >= timeago(queries.relation_db_times[self.time]))
+
+        return q
+
+    def builder(self):
+        b = self.builder_cls(self.query_obj,
+                             num = self.num,
+                             skip = self.skip,
+                             after = self.after,
+                             count = self.count,
+                             reverse = self.reverse,
+                             wrap = self.builder_wrapper,
+                             sr_ids = [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id])
+        return b
+
+    @property
+    def top_filter(self):
+        return DashboardTimeMenu(default = self.time, title = _('Filter'), type='dropdown2')
+
+    @validate(VUser(),
+              time = VMenu('where', DashboardTimeMenu))
+    def GET_listing(self, time, **env):
+        self.time = time
+        return CommentsController.GET_listing(self, **env)
+
+class InterestingpostsController(CommentsController):
+    title_text = _('Leading Posts')
+    builder_cls = QueryBuilder
+
+    @property
+    def header_sub_nav(self):
+	    return [NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
+                NamedButton("leadingposts", dest="dashboard/posts"),
+                NamedButton("leadingcomments", dest="dashboard/comments")]
+
+    def query(self):
+        q = Link._query(Link.c._spam == (True,False),
+                        sort = desc('_interestingness'),
+                        eager_load = True, data = True)
+        if not c.user_is_admin:
+            q._filter(Link.c._spam == False)
+
+        if self.time == 'last':
+            q._filter(Thing.c._date >= last_dashboard_visit())
+        elif self.time != 'all':
+            q._filter(queries.db_times[self.time])
+
+        return q
+
+    def builder(self):
+        b = self.builder_cls(self.query_obj,
+                             num = self.num,
+                             skip = self.skip,
+                             after = self.after,
+                             count = self.count,
+                             reverse = self.reverse,
+                             wrap = self.builder_wrapper,
+                             sr_ids = [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id])
+        return b
+
+    @property
+    def top_filter(self):
+        return DashboardTimeMenu(default = self.time, title = _('Filter'), type='dropdown2')
+
+    @validate(VUser(),
+              time = VMenu('where', DashboardTimeMenu))
+    def GET_listing(self, time, **env):
+        self.time = time
+        return CommentsController.GET_listing(self, **env)
diff --git a/r2/r2/controllers/listingcontroller.py b/r2/r2/controllers/listingcontroller.py
index 26a4d3a7..957e9656 100644
--- a/r2/r2/controllers/listingcontroller.py
+++ b/r2/r2/controllers/listingcontroller.py
@@ -134,9 +134,9 @@ def build_listing(self, num, after, reverse, count):
         if after is not None:
             self.robots = "noindex,follow"
 
-        self.query_obj = self.query()
-        self.builder_obj = self.builder()
-        self.listing_obj = self.listing()
+        #self.query_obj = self.query()
+        #self.builder_obj = self.builder()
+        #self.listing_obj = self.listing()
         content = self.content()
         res =  self.render_cls(content = content,
                                show_sidebar = self.show_sidebar,
@@ -905,156 +905,3 @@ def top_filter(self):
 	def GET_listing(self, time, **env):
 		self.time = time
 		return CommentsController.GET_listing(self, **env)
-
-def last_dashboard_visit():
-    hc_key = "dashboard_visit-%s" % c.user.name
-    cache_visit = g.permacache.get(hc_key, None)
-    if cache_visit:
-        return cache_visit
-    else:
-        last_visit = c.user.dashboard_visit
-        g.permacache.set(hc_key, last_visit, time = int(g.dashboard_visits_period)) 
-        c.user.dashboard_visit = datetime.now(g.tz)
-        c.user._commit()
-        return last_visit
-
-class InterestingcommentsController(CommentsController):
-    title_text = _('Leading Comments')
-    builder_cls = UnbannedCommentBuilder
-
-    @property
-    def header_sub_nav(self):
-	    return [NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
-                NamedButton("leadingposts", dest="dashboard/posts"),
-                NamedButton("leadingcomments", dest="dashboard/comments")]
-
-    def query(self):
-        q = Comment._query(Comment.c._spam == (True,False),
-                           sort = desc('_interestingness'),
-                           eager_load = True, data = True)
-        if not c.user_is_admin:
-            q._filter(Comment.c._spam == False)
-
-        if self.time == 'last':
-            q._filter(Thing.c._date >= last_dashboard_visit())
-        elif self.time != 'all':
-            q._filter(queries.db_times[self.time])
-
-        return q
-
-    def builder(self):
-        b = self.builder_cls(self.query_obj,
-                             num = self.num,
-                             skip = self.skip,
-                             after = self.after,
-                             count = self.count,
-                             reverse = self.reverse,
-                             wrap = self.builder_wrapper,
-                             sr_ids = [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id])
-        return b
-
-    @property
-    def top_filter(self):
-        return DashboardTimeMenu(default = self.time, title = _('Filter'), type='dropdown2')
-
-    @validate(VUser(),
-              time = VMenu('where', DashboardTimeMenu))
-    def GET_listing(self, time, **env):
-        self.time = time
-        return CommentsController.GET_listing(self, **env)
-
-class InterestingsubscribedController(CommentsController):
-    title_text = _('Leading Subscribed Comments')
-    builder_cls = UnbannedCommentBuilder
-
-    @property
-    def header_sub_nav(self):
-	    return [NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
-                NamedButton("leadingposts", dest="dashboard/posts"),
-                NamedButton("leadingcomments", dest="dashboard/comments")]
-
-    def query(self):
-        q = SubscriptionStorage._query(SubscriptionStorage.c._thing1_id == c.user._id,
-                                       SubscriptionStorage.c._t2_deleted == False,
-                                       SubscriptionStorage.c._name == 'subscriptionstorage',
-                                       sort = desc('_t2_interestingness'),
-                                       eager_load = True,
-                                       thing_data = not g.use_query_cache
-                                       )
-        #if not c.user_is_admin:
-        #    q._filter(Comment.c._spam == False)
-
-        q.prewrap_fn = lambda x: x._thing2
-
-        if self.time == 'last':
-            q._filter(SubscriptionStorage.c._date >= last_dashboard_visit())
-        elif self.time != 'all':
-            q._filter(SubscriptionStorage.c._date >= timeago(queries.relation_db_times[self.time]))
-
-        return q
-
-    def builder(self):
-        b = self.builder_cls(self.query_obj,
-                             num = self.num,
-                             skip = self.skip,
-                             after = self.after,
-                             count = self.count,
-                             reverse = self.reverse,
-                             wrap = self.builder_wrapper,
-                             sr_ids = [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id])
-        return b
-
-    @property
-    def top_filter(self):
-        return DashboardTimeMenu(default = self.time, title = _('Filter'), type='dropdown2')
-
-    @validate(VUser(),
-              time = VMenu('where', DashboardTimeMenu))
-    def GET_listing(self, time, **env):
-        self.time = time
-        return CommentsController.GET_listing(self, **env)
-
-class InterestingpostsController(CommentsController):
-    title_text = _('Leading Posts')
-    builder_cls = QueryBuilder
-
-    @property
-    def header_sub_nav(self):
-	    return [NamedButton("leadingsubscribed", dest="dashboard/subscribed"),
-                NamedButton("leadingposts", dest="dashboard/posts"),
-                NamedButton("leadingcomments", dest="dashboard/comments")]
-
-    def query(self):
-        q = Link._query(Link.c._spam == (True,False),
-                        sort = desc('_interestingness'),
-                        eager_load = True, data = True)
-        if not c.user_is_admin:
-            q._filter(Link.c._spam == False)
-
-        if self.time == 'last':
-            q._filter(Thing.c._date >= last_dashboard_visit())
-        elif self.time != 'all':
-            q._filter(queries.db_times[self.time])
-
-        return q
-
-    def builder(self):
-        b = self.builder_cls(self.query_obj,
-                             num = self.num,
-                             skip = self.skip,
-                             after = self.after,
-                             count = self.count,
-                             reverse = self.reverse,
-                             wrap = self.builder_wrapper,
-                             sr_ids = [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id])
-        return b
-
-    @property
-    def top_filter(self):
-        return DashboardTimeMenu(default = self.time, title = _('Filter'), type='dropdown2')
-
-    @validate(VUser(),
-              time = VMenu('where', DashboardTimeMenu))
-    def GET_listing(self, time, **env):
-        self.time = time
-        return CommentsController.GET_listing(self, **env)
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 64a68168..852692a6 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -330,6 +330,56 @@ def wrap_thing(thing):
 
         return w
 
+def last_dashboard_visit():
+    hc_key = "dashboard_visit-%s" % c.user.name
+    cache_visit = g.permacache.get(hc_key, None)
+    if cache_visit:
+        return cache_visit
+    else:
+        last_visit = c.user.dashboard_visit
+        g.permacache.set(hc_key, last_visit, time = int(g.dashboard_visits_period)) 
+        c.user.dashboard_visit = datetime.now(g.tz)
+        c.user._commit()
+        return last_visit
+
+class DashboardBox(Wrapped):
+    def __init__(self, *args, **kwargs):
+        self.things = self.init_builder()
+        Wrapped.__init__(self, *args, **kwargs)
+
+    def query(self):
+        raise NotImplementedError
+
+    def init_builder(self):
+        return QueryBuilder(self.query(), wrap=self.wrap_thing)
+
+    @staticmethod
+    def wrap_thing(thing):
+        w = Wrapped(thing)
+
+        return w
+
+class LeadingCommentBox(DashboardBox):
+    def query(self):
+        q = Comment._query(Comment.c._spam == (True,False),
+                           sort = desc('_interestingness'),
+                           eager_load = True, data = True)
+        if not c.user_is_admin:
+            q._filter(Comment.c._spam == False)
+
+
+        #q._filter(Thing.c._date >= last_dashboard_visit())
+
+        return q
+
+    def init_builder(self):
+        b = UnbannedCommentBuilder(self.query(),
+                                   num = 3,
+                                   skip = True,
+                                   wrap = DashboardBox.wrap_thing,
+                                   sr_ids = [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id])
+        return b
+
 class RecentComments(RecentItems):
     def query(self):
         return c.current_or_default_sr.get_comments('new', 'all')
diff --git a/r2/r2/models/listing.py b/r2/r2/models/listing.py
index e80d57d8..f5d54b00 100644
--- a/r2/r2/models/listing.py
+++ b/r2/r2/models/listing.py
@@ -130,6 +130,8 @@ def listing(self):
         #make into a tree thing
         return Wrapped(self)
 
+class DashboardListing(Listing): pass
+
 class OrganicListing(Listing):
     # class used in Javascript to manage these objects
     _js_cls = "OrganicListing"
diff --git a/r2/r2/templates/dashboardlisting.html b/r2/r2/templates/dashboardlisting.html
new file mode 100644
index 00000000..a7a93a33
--- /dev/null
+++ b/r2/r2/templates/dashboardlisting.html
@@ -0,0 +1,41 @@
+## The contents of this file are subject to the Common Public Attribution
+## License Version 1.0. (the "License"); you may not use this file except in
+## compliance with the License. You may obtain a copy of the License at
+## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+## License Version 1.1, but Sections 14 and 15 have been added to cover use of
+## software over a computer network and provide for limited attribution for the
+## Original Developer. In addition, Exhibit A has been modified to be consistent
+## with Exhibit B.
+## 
+## Software distributed under the License is distributed on an "AS IS" basis,
+## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+## the specific language governing rights and limitations under the License.
+## 
+## The Original Code is Reddit.
+## 
+## The Original Developer is the Initial Developer.  The Initial Developer of
+## the Original Code is CondeNet, Inc.
+## 
+## All portions of the code written by CondeNet are Copyright (c) 2006-2008
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+
+<% from r2.lib.template_helpers import replace_render, add_sr %>
+<%namespace file="utils.html" import="plain_link" />
+
+<%
+   _id = ("_%s" % thing.parent_name) if hasattr(thing, 'parent_name') else ''
+ %>
+<div id="siteTable${_id}" class="sitetable">
+  <div id="ajaxHook${_id}" class="ajaxhook">
+  </div>
+
+  %for a in thing.things:
+     ${unsafe(replace_render(thing, a))}
+  %endfor
+</div>
+
+${plain_link(_("More"), "/dashboard/comments")}  
+%if not thing.things:
+  <p id="noresults" class="error">${_("There doesn't seem to be anything here.")}</p>
+%endif

From a24d61f902af783783557d32f45e5156920b23ae Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Sun, 18 Aug 2013 17:03:32 -0700
Subject: [PATCH 2/4] Dashboard shows interesting content, with links to more
 content.

---
 r2/r2/controllers/dashboardcontroller.py      | 169 +++++---
 r2/r2/controllers/listingcontroller.py        |  20 +-
 r2/r2/lib/pages/pages.py                      |  56 +--
 r2/r2/models/link.py                          |   8 +
 r2/r2/models/listing.py                       |   5 +-
 r2/r2/public/static/main.css                  |  10 +
 r2/r2/templates/dashboardbloglisting.html     |  47 +++
 r2/r2/templates/dashboardlisting.html         |   8 +-
 .../templates/dashboardwikieditslisting.html  |  46 +++
 r2/r2/templates/dashtable.html                |  24 ++
 r2/r2/templates/linkcompressed.html           | 378 ++++++++++++++++++
 11 files changed, 668 insertions(+), 103 deletions(-)
 create mode 100644 r2/r2/templates/dashboardbloglisting.html
 create mode 100644 r2/r2/templates/dashboardwikieditslisting.html
 create mode 100644 r2/r2/templates/dashtable.html
 create mode 100644 r2/r2/templates/linkcompressed.html

diff --git a/r2/r2/controllers/dashboardcontroller.py b/r2/r2/controllers/dashboardcontroller.py
index e34d3715..a8364c49 100644
--- a/r2/r2/controllers/dashboardcontroller.py
+++ b/r2/r2/controllers/dashboardcontroller.py
@@ -1,4 +1,4 @@
-from r2.controllers.listingcontroller import CommentsController
+from r2.controllers.listingcontroller import CommentsController, MeetupslistingController
 from r2.models import *
 from validator import *
 from r2.lib.pages import *
@@ -45,6 +45,18 @@ def query(self):
 
         return q
 
+    @staticmethod
+    def staticquery():
+        q = Comment._query(Comment.c._spam == (True,False),
+                           sort = desc('_interestingness'),
+                           eager_load = True, data = True)
+        if not c.user_is_admin:
+            q._filter(Comment.c._spam == False)
+
+        q._filter(Thing.c._date >= last_dashboard_visit())
+
+        return q
+
     def builder(self):
         b = self.builder_cls(self.query_obj,
                              num = self.num,
@@ -66,62 +78,6 @@ def GET_listing(self, time, **env):
         self.time = time
         return CommentsController.GET_listing(self, **env)
 
-class ListingtestController(CommentsController):
-    def commentquery(self):
-        q = Comment._query(Comment.c._spam == (True,False),
-                           sort = desc('_interestingness'),
-                           eager_load = True, data = True)
-        if not c.user_is_admin:
-            q._filter(Comment.c._spam == False)
-
-        if self.time == 'last':
-            q._filter(Thing.c._date >= last_dashboard_visit())
-        elif self.time != 'all':
-            q._filter(queries.db_times[self.time])
-
-        return q
-
-    def linkquery(self):
-        q = Link._query(Link.c._spam == (True,False),
-                        sort = desc('_interestingness'),
-                        eager_load = True, data = True)
-        if not c.user_is_admin:
-            q._filter(Link.c._spam == False)
-
-        if self.time == 'last':
-            q._filter(Thing.c._date >= last_dashboard_visit())
-        elif self.time != 'all':
-            q._filter(queries.db_times[self.time])
-
-        return q
-
-    def builder(self, query):
-        b = self.builder_cls(query,
-                             num = 3,
-                             wrap = self.builder_wrapper,
-                             sr_ids = [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id])
-        return b
-
-    def content(self):
-        lb = self.builder(self.linkquery())
-        cb = self.builder(self.commentquery())
-
-        ll = DashboardListing(lb)
-        cl = DashboardListing(cb)
-        
-        displayPane = PaneStack()
-
-        displayPane.append(ll.listing())
-        displayPane.append(cl.listing())
-
-        return displayPane
-
-    @validate(VUser(),
-              time = VMenu('where', DashboardTimeMenu))
-    def GET_listing(self, time, **env):
-        self.time = time
-        return CommentsController.GET_listing(self, **env)
-
 class InterestingsubscribedController(CommentsController):
     title_text = _('Leading Subscribed Comments')
     builder_cls = UnbannedCommentBuilder
@@ -140,8 +96,8 @@ def query(self):
                                        eager_load = True,
                                        thing_data = not g.use_query_cache
                                        )
-        #if not c.user_is_admin:
-        #    q._filter(Comment.c._spam == False)
+        if not c.user_is_admin:
+            q._filter(Comment.c._spam == False)
 
         q.prewrap_fn = lambda x: x._thing2
 
@@ -152,6 +108,24 @@ def query(self):
 
         return q
 
+    @staticmethod
+    def staticquery():
+        q = SubscriptionStorage._query(SubscriptionStorage.c._thing1_id == c.user._id,
+                                       SubscriptionStorage.c._t2_deleted == False,
+                                       SubscriptionStorage.c._name == 'subscriptionstorage',
+                                       sort = desc('_t2_interestingness'),
+                                       eager_load = True,
+                                       thing_data = not g.use_query_cache
+                                       )
+        if not c.user_is_admin:
+            q._filter(SubscriptionStorage.c._t2_spam == False)
+
+        q.prewrap_fn = lambda x: x._thing2
+
+        q._filter(SubscriptionStorage.c._date >= last_dashboard_visit())
+
+        return q
+
     def builder(self):
         b = self.builder_cls(self.query_obj,
                              num = self.num,
@@ -197,6 +171,18 @@ def query(self):
 
         return q
 
+    @staticmethod
+    def staticquery():
+        q = Link._query(Link.c._spam == (True,False),
+                        sort = desc('_interestingness'),
+                        eager_load = True, data = True)
+        if not c.user_is_admin:
+            q._filter(Link.c._spam == False)
+
+        q._filter(Thing.c._date >= last_dashboard_visit())
+
+        return q
+
     def builder(self):
         b = self.builder_cls(self.query_obj,
                              num = self.num,
@@ -217,3 +203,68 @@ def top_filter(self):
     def GET_listing(self, time, **env):
         self.time = time
         return CommentsController.GET_listing(self, **env)
+
+class ListingtestController(CommentsController):
+    render_cls = FormPage
+    builder_cls = UnbannedCommentBuilder
+
+    def iterable_builder(self, query):
+        b = self.builder_cls(query,
+                             num = 3,
+                             wrap = self.builder_wrapper,
+                             sr_ids = [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id])
+        return b
+
+   
+    def create_listing(self, controller, title):
+        return DashboardListing(self.iterable_builder(controller), title).listing()
+
+    @staticmethod
+    def builder_wrapper(thing):
+        w = Wrapped(thing)
+
+        if isinstance(thing, Link):
+            w.render_class = LinkCompressed
+
+        return w
+
+    def content(self):
+        controllers = (InterestingsubscribedController.staticquery(),
+                       InterestingpostsController.staticquery(),
+                       InterestingcommentsController.staticquery(),
+                       CommentsController.staticquery())
+        titles = ('Subscribed Comments', 'Leading Posts',
+                  'Leading Comments', 'Recent Comments')
+
+        builders = [self.create_listing(*controller) for controller in zip(controllers, titles)]
+
+        self.builder_cls = IDBuilder
+
+        builders.append(self.create_listing(MeetupslistingController.staticquery(), 'Upcoming Meetups'))
+
+        self.builder_cls = UnbannedCommentBuilder
+        
+        """lb = self.builder(InterestingpostsController.query())
+        cb = self.builder(InterestingcommentsController.query())
+        sb = self.builder(InterestingsubscribedController.query())
+        rcb = self.builder(self.recentcommentsquery())
+        mb = self.builder(MeetupslistingController.query())
+
+        ll = DashboardListing(lb)
+        cl = DashboardListing(cb)
+
+        lp = PaneStack()
+        cp = PaneStack()
+
+        lp.append(ll.listing())
+        cp.append(cl.listing())"""
+
+        return Dashtable(*builders)
+
+    @validate(VUser(),
+              time = VMenu('where', DashboardTimeMenu))
+    def GET_listing(self, time, **env):
+        self.time = time
+        content = self.content()
+        res = FormPage("Dashboard", content = content).render()
+        return res
diff --git a/r2/r2/controllers/listingcontroller.py b/r2/r2/controllers/listingcontroller.py
index 957e9656..6702b683 100644
--- a/r2/r2/controllers/listingcontroller.py
+++ b/r2/r2/controllers/listingcontroller.py
@@ -134,9 +134,9 @@ def build_listing(self, num, after, reverse, count):
         if after is not None:
             self.robots = "noindex,follow"
 
-        #self.query_obj = self.query()
-        #self.builder_obj = self.builder()
-        #self.listing_obj = self.listing()
+        self.query_obj = self.query()
+        self.builder_obj = self.builder()
+        self.listing_obj = self.listing()
         content = self.content()
         res =  self.render_cls(content = content,
                                show_sidebar = self.show_sidebar,
@@ -460,6 +460,10 @@ def header_sub_nav(self):
     def query(self):
         return Meetup.upcoming_meetups_by_timestamp()
 
+    @staticmethod
+    def staticquery():
+        return Meetup.upcoming_meetups_by_timestamp()
+
 class ByIDController(ListingController):
     title_text = _('API')
 
@@ -844,6 +848,16 @@ def query(self):
 
         return q
 
+    @staticmethod
+    def staticquery():
+        q = Comment._query(Comment.c._spam == (True,False),
+                           Comment.c.sr_id == [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id],
+                           sort = desc('_date'), data = True)
+        if not c.user_is_admin:
+            q._filter(Comment.c._spam == False)
+
+        return q
+
     def builder(self):
         if c.user.pref_show_parent_comments:
             builder_cls = ContextualCommentBuilder
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 852692a6..380c84e5 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -342,44 +342,6 @@ def last_dashboard_visit():
         c.user._commit()
         return last_visit
 
-class DashboardBox(Wrapped):
-    def __init__(self, *args, **kwargs):
-        self.things = self.init_builder()
-        Wrapped.__init__(self, *args, **kwargs)
-
-    def query(self):
-        raise NotImplementedError
-
-    def init_builder(self):
-        return QueryBuilder(self.query(), wrap=self.wrap_thing)
-
-    @staticmethod
-    def wrap_thing(thing):
-        w = Wrapped(thing)
-
-        return w
-
-class LeadingCommentBox(DashboardBox):
-    def query(self):
-        q = Comment._query(Comment.c._spam == (True,False),
-                           sort = desc('_interestingness'),
-                           eager_load = True, data = True)
-        if not c.user_is_admin:
-            q._filter(Comment.c._spam == False)
-
-
-        #q._filter(Thing.c._date >= last_dashboard_visit())
-
-        return q
-
-    def init_builder(self):
-        b = UnbannedCommentBuilder(self.query(),
-                                   num = 3,
-                                   skip = True,
-                                   wrap = DashboardBox.wrap_thing,
-                                   sr_ids = [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id])
-        return b
-
 class RecentComments(RecentItems):
     def query(self):
         return c.current_or_default_sr.get_comments('new', 'all')
@@ -728,6 +690,20 @@ def __init__(self, a = None):
 
         Wrapped.__init__(self, a = a, datefmt = datefmt)
 
+class Dashboard(Reddit):
+    """Container for the dashboard main page"""
+    def rightbox(self):
+        """Contents of the right box when rendering"""
+        pass
+
+class Dashtable(Wrapped):
+    def __init__(self, subscribed, link, comment, recentcomments, meetups):
+        wikiedits = DashboardWikiEditsListing(g.recent_edits_feed)
+
+        blogfeed = DashboardBlogListing(g.feedbox_urls)
+        Wrapped.__init__(self, subscribed = subscribed, link = link, comment = comment,
+                         recentcomments = recentcomments, meetups = meetups,
+                         wikiedits = wikiedits, blogfeed = blogfeed)
 
 class EditReddit(Reddit):
     """Container for the about page for a reddit"""
@@ -1535,11 +1511,15 @@ def __init__(self, feed_urls, *a, **kw):
         self.feed_urls = feed_urls
         Wrapped.__init__(self, *a, **kw)
 
+class DashboardBlogListing(FeedBox): pass
+
 class RecentWikiEditsBox(Wrapped):
     def __init__(self, feed_url, *a, **kw):
         self.feed_url = feed_url
         Wrapped.__init__(self, *a, **kw)
 
+class DashboardWikiEditsListing(RecentWikiEditsBox): pass
+
 class SiteMeter(Wrapped):
     def __init__(self, codename, *a, **kw):
         self.codename = codename
diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index 680ef6c8..b52fb645 100644
--- a/r2/r2/models/link.py
+++ b/r2/r2/models/link.py
@@ -46,6 +46,7 @@
 import re
 import random
 import urllib
+import lxml
 from datetime import datetime
 
 class LinkExists(Exception): pass
@@ -120,6 +121,13 @@ def can_submit(self, user):
             else:
                 return False
 
+    def dashboard_snippet(self):
+        content = lxml.html.document_fromstring(self.article).text_content()
+        if len(content) < 300:
+            return self.article
+        else:
+            return content[:300]+content[300:].partition(' ')[0]+'...'
+
     def is_blessed(self):
         return self.blessed
 
diff --git a/r2/r2/models/listing.py b/r2/r2/models/listing.py
index f5d54b00..fba3bccd 100644
--- a/r2/r2/models/listing.py
+++ b/r2/r2/models/listing.py
@@ -130,7 +130,10 @@ def listing(self):
         #make into a tree thing
         return Wrapped(self)
 
-class DashboardListing(Listing): pass
+class DashboardListing(Listing):
+    def __init__(self, builder, title):
+        self.title = title
+        Listing.__init__(self, builder)
 
 class OrganicListing(Listing):
     # class used in Javascript to manage these objects
diff --git a/r2/r2/public/static/main.css b/r2/r2/public/static/main.css
index 12f2c919..297fbddf 100644
--- a/r2/r2/public/static/main.css
+++ b/r2/r2/public/static/main.css
@@ -631,6 +631,16 @@ div.comment, div.message {
 	margin: 0 0 12px;
 	padding: 5px;
 }
+div.dashlisting {
+    padding: 0 10px 0;
+    margin: 0 5px 5px;
+}
+div.dashtable {
+    margin: 10px 0 0;
+}
+div.dashtable table tr td div.simpledash div.dashlisting {
+	padding: 0 15px 0;
+}
 div.comment {
 	margin: 10px 0px 0px 0px;
 	padding: 2px 0 2px 15px;
diff --git a/r2/r2/templates/dashboardbloglisting.html b/r2/r2/templates/dashboardbloglisting.html
new file mode 100644
index 00000000..6dd2bdc8
--- /dev/null
+++ b/r2/r2/templates/dashboardbloglisting.html
@@ -0,0 +1,47 @@
+<%
+   import simplejson
+   from r2.lib.filters import unsafe
+   container_id = thing.feed_urls[0]
+   title_id = "%s_title" % container_id
+%>
+<div class="dashlisting">
+  <h2 id="${title_id}"></h2>
+  <ul id="${container_id}"></ul>
+  <script type="text/javascript">
+    google.setOnLoadCallback(function() {
+      var title = document.getElementById("${title_id}");
+      if(title) {
+        title.innerHTML = "Recent on Rationality Blogs";
+      }
+      var urls = ${unsafe(simplejson.dumps(thing.feed_urls))};
+      var entries = new Array();
+      function sorthelp(item) {
+        return Date.UTC(item.publishedDate);
+      }
+      for (var i = 0; i < ${len(thing.feed_urls)}; i++) {
+        var feed = new google.feeds.Feed(urls[i]);
+        feed.setNumEntries(5);
+        feed.load(function(result) {
+          if (!result.error) {
+            for (var i = 0; i < result.feed.entries.length; i++) {
+              entries.push(result.feed.entries[i]);
+            }
+            if (entries.length == 5*${len(thing.feed_urls)}) {
+              entries.sort(function(a,b){return Date.parse(b.publishedDate) - Date.parse(a.publishedDate)});
+              var container = document.getElementById("${container_id}");
+              for (var i = 0; i < 5; i++) {
+                var entry = entries[i];
+                var li = document.createElement("li");
+                var link = document.createElement("a");
+                link.setAttribute('href', entry.link);
+                link.appendChild(document.createTextNode(entry.title));
+                li.appendChild(link);
+                container.appendChild(li);
+              }
+            }
+          }
+        });
+      }
+    });
+  </script>
+</div>
diff --git a/r2/r2/templates/dashboardlisting.html b/r2/r2/templates/dashboardlisting.html
index a7a93a33..96ce2033 100644
--- a/r2/r2/templates/dashboardlisting.html
+++ b/r2/r2/templates/dashboardlisting.html
@@ -26,6 +26,8 @@
 <%
    _id = ("_%s" % thing.parent_name) if hasattr(thing, 'parent_name') else ''
  %>
+<h2>${thing.title}</h2>
+<div class="dashlisting">
 <div id="siteTable${_id}" class="sitetable">
   <div id="ajaxHook${_id}" class="ajaxhook">
   </div>
@@ -35,7 +37,9 @@
   %endfor
 </div>
 
-${plain_link(_("More"), "/dashboard/comments")}  
 %if not thing.things:
-  <p id="noresults" class="error">${_("There doesn't seem to be anything here.")}</p>
+  <p id="noresults" class="error">${_("Nothing since your last visit.")}</p>
 %endif
+${plain_link(_("More"), "/dashboard/comments")}
+</div>
+
diff --git a/r2/r2/templates/dashboardwikieditslisting.html b/r2/r2/templates/dashboardwikieditslisting.html
new file mode 100644
index 00000000..5e041077
--- /dev/null
+++ b/r2/r2/templates/dashboardwikieditslisting.html
@@ -0,0 +1,46 @@
+<%
+   from r2.lib.template_helpers import static, add_sr, join_urls
+   container_id = thing.feed_url
+## title_id = "%s_title" % container_id
+%>
+<div id="recent-wiki-edits" class="dashlisting">
+  <h2><a href="http://wiki.lesswrong.com/wiki/Special:RecentChanges">Recent Wiki Edits</a></h2>
+  <ul id="${container_id}"></ul>
+  <script type="text/javascript">
+    function initialize() {
+      var feed = new google.feeds.Feed("${unsafe(thing.feed_url)}");
+      var months = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
+      var delpattern = new RegExp(".*<a href=\"/wiki/User:.*\" title=\"User:.*\">.*</a> deleted page")
+      var pages = new Array();
+      feed.setNumEntries(5);
+      feed.load(function(result) {
+        if (!result.error) {
+          var container = document.getElementById("${unsafe(container_id)}");
+          for (var i = 0; i < result.feed.entries.length; i++) {
+            var entry = result.feed.entries[i];
+            if (!delpattern.test(entry.content)&&pages.indexOf(entry.title)==-1) {
+              var li = document.createElement("li");
+              var link = document.createElement("a");
+              var href = entry.link.replace(/&diff=\d+&oldid=prev$/, "");
+              link.setAttribute("href", href);
+              link.appendChild(document.createTextNode(entry.title));
+              li.appendChild(link);
+              var author_link = document.createElement('a');
+              author_link.setAttribute("href", "http://wiki.lesswrong.com/wiki/User:" + entry.author.replace(/ /g, "_"));
+              author_link.appendChild(document.createTextNode(entry.author));
+            
+
+	      var span = document.createElement('span');
+	      li.appendChild(span);
+	      span.appendChild(document.createTextNode(" by "));
+	      span.appendChild(author_link);
+              container.appendChild(li);
+            }
+          pages.push(entry.title);
+          }
+        }
+      });
+    }
+    google.setOnLoadCallback(initialize);
+  </script>
+</div>
diff --git a/r2/r2/templates/dashtable.html b/r2/r2/templates/dashtable.html
new file mode 100644
index 00000000..497a6a3e
--- /dev/null
+++ b/r2/r2/templates/dashtable.html
@@ -0,0 +1,24 @@
+<div class="dashtable">
+<table>
+  <colgroup >
+    <col width="50%">
+    <col width="50%">
+  </colgroup>
+<tr>
+<td style="vertical-align:top">${thing.subscribed.render()}</td>
+<td style="vertical-align:top">${thing.link.render()}</td>
+</tr>
+<tr>
+<td style="vertical-align:top">${thing.comment.render()}</td>
+<td style="vertical-align:top">${thing.recentcomments.render()}</td>
+</tr>
+<tr>
+<td style="vertical-align:top"><div class="simpledash">${thing.blogfeed.render()}</div></td>
+<td style="vertical-align:top"><div class="simpledash">${thing.meetups.render()}</div></td>
+</tr>
+<tr>
+<td style="vertical-align:top"><div class="simpledash">${thing.wikiedits.render()}</div></td>
+<td></td>
+</tr>
+</table>
+</div>
diff --git a/r2/r2/templates/linkcompressed.html b/r2/r2/templates/linkcompressed.html
new file mode 100644
index 00000000..bde59503
--- /dev/null
+++ b/r2/r2/templates/linkcompressed.html
@@ -0,0 +1,378 @@
+## The contents of this file are subject to the Common Public Attribution
+## License Version 1.0. (the "License"); you may not use this file except in
+## compliance with the License. You may obtain a copy of the License at
+## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public
+## License Version 1.1, but Sections 14 and 15 have been added to cover use of
+## software over a computer network and provide for limited attribution for the
+## Original Developer. In addition, Exhibit A has been modified to be consistent
+## with Exhibit B.
+##
+## Software distributed under the License is distributed on an "AS IS" basis,
+## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
+## the specific language governing rights and limitations under the License.
+##
+## The Original Code is Reddit.
+##
+## The Original Developer is the Initial Developer.  The Initial Developer of
+## the Original Code is CondeNet, Inc.
+##
+## All portions of the code written by CondeNet are Copyright (c) 2006-2008
+## CondeNet, Inc. All Rights Reserved.
+################################################################################
+
+<%!
+   from r2.models.subreddit import Default
+   from r2.lib.template_helpers import get_domain, static
+   from r2.lib.filters import safemarkdown, cleanhtml
+   from r2.lib.utils import prettytime, epochtime
+   from r2.lib.strings import strings
+   from r2.models.poll import renderpolls
+ %>
+
+<%namespace file="utils.html" import="separator,plain_link"/>
+<%inherit file="printable.html"/>
+
+<%def name="RenderPrintable()">
+<%
+  css_class = "post"
+  if thing.blessed:
+    css_class += ' editors-pick'
+
+  if thing.render_full:
+    full_article = True
+    heading_size = 1
+  else:
+    full_article = False
+    heading_size = 2
+    css_class += ' list'
+
+  fullname = thing._fullname
+%>
+
+<div id="thingrow_${fullname}" class="${css_class}" itemscope itemtype="http://schema.org/BlogPosting">
+  <h${heading_size} itemprop="name"><a href="${thing.url}">${self.title()}</a>${unsafe(self.draft())}</h${heading_size}>
+  <div class="meta clear">
+
+    %if thing.hide_score:
+      <span class="votes">&bull;</span>
+    %else:
+      <span class="votes">${self.score(thing, thing.likes, label = False)}</span>
+    %endif
+    ${unsafe(self.author(friend = thing.friend,
+                         label = unsafe('<span class="hide-text">Post author:</span>') if full_article else ''))}
+    <span class="date">${prettytime(thing._date)}</span>
+  </div><!-- .meta -->
+##{_RL
+<!--
+<div>
+  <i><h${heading_size-1}>Part 1 of 13 in the sequence &nbsp; <a href="http://wiki.lesswrong.com/wiki/Mysterious_Answers_to_Mysterious_Questions">Mysterious Answers to Mysterious Questions</a></h${heading_size-1}></i>
+<br/>
+<br/>
+</div>
+-->
+##}_RL
+  <div id="entry_${fullname}" class="content clear">
+## The div below is a hack to get the space compressor to leave whitespace in articles alone
+    <div class="md">
+      <div itemprop="description">
+        ${self.summary()}
+      </div>
+    </div>
+  </div><!-- .content -->
+  %if full_article:
+  <div class="articlenavigation">
+    <h4><a href="javascript:void(0)" class="dsphead" onclick="toggle_article_navigation('${thing._id36}')" id="articlenavstate">Article Navigation</a></h4>
+    <div style="display: none;" class="dspcont" id="article_nav_controls">
+      <span class="loading"><img src="${static('ajax-loader.gif')}" alt="" />
+      Loading&hellip;</span>
+    </div>
+  </div><!-- .articlenavigation -->
+  %endif
+  <div class="tools clear">
+    ${parent.midcol(thing.votable)}
+    %if c.user_is_loggedin and (not c.profilepage):
+      <% clicked = thing.clicked() if thing.clicked else None %>
+      <div style="display: none;" id='lastViewed' time="${ epochtime(clicked._date if clicked else None) }"></div>
+    %endif
+    %if thing.comments_enabled:
+      <%
+          num_comments = 0 if not thing.num_comments else thing.num_comments
+      %>
+      <a class="comment" href="${thing.url}#comments">${_('Comments (%d)') % (num_comments)}</a>
+    %endif
+    <div class="boxright clear">
+      <ul class="clear">
+        ${self.buttons(comments = False, report=False)}
+      </ul>
+      %if full_article:
+        <% tags = thing.get_tags() %>
+        %if len(tags):
+          <div class="tags">
+            <span>Tags:</span>&#32;
+            %for tag in thing.get_tags():
+              <a href="${tag.path}">${tag.name}</a>${separator(" ")}
+            %endfor
+          </div>
+        %endif
+      %endif
+    </div>
+    ## Each link has a hidden status span that is used to indicate voting errors.
+    <span id='${"status_"+thing._fullname}' class="error" style="display: none;"></span>
+  </div><!-- .tools -->
+</div><!-- .post -->
+
+</%def>
+
+<%def name="title()">
+  ${thing.title}
+</%def>
+
+<%def name="draft()">
+    %if thing.draft:
+      &#32;<span class="draft">Draft</span>
+    %endif
+</%def>
+
+<%def name="article()">
+  ${unsafe(renderpolls(cleanhtml(thing.article), thing))}
+</%def>
+
+<%def name="summary()">
+  ${unsafe(cleanhtml(renderpolls(thing.dashboard_snippet(), thing)))}
+  <%call expr="make_link('read_more', 'more', 'more')">
+    continue reading &raquo;
+  </%call>
+</%def>
+
+<%def name="numcol()">
+  <% num = thing.num %>
+  <span class="rank" style="width:$numcolmargin;"
+       id="num_${thing._fullname}">
+    %if thing.top_link:
+      <a class="star" href="/toplinks">
+    %endif
+      ##placeholder for the number
+      $num
+    %if thing.top_link:
+      </a>
+    %endif
+  </span>
+</%def>
+
+<%def name="make_link(name, css_class, anchor=None)">
+  <a id="${name}_${thing._fullname}"
+     onmousedown="setClick(this, '${css_class}')"
+     class="${css_class} ${ c.user_is_loggedin and 'loggedin' or ''} ${thing.clicked and 'click' or ''}"
+     %if c.user.pref_frame:
+       href="http://${get_domain(cname = c.cname, subreddit = False)}/goto?id=${thing._id36}"
+     %else:
+       href="${thing.url}${anchor and ("#" + anchor) or ''}"
+     %endif
+     %if thing.nofollow:
+       rel="nofollow"
+     %endif
+     %if c.user.pref_newwindow:
+       target="_blank"
+     %elif c.cname:
+       target="_top"
+     %endif
+     >
+     ${caller.body()}
+  </a>
+</%def>
+
+<%def name="entry()">
+  <p class="title" id="titlerow_${thing._fullname}">
+    <%call expr="make_link('title', 'title')">
+      ${thing.title}
+    </%call>
+  </p>
+  <ul class="flat-list buttons">
+    <li class="tagline">${self.tagline()}${separator("|")}</li>
+    ${self.buttons()}
+    ${self.admintagline()}
+  </ul>
+  % if thing.render_full:
+    <div class="md">
+      ${unsafe(cleanhtml(renderpolls(thing.article, thing)))}
+    </div>
+    <% tags = thing.get_tags() %>
+    %if len(tags):
+      <div class="tags">
+        Tags:&#32;<ul class="flat-list">
+        %for tag in thing.get_tags():
+          <li><a href="${tag.path}">${tag.name}</a>${separator(" ")}</li>
+        %endfor
+        </ul>
+      </div>
+    %endif
+  %else:
+    % if hasattr(thing, '_summary'):
+      <div class="md">
+        ${unsafe(cleanhtml(renderpolls(thing._summary(), thing)))}
+      </div>
+      % if thing._has_more():
+        <%call expr="make_link('read_more', 'md', 'more')">
+          Continue reading &ldquo;${thing.title}&rdquo;...
+        </%call>
+      % endif
+    %endif
+  %endif
+  ${self.mediadiv()}
+</%def>
+
+<%def name="subreddit()" buffered="True">
+  <%
+    if c.cname:
+       path = "http://" + get_domain(cname = (c.site == thing.subreddit),
+                                     subreddit = (c.site != thing.subreddit))
+    else:
+       path = thing.subreddit.path
+    endif
+  %>
+  <a id="subreddit_${thing._fullname}" href="${path}" class="hover"
+     ${'target="_top"'  if c.cname else ''} >
+    ${thing.subreddit.name}
+  </a>
+  <script type="text/javascript">
+    sr['${thing._fullname}'] = '${thing.subreddit._fullname}';
+  </script>
+</%def>
+
+<%def name="domain()">
+  <span class="domain">
+    (<a href="/domain/${thing.domain}">${thing.domain}</a>)
+  </span>
+</%def>
+
+<%def name="tagline()">
+  <%
+    from r2.lib.utils import timeago
+    from r2.models import FakeSubreddit
+
+    if isinstance(c.site, FakeSubreddit) or c.site != thing.subreddit:
+      taglinetext = _("Submitted %(when)s ago by %(author)s to %(reddit)s")
+    else:
+      taglinetext = _("Submitted %(when)s ago by %(author)s")
+    taglinetext = taglinetext.replace(" ", "&#32;")
+  %>
+  ${unsafe(taglinetext % dict(reddit = self.subreddit(),
+                              when = thing.timesince,
+                              author= self.author(friend = thing.friend)))}
+</%def>
+
+<%def name="child()">
+</%def>
+
+<%def name="buttons(comments=True,delete=True,report=True,ban=True,additional='')">
+  <% fullname = thing._fullname %>
+  %if comments:
+    <%
+       if not thing.num_comments:
+         # generates "comment" the imperative verb
+         com_label = _("Comment")
+       else:
+         # generates "XX comments" as a noun
+         com_label = ungettext("comment", "comments", thing.num_comments)
+       %>
+    <li class="first">
+    ${parent.comment_button("comment", fullname, com_label,
+                            thing.num_comments, thing.permalink,
+                            newwindow = c.user.pref_newwindow)}
+    </li>
+  %endif
+##  <li>
+##    ${plain_link("Feed", "%s/.rss" % thing.url)}
+##  </li>
+  %if c.user_is_loggedin:
+    %if thing.can_submit(c.user):
+      <li>
+        <% kw = {"class": "edit", "title": "Edit"} %>
+        ${plain_link("Edit", "/edit/%s" % thing._id36, **kw)}
+      </li>
+  %endif
+    %if not thing.author == c.user:
+      <li>
+      ${parent.state_button("linksubscribe", fullname, _("Subscribe"), \
+          "return change_state_by_class(this, '%s', 'mod')"%("linkunsubscribe" if thing.link_subscribed(c.user, thing) else "linksubscribe"), \
+          _("Subscribed"), a_class="subscription"+(" mod" if thing.link_subscribed(c.user, thing) else ""), \
+          tool_tip = "No longer receive notifications for this post" if thing.link_subscribed(c.user, thing) else "Get notifications of top level comments on this post")}
+      </li>
+    %endif
+    %if c.user_is_admin:
+      <li class="promote">
+      %if thing.is_blessed():
+        ${parent.state_button("unbless", fullname, _("Demote"), \
+            "return change_state(this, 'unbless');", _("Demoted"))}
+      %else:
+        ${parent.state_button("bless", fullname, _("Promote"), \
+            "return change_state(this, 'bless');", _("Promoted"))}
+      %endif
+      </li>
+    %endif
+    <li>
+    ${parent.state_button("save", fullname, _("Save"), \
+          "return change_state_by_class(this, '%s', 'mod')"%("unsave" if thing.saved else "save"), \
+          _("Saved"), a_class="save"+(" mod" if thing.saved else ""), \
+          tool_tip = "Unsave" if thing.saved else "Save")}
+    </li>
+    %if not thing.render_full:
+      <li>
+      %if thing.hidden:
+        ${parent.state_button("unhide", fullname, _("Unhide"), \
+          "return change_w_callback(this, $ListClass.unhide);", _("Unhidden"), a_class="hide mod", tool_tip="Unhide")}
+      %else:
+        ${parent.state_button("hide", fullname, _("Hide"), \
+          "return change_w_callback(this, $ListClass.hide);", _("Hidden"), a_class="hide", tool_tip="Hide")}
+      %endif
+      </li>
+    %endif
+  %endif
+  ${parent.delete_or_report_buttons(delete=delete,report=report)}
+  ${parent.buttons(ban=ban)}
+  %if thing.cc_licensed:
+  <li>
+    <a href="http://creativecommons.org/licenses/by/3.0/" class="license" title="Post licensed under Creative Commons Attribution 3.0 License">CC Licenced</a>
+  </li>
+  %endif
+  ${additional}
+  ${self.media_embed()}
+</%def>
+
+
+<%def name="media_embed()">
+  %if thing.media_object:
+  <li>
+    <a id="view_embeded_media_a_${thing._fullname}" class="" \
+       href="javascript:view_embeded_media('${thing._fullname}', '${thing.media_object}')">\
+      <span id="view_embeded_media_span_watch_${thing._fullname}"
+            class="watch-play"
+            style="display: inline">
+        ${_("Watch")}
+      </span>
+      <span id="view_embeded_media_span_close_${thing._fullname}"
+            class="watch-stop"
+            style="display: none">
+        ${_("Close")}
+      </span>
+    </a>
+  </li>
+  %endif
+</%def>
+
+<%def name="thumbnail()">
+  %if thing.thumbnail:
+  <%call expr="make_link('thumbnail', 'thumbnail')">
+    <img src="${thing.thumbnail}" alt=""/>
+  </%call>
+  %endif
+</%def>
+
+<%def name="mediadiv()">
+  %if thing.media_object:
+    <div id="embeded_media_${thing._fullname}"
+         class="embededmedia" style="display: none;">
+      <p class="error">loading...</p>
+    </div>
+  %endif
+</%def>

From 1020bf9aa42f17b2c5f043d4791beddaf624630c Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Tue, 20 Aug 2013 15:26:15 -0700
Subject: [PATCH 3/4] Added navigation bar to Dashboard.

---
 r2/r2/config/routing.py                  |  2 +-
 r2/r2/controllers/dashboardcontroller.py | 18 ++++++++++++++----
 r2/r2/lib/menus.py                       |  1 +
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/r2/r2/config/routing.py b/r2/r2/config/routing.py
index 73dfa90c..e9086641 100644
--- a/r2/r2/config/routing.py
+++ b/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
diff --git a/r2/r2/controllers/dashboardcontroller.py b/r2/r2/controllers/dashboardcontroller.py
index a8364c49..d2635a24 100644
--- a/r2/r2/controllers/dashboardcontroller.py
+++ b/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
diff --git a/r2/r2/lib/menus.py b/r2/r2/lib/menus.py
index 5daa9198..90f859d3 100644
--- a/r2/r2/lib/menus.py
+++ b/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'),

From e820229318e1a9d4042743a725ab7d51fb50e74c Mon Sep 17 00:00:00 2001
From: PotatoDumplings <predictably.defenestrated@gmail.com>
Date: Thu, 5 Sep 2013 16:31:48 -0700
Subject: [PATCH 4/4] Added link to dashboard in user panel, fixed 'more' link
 in dashboard listing.

---
 r2/r2/config/routing.py                  |  2 +-
 r2/r2/controllers/__init__.py            |  2 +-
 r2/r2/controllers/dashboardcontroller.py | 32 +++++++-----------------
 r2/r2/controllers/listingcontroller.py   |  1 -
 r2/r2/lib/pages/pages.py                 |  1 +
 r2/r2/models/listing.py                  |  3 ++-
 r2/r2/templates/dashboardlisting.html    |  2 +-
 7 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/r2/r2/config/routing.py b/r2/r2/config/routing.py
index e9086641..ba5a534e 100644
--- a/r2/r2/config/routing.py
+++ b/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='dashboard')
 
     # Can't use map.resource because the version of the Routing module we're
     # using doesn't support the controller_action kw arg
diff --git a/r2/r2/controllers/__init__.py b/r2/r2/controllers/__init__.py
index 14c62d02..58a8dd47 100644
--- a/r2/r2/controllers/__init__.py
+++ b/r2/r2/controllers/__init__.py
@@ -44,7 +44,7 @@
 from dashboardcontroller import InterestingcommentsController
 from dashboardcontroller import InterestingsubscribedController
 from dashboardcontroller import InterestingpostsController
-from dashboardcontroller import ListingtestController
+from dashboardcontroller import DashboardController
 
 from listingcontroller import MyredditsController
 
diff --git a/r2/r2/controllers/dashboardcontroller.py b/r2/r2/controllers/dashboardcontroller.py
index d2635a24..f09c4483 100644
--- a/r2/r2/controllers/dashboardcontroller.py
+++ b/r2/r2/controllers/dashboardcontroller.py
@@ -99,7 +99,7 @@ def query(self):
                                        thing_data = not g.use_query_cache
                                        )
         if not c.user_is_admin:
-            q._filter(Comment.c._spam == False)
+            q._filter(SubscriptionStorage.c._t2_spam == False)
 
         q.prewrap_fn = lambda x: x._thing2
 
@@ -207,7 +207,7 @@ def GET_listing(self, time, **env):
         self.time = time
         return CommentsController.GET_listing(self, **env)
 
-class ListingtestController(CommentsController):
+class DashboardController(CommentsController):
     @property
     def header_sub_nav(self):
 	    return [NamedButton("dashboard", dest="dashboard"),
@@ -226,8 +226,8 @@ def iterable_builder(self, query):
         return b
 
    
-    def create_listing(self, controller, title):
-        return DashboardListing(self.iterable_builder(controller), title).listing()
+    def create_listing(self, controller, title, link):
+        return DashboardListing(self.iterable_builder(controller), title, link).listing()
 
     @staticmethod
     def builder_wrapper(thing):
@@ -246,28 +246,14 @@ def content(self):
         titles = ('Subscribed Comments', 'Leading Posts',
                   'Leading Comments', 'Recent Comments')
 
-        builders = [self.create_listing(*controller) for controller in zip(controllers, titles)]
-
-        self.builder_cls = IDBuilder
+        links = ('/dashboard/subscribed', '/dashboard/posts',
+                 '/dashboard/comments', '/comments')
 
-        builders.append(self.create_listing(MeetupslistingController.staticquery(), 'Upcoming Meetups'))
+        builders = [self.create_listing(*controller) for controller in zip(controllers, titles, links)]
 
-        self.builder_cls = UnbannedCommentBuilder
-        
-        """lb = self.builder(InterestingpostsController.query())
-        cb = self.builder(InterestingcommentsController.query())
-        sb = self.builder(InterestingsubscribedController.query())
-        rcb = self.builder(self.recentcommentsquery())
-        mb = self.builder(MeetupslistingController.query())
-
-        ll = DashboardListing(lb)
-        cl = DashboardListing(cb)
-
-        lp = PaneStack()
-        cp = PaneStack()
+        self.builder_cls = IDBuilder
 
-        lp.append(ll.listing())
-        cp.append(cl.listing())"""
+        builders.append(self.create_listing(MeetupslistingController.staticquery(), 'Upcoming Meetups', '/meetups'))
 
         return Dashtable(*builders)
 
diff --git a/r2/r2/controllers/listingcontroller.py b/r2/r2/controllers/listingcontroller.py
index 6702b683..6a84c623 100644
--- a/r2/r2/controllers/listingcontroller.py
+++ b/r2/r2/controllers/listingcontroller.py
@@ -851,7 +851,6 @@ def query(self):
     @staticmethod
     def staticquery():
         q = Comment._query(Comment.c._spam == (True,False),
-                           Comment.c.sr_id == [c.current_or_default_sr._id, Subreddit._by_name('discussion')._id],
                            sort = desc('_date'), data = True)
         if not c.user_is_admin:
             q._filter(Comment.c._spam == False)
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 380c84e5..9a4edaf3 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -194,6 +194,7 @@ def corner_buttons(self):
         """set up for buttons in upper right corner of main page."""
         buttons = []
         if c.user_is_loggedin:
+            buttons += [NamedButton("dashboard", False)]
             if c.user.name in g.admins:
                 if c.user_is_admin:
                    buttons += [NamedButton("adminoff", False,
diff --git a/r2/r2/models/listing.py b/r2/r2/models/listing.py
index fba3bccd..77f7cbc6 100644
--- a/r2/r2/models/listing.py
+++ b/r2/r2/models/listing.py
@@ -131,8 +131,9 @@ def listing(self):
         return Wrapped(self)
 
 class DashboardListing(Listing):
-    def __init__(self, builder, title):
+    def __init__(self, builder, title, link):
         self.title = title
+        self.link = link
         Listing.__init__(self, builder)
 
 class OrganicListing(Listing):
diff --git a/r2/r2/templates/dashboardlisting.html b/r2/r2/templates/dashboardlisting.html
index 96ce2033..ab5d620c 100644
--- a/r2/r2/templates/dashboardlisting.html
+++ b/r2/r2/templates/dashboardlisting.html
@@ -40,6 +40,6 @@ <h2>${thing.title}</h2>
 %if not thing.things:
   <p id="noresults" class="error">${_("Nothing since your last visit.")}</p>
 %endif
-${plain_link(_("More"), "/dashboard/comments")}
+${plain_link(_("More"), thing.link)}
 </div>