From a1ace9527879ebcc4d62fa6c4404951eb3a8a131 Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Tue, 27 Sep 2011 17:35:54 +0100
Subject: [PATCH] Making the verification file names/urls easier to grok.
prove.ejs -> verifyemail.ejs
verify.ejs -> verifyuser.ejs
urls are the same - verifyemail, verifyuser
---
browserid/app.js | 15 +++++++++------
browserid/views/{prove.ejs => verifyemail.ejs} | 0
browserid/views/{verify.ejs => verifyuser.ejs} | 4 ++--
3 files changed, 11 insertions(+), 8 deletions(-)
rename browserid/views/{prove.ejs => verifyemail.ejs} (100%)
rename browserid/views/{verify.ejs => verifyuser.ejs} (86%)
diff --git a/browserid/app.js b/browserid/app.js
index 1a18eaf93..0e1ea719b 100644
--- a/browserid/app.js
+++ b/browserid/app.js
@@ -102,10 +102,6 @@ function router(app) {
res.render('index.ejs', {title: 'A Better Way to Sign In', fullpage: true});
});
- app.get(/^\/prove(\.html)?$/, function(req,res) {
- res.render('prove.ejs', {title: 'Verify Email Address', fullpage: false});
- });
-
app.get(/^\/signup(\.html)?$/, function(req, res) {
res.render('signup.ejs', {title: 'Sign Up', fullpage: false});
});
@@ -126,8 +122,15 @@ function router(app) {
res.render('privacy.ejs', {title: 'Privacy Policy', fullpage: false});
});
- app.get(/^\/verify(\.html)?$/, function(req, res) {
- res.render('verify.ejs', {title: 'Complete Registration', fullpage: true});
+ app.get(/^\/verifyuser(\.html)?$/, function(req, res) {
+ var site = "http://sitesite.com";
+ var email = "email@email.com";
+
+ res.render('verifyuser.ejs', {title: 'Complete Registration', fullpage: true, site: site, email: email});
+ });
+
+ app.get(/^\/verifyemail(\.html)?$/, function(req,res) {
+ res.render('verifyemail.ejs', {title: 'Verify Email Address', fullpage: false});
});
// register all the WSAPI handlers
diff --git a/browserid/views/prove.ejs b/browserid/views/verifyemail.ejs
similarity index 100%
rename from browserid/views/prove.ejs
rename to browserid/views/verifyemail.ejs
diff --git a/browserid/views/verify.ejs b/browserid/views/verifyuser.ejs
similarity index 86%
rename from browserid/views/verify.ejs
rename to browserid/views/verifyuser.ejs
index 6a6293d0c..189a17e0c 100644
--- a/browserid/views/verify.ejs
+++ b/browserid/views/verifyuser.ejs
@@ -1,12 +1,12 @@
<div id="vAlign">
<div id="signUpFormWrap">
<form id="signUpForm" class="cf">
- <p class="hint">Finish signing into <span class="website"><strong>http://www.nytimes.com</strong></span></p>
+ <p class="hint">Finish signing into: <span class="website"><strong><%= site %></strong></span></p>
<h1 class="serif">Last step!</h1>
<ul class="inputs">
<li>
<label class="serif" for="email">Email Address</label>
- <input class="youraddress sans" id="email" placeholder="Your Email" type="email" disabled="disabled">
+ <input class="youraddress sans" id="email" placeholder="Your Email" type="email" value="<%= email %>" disabled="disabled">
</li>
<li>
<label class="serif" for="password">New Password</label>
--
GitLab