From 8d3ba352020da79a453cadb870d74913c147cd76 Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Tue, 19 Jun 2012 09:14:58 +0100
Subject: [PATCH] Add enable_development_menu to forgot and
verify_email_address.
---
lib/browserid/views.js | 14 ++++++++++++--
resources/views/dialog_layout.ejs | 2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/lib/browserid/views.js b/lib/browserid/views.js
index 9fcb860e2..53fcf0142 100644
--- a/lib/browserid/views.js
+++ b/lib/browserid/views.js
@@ -139,7 +139,12 @@ exports.setup = function(app) {
app.get("/forgot", function(req, res) {
// !cachable! email embedded in DOM
- res.render('forgot.ejs', {title: 'Forgot Password', fullpage: false, email: req.query.email});
+ res.render('forgot.ejs', {
+ title: 'Forgot Password',
+ fullpage: false,
+ email: req.query.email,
+ enable_development_menu: config.get('enable_development_menu')
+ });
});
app.get("/signin", function(req, res) {
@@ -160,7 +165,12 @@ exports.setup = function(app) {
app.get("/verify_email_address", function(req, res) {
// !cachable! token is embedded in DOM
- res.render('verify_email_address.ejs', {title: 'Complete Registration', fullpage: true, token: req.query.token});
+ res.render('verify_email_address.ejs', {
+ title: 'Complete Registration',
+ fullpage: true,
+ token: req.query.token,
+ enable_development_menu: config.get('enable_development_menu')
+ });
});
app.get("/add_email_address", function(req,res) {
diff --git a/resources/views/dialog_layout.ejs b/resources/views/dialog_layout.ejs
index 899bfd401..4b1272261 100644
--- a/resources/views/dialog_layout.ejs
+++ b/resources/views/dialog_layout.ejs
@@ -20,7 +20,7 @@
</head>
<body class="waiting">
<header id="header">
- <% if (enable_development_menu) { %>
+ <% if (useJavascript !== false && enable_development_menu) { %>
<a href="#" id="showDevelopment"> </a>
<% } %>
<h1><a class="home" target="_blank" href="/">Mozilla Persona Home</a></h1>
--
GitLab