From 0ac2ebb7260f205fa243272a5be61886d0b062d0 Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Fri, 12 Oct 2012 00:38:57 -0700
Subject: [PATCH] Ditch additional_css for template def overloading.

---
 r2/r2/lib/pages/pages.py    |  1 -
 r2/r2/templates/reddit.html | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 75622a17e..7bd76e950 100755
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -132,7 +132,6 @@ class Reddit(Templated):
     show_firsttext     = True
     content_id         = None
     css_class          = None
-    additional_css     = None
     extra_page_classes = None
 
     def __init__(self, space_compress = True, nav_menus = None, loginbox = True,
diff --git a/r2/r2/templates/reddit.html b/r2/r2/templates/reddit.html
index 93818dd50..b8be37025 100644
--- a/r2/r2/templates/reddit.html
+++ b/r2/r2/templates/reddit.html
@@ -88,10 +88,6 @@
           title="applied_subreddit_stylesheet"
           type="text/css">
   %endif
-  %if getattr(thing, "additional_css", None):
-    <link rel="stylesheet" href="${static(thing.additional_css)}" 
-          type="text/css" />
-  %endif
 
   <!--[if lt IE 7]>
     <link rel="stylesheet" href="${static('reddit-ie6-hax.css')}"
@@ -128,13 +124,14 @@
         ${sidebar(content = thing.rightbox())}
       </div>
     %endif
-    
-    %if thing.content:
+
+    <% content = getattr(self, "content", None) or thing.content %>
+    %if content:
       ##<div class="fixedwidth"><!--IE6sux--></div>
       ##<div class="clearleft"><!--IE6sux--></div>
       <a name="content"></a>
       <div ${tags(id=thing.content_id)} class="content${css_class(thing)}">
-        ${thing.content()}
+        ${content()}
       </div>
     %endif