From e8081e86c1f2f00abeb5a16dc483e3722165e086 Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Thu, 15 Sep 2011 14:27:58 -0700
Subject: [PATCH] Starting to make the email verification step look and act
right.
We have to pass the correct email to the dialog.
---
.../checkregistration_controller.js | 6 ++---
browserid/static/dialog/css/popup2.css | 1 -
.../static/dialog/views/confirmemail.ejs | 22 ++++++++-----------
3 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/browserid/static/dialog/controllers/checkregistration_controller.js b/browserid/static/dialog/controllers/checkregistration_controller.js
index 1d8c0d87e..49f29c299 100644
--- a/browserid/static/dialog/controllers/checkregistration_controller.js
+++ b/browserid/static/dialog/controllers/checkregistration_controller.js
@@ -38,14 +38,12 @@
"use strict";
PageController.extend("Checkregistration", {}, {
- init: function(options) {
+ init: function(el, options) {
this._super({
bodyTemplate: "confirmemail.ejs",
bodyVars: {
email: options.email
- },
- footerTemplate: "bottom-confirmemail.ejs",
- footerVars: {}
+ }
});
$('#continue_button').addClass('disabled');
this.setupRegCheck();
diff --git a/browserid/static/dialog/css/popup2.css b/browserid/static/dialog/css/popup2.css
index b7832c510..80c195457 100644
--- a/browserid/static/dialog/css/popup2.css
+++ b/browserid/static/dialog/css/popup2.css
@@ -443,7 +443,6 @@ html[xmlns] .cf {
color: #222;
}
#checkemail {
- display: none;
text-align: center;
}
diff --git a/browserid/static/dialog/views/confirmemail.ejs b/browserid/static/dialog/views/confirmemail.ejs
index f1174e5fe..6c0a08334 100644
--- a/browserid/static/dialog/views/confirmemail.ejs
+++ b/browserid/static/dialog/views/confirmemail.ejs
@@ -1,14 +1,10 @@
- <h2> Confirm Your Email </h2>
- <div class="content">
- <div class="summary">Welcome, <span class="email good"><%= email %></span>. You will receive a <strong>confirmation email</strong> in a few moments. To activate your BrowserID, please <strong>visit the link</strong> included in the email.</div>
- <div class="attention" id="waiting_confirmation">
- Waiting for email confirmation...
- </div>
- <div class="attention_awesome" style="display:none;" id="confirmed_notice">
- Your email has been confirmed! </span>
- </div>
- <div class="actions">
- <!-- XXX: disable the resend link until it's implemented -->
- <div style="display: none;" class="action" id="resendit_action"> No email yet? <a href="#">Resend it!</a></div>
- </div>
+ <div id="checkemail">
+ <div class="table">
+ <div class="vertical">
+ <p style="margin:20px auto;font-size:150%;"><strong style="color:#222">Check your email!</strong></p>
+ <p>We sent a confirmation email to <span id="displayemail"><%= email %></span></p>
+ <p>To finish signing in just click the verify link we sent to your email address.</p>
+ </div>
+ </div>
</div>
+
--
GitLab