Merge pull request #4494 from gratipay/friendlier-401

Make the 401 page friendlier
gratipay · Jun 2, 2017 · 6906147 · 6906147
2 parents a329101 + e9f42f6
commit 6906147
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 40 deletions.
diff --git a/401.spt b/401.spt
@@ -1,11 +1,14 @@
 from aspen.http import status_strings
 [---]
-banner = "401"
+banner = _("Sign In")
+suppress_sidebar = True
 [---] text/html via jinja2
 {% extends "templates/base.html" %}
 {% block content %}
-<p>{{ _('Please sign in to continue.') }}</p>
-<p>{{ sign_in_using() }}</p>
+<p class="description important-thing-at-the-top">{{ _('Please sign in to continue.') }}</p>
+<div class="important-button">
+    {{ sign_in_using(button_class='large') }}
+</div>
 {% endblock %}
 [---] application/json via stdlib_percent
 { "error_code": 401

diff --git a/scss/components/text-treatments.scss b/scss/components/text-treatments.scss
@@ -5,7 +5,16 @@
 #content {
     .important-thing-at-the-top {
         margin: 20px 0 60px;
+        text-align: center;
+        &.description {
+            font: normal 18pt/24pt $Chronicle;
+            &.long {
+                font: normal 11pt/15pt $Chronicle;
+            }
+            padding: 0 17%;
+        }
     }
+
     .sorry {
         text-align: center;
         font: normal 12px/15px $Ideal;

diff --git a/scss/elements/buttons-knobs.scss b/scss/elements/buttons-knobs.scss
@@ -55,3 +55,31 @@ button.selected:hover:not(:disabled), button.selected.drag,
     top: 0;
     right: 0;
 }
+
+
+.important-button {
+    margin: 38px auto 30px;
+    text-align: center;
+
+    button.large {
+        font: normal 16px/32px $Ideal;
+        padding: 10px 16px;
+        border-radius: 5px;
+
+        .caret {
+            border-top: 8px solid #fff;
+            border-right: 5px solid transparent;
+            border-left: 5px solid transparent;
+            margin-top: 13px;
+        }
+    }
+    .dropdown-menu {
+                                    /* override components/sign_in */
+        border-radius: 0 0 3px 3px  ! important;
+        top: 50px                   ! important;
+        width: 90%;
+        left: 5%;
+    }
+}
+
+
diff --git a/scss/pages/package.scss b/scss/pages/package.scss
@@ -6,13 +6,6 @@
         margin: 0 0 30px;
         font-family: $Ideal;
     }
-    .description {
-        font: normal 18pt/24pt $Chronicle;
-        &.long {
-            font: normal 11pt/15pt $Chronicle;
-        }
-        padding: 0 17%;
-    }
 
     .selected .icon { display: block; }
     .icon {
@@ -36,29 +29,4 @@
     ul:not(.open) .status-icon {
         color: $medium-gray;
     }
-
-    .button-wrapper {
-        margin: 38px auto 30px;
-
-        button.large {
-            font: normal 16px/32px $Ideal;
-            padding: 10px 16px;
-            border-radius: 5px;
-
-            .caret {
-                border-top: 8px solid #fff;
-                border-right: 5px solid transparent;
-                border-left: 5px solid transparent;
-                margin-top: 13px;
-            }
-        }
-        .dropdown-menu {
-            top: 50px;
-            width: 90%;
-            left: 5%;
-            border-radius: 0 0 3px 3px;
-        }
-    }
-
-
 }
diff --git a/tests/py/test_pages.py b/tests/py/test_pages.py
@@ -249,9 +249,9 @@ def test_braintree_linked_from_credit_card_page(self, foo, bar):
         body = self.client.GET("/~alice/routes/credit-card.html", auth_as="alice").body
         assert  "Braintree" in body
 
-    def test_dashboard_is_403_for_anon(self):
+    def test_dashboard_is_401_for_anon(self):
         self.make_participant('admin', is_admin=True)
-        assert self.client.GxT('/dashboard/').code == 403
+        assert self.client.GxT('/dashboard/').code == 401
 
     def test_dashboard_is_403_for_non_admin(self):
         self.make_participant('alice')

diff --git a/www/dashboard/index.spt b/www/dashboard/index.spt
@@ -2,7 +2,7 @@ from aspen import Response
 
 [---]
 if not user.ADMIN:
-    raise Response(403)
+    raise Response(401 if user.ANON else 403)
 
 
 unreviewed = website.db.all("""

diff --git a/www/on/npm/%package/index.html.spt b/www/on/npm/%package/index.html.spt
@@ -58,7 +58,7 @@ if user.participant:
  </p>
 
 {% if user.ANON %}
-    <div class="button-wrapper">
+    <div class="important-button">
         {{ sign_in_using(button_class='large') }}
     </div>
 {% else %}
@@ -108,7 +108,7 @@ if user.participant:
         </ul>
     </div>
 
-    <div class="button-wrapper">
+    <div class="important-button">
         <button type="submit" class="apply selected large"
                 {% if not has_email_options %} disabled{% endif %}>
             {{ _('Apply to accept payments') }}