Browse Source

Update wording in "Incorrect Link" pages. Fixes #5

pull/9/head
Pēteris Caune 9 years ago
parent
commit
c5578ac44a
6 changed files with 41 additions and 23 deletions
  1. +2
    -1
      hc/accounts/views.py
  2. +6
    -2
      static/css/base.css
  3. +15
    -5
      templates/accounts/login.html
  4. +1
    -1
      templates/accounts/login_link_sent.html
  5. +9
    -6
      templates/bad_link.html
  6. +8
    -8
      templates/front/verify_email_success.html

+ 2
- 1
hc/accounts/views.py View File

@ -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)

+ 6
- 2
static/css/base.css View File

@ -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;
}

+ 15
- 5
templates/accounts/login.html View File

@ -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 %}


+ 1
- 1
templates/accounts/login_link_sent.html View File

@ -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>


+ 9
- 6
templates/bad_link.html View File

@ -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>

+ 8
- 8
templates/front/verify_email_success.html View File

@ -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>


Loading…
Cancel
Save