From c5c40ff46d212084861217eb466202bcdf0c9222 Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Mon, 2 Jul 2012 10:06:50 +0100
Subject: [PATCH] Update the main site "verify your email address" copy to
match that of the dialog.
issue #1895
---
resources/static/pages/css/style.css | 15 ++++++++++++++-
resources/views/forgot.ejs | 9 +++------
resources/views/signup.ejs | 11 ++++-------
3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/resources/static/pages/css/style.css b/resources/static/pages/css/style.css
index d73c65a9f..8dd9f0077 100644
--- a/resources/static/pages/css/style.css
+++ b/resources/static/pages/css/style.css
@@ -428,6 +428,16 @@ button.delete:active {
border-radius: 5px;
}
+#signUpForm h1 {
+ margin-bottom: 20px;
+}
+
+#signUpForm h2 {
+ margin-bottom: 20px;
+ font-weight: 300;
+ font-size: 22px;
+}
+
#signUpForm a {
color: #6dc7ff;
text-shadow: 0 1px 0 #888;
@@ -489,7 +499,6 @@ button.delete:active {
.notifications > .notification {
border-radius: 3px;
display: none;
- text-align: center;
}
.notifications .notification.error {
@@ -497,6 +506,10 @@ button.delete:active {
background-color: rgba(255,0,0,0.25);
}
+.notification p {
+ margin-top: 8px;
+}
+
#wrapper > header {
font-weight: bold;
diff --git a/resources/views/forgot.ejs b/resources/views/forgot.ejs
index 87b0d8f7b..a9e76e420 100644
--- a/resources/views/forgot.ejs
+++ b/resources/views/forgot.ejs
@@ -9,17 +9,14 @@
<h1>Forgot Password</h1>
<div class="notifications">
<div class="notification emailsent">
- <p>
- We sent a confirmation email to <strong id="sentToEmail"></strong>.
- </p>
+ <h2>Confirm your email address</h2>
<p>
- To finish resetting your password just click the verify link we sent to your email address.
+ Check your email at <strong id="sentToEmail"></strong>.
</p>
- <br />
<p>
- If this is a mistake, just ignore the sent email and <a href="/signup" class="action cancelVerify" id="back">use another email address</a>.
+ Click the link in the confirmation email. Your password will then be reset.
</p>
</div>
</div>
diff --git a/resources/views/signup.ejs b/resources/views/signup.ejs
index 81ec178b4..e751aa7f6 100644
--- a/resources/views/signup.ejs
+++ b/resources/views/signup.ejs
@@ -15,17 +15,14 @@
</li>
<li class="notification emailsent">
- <p>
- We sent a confirmation email to <strong id="sentToEmail"></strong>.
- </p>
+ <h2>Confirm your email address</h2>
<p>
- To finish signing up just click the verify link we sent to your email address.
+ Check your email at <strong id="sentToEmail"></strong>.
</p>
- <br />
<p>
- If this is a mistake, just ignore the sent email and <a href="/signup" class="action cancelVerify" id="back">use another email address</a>.
+ Click the link in the confirmation email. You'll then immediately be signed into Persona.
</p>
</li>
@@ -106,7 +103,7 @@
sign in with your provider. A new window will be opened.
</p>
- <p>
+ <p class="submit">
<button id="authWithPrimary" tabindex="1">Verify</button>
</p>
</li>
--
GitLab