From 48aee3dc062f2c37ccf7a6c00b84c319aafb269c Mon Sep 17 00:00:00 2001
From: Chad Birch <chad.birch@gmail.com>
Date: Tue, 12 Feb 2013 16:48:56 -0800
Subject: [PATCH] Remove icon from disabled submit sidebox

---
 r2/r2/lib/pages/pages.py             |  11 +++++++----
 r2/r2/public/static/css/reddit.css   |  14 +++++---------
 r2/r2/public/static/submit-alien.png | Bin 2329 -> 0 bytes
 r2/r2/templates/sidebox.html         |   6 +++++-
 4 files changed, 17 insertions(+), 14 deletions(-)
 delete mode 100644 r2/r2/public/static/submit-alien.png

diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 580dfb09d..353d84103 100755
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -324,14 +324,16 @@ class Reddit(Templated):
                     ps.append(SideBox(title=_('Submissions disabled'),
                                       css_class="submit",
                                       disabled=True,
-                                      subtitles=[subtitle]))
+                                      subtitles=[subtitle],
+                                      show_icon=False))
                 else:
                     subtitle = _('submission in this subreddit '
                                  'is restricted to approved submitters.')
                     ps.append(SideBox(title=_('Submissions restricted'),
                                       css_class="submit",
                                       disabled=True,
-                                      subtitles=[subtitle]))
+                                      subtitles=[subtitle],
+                                      show_icon=False))
             else:
                 fake_sub = isinstance(c.site, FakeSubreddit)
                 if c.site.link_type != 'self':
@@ -693,12 +695,13 @@ class SideBox(CachedTemplate):
     Generic sidebox used to generate the 'submit' and 'create a reddit' boxes.
     """
     def __init__(self, title, link=None, css_class='', subtitles = [],
-                 show_cover = False, nocname=False, sr_path = False, disabled=False):
+                 show_cover = False, nocname=False, sr_path = False,
+                 disabled=False, show_icon=True):
         CachedTemplate.__init__(self, link = link, target = '_top',
                            title = title, css_class = css_class,
                            sr_path = sr_path, subtitles = subtitles,
                            show_cover = show_cover, nocname=nocname,
-                           disabled=disabled)
+                           disabled=disabled, show_icon=show_icon)
 
 
 class PrefsPage(Reddit):
diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css
index d6363ff66..bd28fe6cc 100755
--- a/r2/r2/public/static/css/reddit.css
+++ b/r2/r2/public/static/css/reddit.css
@@ -461,10 +461,6 @@ ul.flat-vert {text-align: left;}
     background-image: url(../gradient-nub-gray.png);  /* SPRITE */
 }
 
-.sidebox.submit.disabled .spacer a {
-    opacity: .5;
-}
-
 /* raised box */
 
 .raisedbox {
@@ -484,6 +480,11 @@ ul.flat-vert {text-align: left;}
     background: white none no-repeat scroll top left;
 }
 
+.sidebox .spacer.no-icon {
+    padding: 0;
+    min-height: 0;
+}
+
 .sidebox .spacer a {
     position: absolute;
     top: 0; left: 0px;
@@ -528,11 +529,6 @@ ul.flat-vert {text-align: left;}
     display: none;
 }
 
-.sidebox.submit .spacer a {
-    background-image: url(../submit-alien.png);  /* SPRITE */
-    background-repeat:no-repeat;
-}
-
 .sidebox .subtitle {
     margin-left: 10px;
     color: dimgray;
diff --git a/r2/r2/public/static/submit-alien.png b/r2/r2/public/static/submit-alien.png
deleted file mode 100644
index 53300f6141690960a1a8cfc883362f5fc8ec3c0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2329
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

diff --git a/r2/r2/templates/sidebox.html b/r2/r2/templates/sidebox.html
index b19a1d03f..6a63a363b 100644
--- a/r2/r2/templates/sidebox.html
+++ b/r2/r2/templates/sidebox.html
@@ -30,9 +30,13 @@
   </div>
 
   %if thing.subtitles:
-    <div class="spacer">
+    %if thing.show_icon:
+      <div class="spacer">
       ${plain_link('', thing.link, _sr_path=thing.sr_path,
                    _class='login-required' if thing.show_cover else None, nocname=thing.nocname)}
+    %else:
+      <div class="spacer no-icon">
+    %endif
       %for subtitle in thing.subtitles:
         <div class="subtitle">${subtitle}</div>
       %endfor