From c5578ac44aa2d0c3aca53f5a3d61798a76ab48be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=93teris=20Caune?= <cuu508@gmail.com>
Date: Wed, 28 Oct 2015 10:01:24 +0200
Subject: [PATCH] Update wording in "Incorrect Link" pages. Fixes #5

---
 hc/accounts/views.py                      |  3 ++-
 static/css/base.css                       |  8 ++++++--
 templates/accounts/login.html             | 20 +++++++++++++++-----
 templates/accounts/login_link_sent.html   |  2 +-
 templates/bad_link.html                   | 15 +++++++++------
 templates/front/verify_email_success.html | 16 ++++++++--------
 6 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/hc/accounts/views.py b/hc/accounts/views.py
index 342cea39..d3ddb321 100644
--- a/hc/accounts/views.py
+++ b/hc/accounts/views.py
@@ -102,4 +102,5 @@ def check_token(request, username, token):
 
             return redirect("hc-checks")
 
-    return render(request, "bad_link.html")
+    ctx = {"bad_link": True}
+    return render(request, "accounts/login.html", ctx)
diff --git a/static/css/base.css b/static/css/base.css
index beef7dcd..798f2681 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -62,12 +62,16 @@ body {
     color: #d9534f;
 }
 
-#login_dialog {
+.hc-dialog {
     background: #FFF;
     padding: 2em;
     margin-top: 100px;
 }
 
-#login_dialog h1 {
+.hc-dialog h1 {
     margin: 0;
 }
+
+.dialog-body {
+    margin: 24px 0;
+}
\ No newline at end of file
diff --git a/templates/accounts/login.html b/templates/accounts/login.html
index d30a9453..16fd829d 100644
--- a/templates/accounts/login.html
+++ b/templates/accounts/login.html
@@ -3,13 +3,23 @@
 {% block content %}
 <div class="row">
     <div class="col-sm-6 col-sm-offset-3">
-        <div id="login_dialog">
+        <div class="hc-dialog">
+            {% if bad_link %}
+            <h1>Incorrect Login Link</h1>
+            <div class="dialog-body">
+                <p>The login link you just used is either incorrect or expired.</p>
+                <p>Please use the form below to request a fresh login link:</p>
+            </div>
+            {% else %}
             <h1>Health Checks</h1>
+            <div class="dialog-body">
+                <p>
+                    Please enter your email address.
+                    Next, we'll send you an email with log-in instructions!
+                </p>
+            </div>
+            {% endif %}
 
-            <p>
-                Please enter your email address.
-                Next, we'll send you an email with log-in instructions!
-            </p>
 
             <form method="post">
                 {% csrf_token %}
diff --git a/templates/accounts/login_link_sent.html b/templates/accounts/login_link_sent.html
index 6ebf213c..b5aebc2c 100644
--- a/templates/accounts/login_link_sent.html
+++ b/templates/accounts/login_link_sent.html
@@ -3,7 +3,7 @@
 {% block content %}
 <div class="row">
     <div class="col-sm-6 col-sm-offset-3">
-        <div id="login_dialog">
+        <div class="hc-dialog">
             <h1>Login Link Sent!</h1>
             <br />
             <p>
diff --git a/templates/bad_link.html b/templates/bad_link.html
index ec85c3a9..d5a5877e 100644
--- a/templates/bad_link.html
+++ b/templates/bad_link.html
@@ -3,12 +3,15 @@
 {% block content %}
 <div class="row">
     <div class="col-sm-6 col-sm-offset-3">
-        <div id="login_dialog">
-            <h1>Server Error</h1>
-
-            <p>
-                Something bad happened and you should feel bad.
-            </p>
+        <div class="hc-dialog">
+            <h1>Incorrect Verification Link</h1>
+            <div class="dialog-body">
+                <p>
+                    The verification link you just used is incorrect.
+                    If you copy-pasted the link, please make sure you did not
+                    miss any characters.
+                </p>
+            </div>
         </div>
     </div>
 </div>
diff --git a/templates/front/verify_email_success.html b/templates/front/verify_email_success.html
index 4a303360..3e13c727 100644
--- a/templates/front/verify_email_success.html
+++ b/templates/front/verify_email_success.html
@@ -3,15 +3,15 @@
 {% block content %}
 <div class="row">
     <div class="col-sm-6 col-sm-offset-3">
-        <div id="login_dialog">
+        <div class="hc-dialog">
             <h1>Email Address Verified!</h1>
-            <br />
-            <p>
-                Success! You've verified this email
-                address, and it will now receive
-                healthchecks.io notifications.
-            </p>
-
+            <div class="dialog-body">
+                <p>
+                    Success! You've verified this email
+                    address, and it will now receive
+                    healthchecks.io notifications.
+                </p>
+            </div>
         </div>
     </div>
 </div>