From 67628c617c15c5ef023f9bee2e5ab4a6a1488481 Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Wed, 23 Nov 2011 19:38:23 -0800
Subject: [PATCH] Link to the subreddit in the submit form title.

---
 r2/r2/lib/pages/pages.py     |  4 +---
 r2/r2/templates/newlink.html | 12 +++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 6c63ce9d5..7a4da6ef1 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -1781,12 +1781,10 @@ class NewLink(Templated):
 
         self.sr_searches = simplejson.dumps(popular_searches())
 
-        self.on_default_sr = c.default_sr
-
         if c.default_sr:
             self.default_sr = None
         else:
-            self.default_sr = c.site.name
+            self.default_sr = c.site
 
         Templated.__init__(self, captcha = captcha, url = url,
                          title = title, subreddits = subreddits,
diff --git a/r2/r2/templates/newlink.html b/r2/r2/templates/newlink.html
index 2bb02b865..3c184c7e3 100644
--- a/r2/r2/templates/newlink.html
+++ b/r2/r2/templates/newlink.html
@@ -26,10 +26,16 @@
    from r2.lib.template_helpers import add_sr
 %>
 
-<%namespace file="utils.html" import="error_field, submit_form, plain_link, reddit_selector"/>
+<%namespace file="utils.html" import="error_field, submit_form, _a_buffered, reddit_selector"/>
 <%namespace name="utils" file="utils.html"/>
 
-<h1>${_("submit to %(sr)s") % dict(sr=thing.default_sr if not thing.on_default_sr else _("reddit"))}</h1>
+<%
+  if thing.default_sr:
+    sr = "&#32" + _a_buffered(thing.default_sr.name, href=thing.default_sr.path)
+  else:
+    sr = _("reddit")
+%>
+<h1>${unsafe(_("submit to %(sr)s") % dict(sr=sr))}</h1>
 
 <%utils:submit_form onsubmit="return post_form(this, 'submit', linkstatus, null, true)" 
                     action=${add_sr("/submit")},
@@ -92,7 +98,7 @@ ${thing.formtabs_menu}
 
 <div class="spacer">
   <%utils:round_field title="${_('choose a subreddit')}" id="reddit-field">
-    ${reddit_selector(thing.default_sr, thing.sr_searches, thing.subreddits)}
+    ${reddit_selector(thing.default_sr.name if thing.default_sr else None, thing.sr_searches, thing.subreddits)}
   </%utils:round_field>
 </div>