From 8b77613309b3914ec7cbae0f45954c8baff68a35 Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Wed, 12 Dec 2012 15:56:25 -0800
Subject: [PATCH] Parameterize the Ads template.

---
 r2/r2/lib/pages/pages.py | 11 ++++++++++-
 r2/r2/templates/ads.html | 14 ++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index ddc20a504..53cc0e173 100755
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -2339,7 +2339,16 @@ class AdminAwardWinners(Templated):
         Templated.__init__(self, award = award, trophies = trophies)
 
 class Ads(Templated):
-    pass
+    def __init__(self):
+        Templated.__init__(self)
+        path = ""
+        if c.custom_dart_keyword:
+            path = "r/%s/%s" % (c.site.path, c.custom_dart_keyword)
+        elif not c.default_sr:
+            path = "r/%s/" % c.site.path
+        self.ad_url = g.ad_domain + "/ads/" + path
+        self.frame_id = "ad-frame"
+
 
 class Embed(Templated):
     """wrapper for embedding /help into reddit as if it were not on a separate wiki."""
diff --git a/r2/r2/templates/ads.html b/r2/r2/templates/ads.html
index aa829ee31..14d65c6b8 100644
--- a/r2/r2/templates/ads.html
+++ b/r2/r2/templates/ads.html
@@ -26,18 +26,8 @@
    import random
  %>
 
-<%
-
-name = ''
-if c.custom_dart_keyword:
-    name = "r/%s/%s" % (c.site.name, c.custom_dart_keyword)
-elif not c.default_sr:
-    name = "r/%s/" % c.site.name
-
-%>
-
-<iframe id="ad-frame" frameborder="0" scrolling="no" name="ad-frame"
-        src="${g.ad_domain}/ads/${name}">
+<iframe id="${thing.frame_id}" frameborder="0" scrolling="no" name="${thing.frame_id}"
+        src="${thing.ad_url}">
 </iframe>
 
 <script type="text/javascript">