From 3e6fc896fa0b305ebca96313dbfb242a8f3971ff Mon Sep 17 00:00:00 2001
From: Chad Birch <chad.birch@gmail.com>
Date: Wed, 1 Jul 2015 12:35:39 -0600
Subject: [PATCH] Private subreddit page: add link to message mods

---
 r2/r2/controllers/reddit_base.py    |  1 +
 r2/r2/lib/pages/pages.py            | 16 ++++++++++------
 r2/r2/public/static/css/reddit.less |  9 ++++++++-
 r2/r2/templates/errorpage.html      |  6 ++++++
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py
index 722358201..484f37874 100644
--- a/r2/r2/controllers/reddit_base.py
+++ b/r2/r2/controllers/reddit_base.py
@@ -1681,6 +1681,7 @@ class RedditController(OAuth2ResourceController):
                         strings.private_subreddit_message,
                         image="subreddit-private.png",
                         sr_description=public_description,
+                        include_message_mods_link=True,
                     )
                     request.environ['usable_error_content'] = errpage.render()
                     self.abort403()
diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py
index 2801fb610..a76f2efe3 100644
--- a/r2/r2/lib/pages/pages.py
+++ b/r2/r2/lib/pages/pages.py
@@ -2412,14 +2412,18 @@ class SidebarMessage(Templated):
 class RedditError(BoringPage):
     site_tracking = False
     def __init__(self, title, message, image=None, sr_description=None,
-                 explanation=None):
+            include_message_mods_link=False, explanation=None):
+        content = ErrorPage(
+            title=title,
+            message=message,
+            image=image,
+            sr_description=sr_description,
+            include_message_mods_link=include_message_mods_link,
+            explanation=explanation,
+        )
         BoringPage.__init__(self, title, loginbox=False,
                             show_sidebar = False,
-                            content=ErrorPage(title=title,
-                                              message=message,
-                                              image=image,
-                                              sr_description=sr_description,
-                                              explanation=explanation))
+                            content=content)
 
 class ErrorPage(Templated):
     """Wrapper for an error message"""
diff --git a/r2/r2/public/static/css/reddit.less b/r2/r2/public/static/css/reddit.less
index 069725798..eeaa2da5f 100644
--- a/r2/r2/public/static/css/reddit.less
+++ b/r2/r2/public/static/css/reddit.less
@@ -9027,7 +9027,7 @@ form#banned textarea {
 }
 
 .errorpage-message.sr-description {
-    border-top: 2px solid black;
+    border-top: 1px solid black;
     margin-top: 2em;
     padding-top: 2em;
 }
@@ -9043,6 +9043,13 @@ form#banned textarea {
     margin: .75em 0;
 }
 
+#private-subreddit-message-link {
+  border-top: 1px solid black;
+  margin-top: 1em;
+  padding-top: 2em;
+  font-size: 1.4em;
+}
+
 /** one-time password stuff **/
 #pref-otp .roundfield {
     margin: 1em 0;
diff --git a/r2/r2/templates/errorpage.html b/r2/r2/templates/errorpage.html
index bd7d1ce93..b6606bb00 100644
--- a/r2/r2/templates/errorpage.html
+++ b/r2/r2/templates/errorpage.html
@@ -42,4 +42,10 @@ from r2.lib.filters import unsafe, safemarkdown
       ${unsafe(safemarkdown(thing.sr_description, wrap=False))}
   </div>
   % endif
+
+  % if thing.include_message_mods_link:
+  <div id="private-subreddit-message-link" class="errorpage-message">
+    <a href="/message/compose/?to=/r/${c.site.name}">${_("send a message to the moderators to request access")}</a>
+  </div>
+  % endif
 </div>