From da309ce65d862eb4f5fc19cf34182f328189801e Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Fri, 27 Jul 2012 00:23:02 -0700
Subject: [PATCH] Move "close help" link to bottom right corner to match
 "what's this".

---
 r2/r2/public/static/css/reddit.css    |  3 ++-
 r2/r2/templates/spotlightlisting.html | 23 ++++++-----------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css
index 389e236f2..c7c4088ec 100755
--- a/r2/r2/public/static/css/reddit.css
+++ b/r2/r2/public/static/css/reddit.css
@@ -884,7 +884,7 @@ a.author { margin-right: 0.5em; }
     text-decoration: underline;
 }
 
-.help a.open {
+.help a.open, .help a.close {
     margin: 0px 5px 5px 0;
     position: absolute;
     right: 0px;
@@ -893,6 +893,7 @@ a.author { margin-right: 0.5em; }
 
 
 .help.help-cover {
+    position: relative;
     background-color: #F8F8F8;
     border: 1px solid gray;
     font-size: 110%;
diff --git a/r2/r2/templates/spotlightlisting.html b/r2/r2/templates/spotlightlisting.html
index b709ef7ed..aa8c4cff3 100644
--- a/r2/r2/templates/spotlightlisting.html
+++ b/r2/r2/templates/spotlightlisting.html
@@ -51,14 +51,6 @@
   </div>
 </div>
 
-<%
-  fmt = _("Click %(here)s to close help.")
-  title = _("here")
-  link = '<a class="close" href="javascript:void(0)">%s</a>' % title
-  link = (fmt % dict(here = link))
-  link = unsafe(link.replace(" <", "&#32;<").replace("> ", ">&#32;"))
-%>
-
 <div class="help help-cover promoted">
     <p>
       This sponsored link is an advertisement generated with our&#32;<a href="http://www.reddit.com/help/selfservicepromotion">self-serve advertisement tool.</a>&#32.  
@@ -66,9 +58,9 @@
     <p>
       Use of this tool is open to all members or reddit.com, and for as little as $20 you can advertise in this area.&#32;<a href="/ad_inq">Get started &raquo;</a>
     </p>
-    <p>
-      ${link}
-    </p>
+    <div class="help">
+      <a class="close" href="javascript:void(0)">${_("close help")}</a>
+    </div>
 </div>
 
 <div class="help help-cover organic">
@@ -83,13 +75,10 @@
                      format = _("Click %(here)s to disable this feature."),
                      format_arg = "here",
                      hidden_data = dict(id="organic"))}
-        %else:
-         <p>
-        %endif
-           ${link}
-        %if not c.user_is_loggedin:
-         </p>
         %endif
+    <div class="help">
+      <a class="close" href="javascript:void(0)">${_("close help")}</a>
+    </div>
 </div>
 
 <script type="text/javascript">