From af1d78361b2d0795d698853a21dec6f403a55d26 Mon Sep 17 00:00:00 2001
From: KeyserSosa <chris@reddit.com>
Date: Thu, 7 May 2009 11:46:11 -0700
Subject: [PATCH] fix blog link in footer; add padding to footer; add to
 subreddit subscriptions;

---
 r2/r2/controllers/api.py           |  5 ++++-
 r2/r2/controllers/embed.py         | 14 +++++++-------
 r2/r2/public/static/css/reddit.css |  1 +
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
index 2bceaa6b0..5b1b74c21 100644
--- a/r2/r2/controllers/api.py
+++ b/r2/r2/controllers/api.py
@@ -1205,7 +1205,10 @@ class ApiController(RedditController):
                 action = VOneOf('action', ('sub', 'unsub')),
                 sr = VByName('sr'))
     def POST_subscribe(self, action, sr):
-        self._subscribe(sr, action == 'sub')
+        # only users who can make edits are allowed to subscribe.
+        # Anyone can leave.
+        if action != 'sub' or sr.can_comment(c.user):
+            self._subscribe(sr, action == 'sub')
     
     def _subscribe(self, sr, sub):
         Subreddit.subscribe_defaults(c.user)
diff --git a/r2/r2/controllers/embed.py b/r2/r2/controllers/embed.py
index f87908d2b..c26b06c67 100644
--- a/r2/r2/controllers/embed.py
+++ b/r2/r2/controllers/embed.py
@@ -20,21 +20,16 @@
 # CondeNet, Inc. All Rights Reserved.
 ################################################################################
 from reddit_base import RedditController, proxyurl
+from r2.lib.template_helpers import get_domain
 from r2.lib.pages import Embed, BoringPage, HelpPage
 from r2.lib.filters import websafe, SC_OFF, SC_ON
 from pylons.i18n import _
-from pylons import request
-from pylons import c
+from pylons import c, g, request
 
 from BeautifulSoup import BeautifulSoup, Tag
 
 from urllib2 import HTTPError
 
-def force_redirect(dest):
-    def _force_redirect(self, *a, **kw):
-        return self.redirect(dest)
-    return _force_redirect
-
 class EmbedController(RedditController):
     def rendercontent(self, input, fp):
         soup = BeautifulSoup(input)
@@ -84,3 +79,8 @@ class EmbedController(RedditController):
             return self.abort404()
 
     GET_help = POST_help = renderurl
+
+    def GET_blog(self):
+        return self.redirect("http://blog.%s/" %
+                             get_domain(cname = False, subreddit = False,
+                                        no_www = True))
diff --git a/r2/r2/public/static/css/reddit.css b/r2/r2/public/static/css/reddit.css
index b559deb05..7b76323cb 100644
--- a/r2/r2/public/static/css/reddit.css
+++ b/r2/r2/public/static/css/reddit.css
@@ -977,6 +977,7 @@ textarea.gray { color: gray; }
 
 /* footer */
 .footer-parent {
+    padding-top: 40px; 
     clear: both;
     text-align: center;
 }