hiding "Forgot Password" link using Plugins.hasListeners, instead of derpy config settings bool

v1.18.x
Julian Lam 11 years ago
parent 96b2a15290
commit 22354227be

@ -52,12 +52,6 @@ define(function() {
}); });
document.querySelector('#content input').focus(); document.querySelector('#content input').focus();
if(!config.emailSetup)
$('#reset-link').addClass('hide');
else
$('#reset-link').removeClass('hide');
}; };
return Login; return Login;

@ -41,7 +41,10 @@
<div class="form-group"> <div class="form-group">
<div class="col-lg-offset-2 col-lg-10"> <div class="col-lg-offset-2 col-lg-10">
<hr /> <hr />
<button class="btn btn-primary btn-lg btn-block" id="login" type="submit">[[login:login]]</button> &nbsp; <a id="reset-link" class="hide" href="{relative_path}/reset">[[login:forgot_password]]</a> <button class="btn btn-primary btn-lg btn-block" id="login" type="submit">[[login:login]]</button>
<!-- IF showResetLink -->
&nbsp; <a id="reset-link" href="{relative_path}/reset">[[login:forgot_password]]</a>
<!-- ENDIF showResetLink -->
</div> </div>
</div> </div>
<input type="hidden" name="_csrf" value="{token}" id="csrf-token" /> <input type="hidden" name="_csrf" value="{token}" id="csrf-token" />

@ -11,10 +11,11 @@ var path = require('path'),
posts = require('../posts'), posts = require('../posts'),
categories = require('../categories'), categories = require('../categories'),
categoryTools = require('../categoryTools') categoryTools = require('../categoryTools')
meta = require('../meta'),
Plugins = require('../plugins'),
utils = require('../../public/src/utils'), utils = require('../../public/src/utils'),
translator = require('../../public/src/translator'), translator = require('../../public/src/translator'),
pkg = require('../../package.json'), pkg = require('../../package.json');
meta = require('../meta');
(function (Api) { (function (Api) {
@ -46,7 +47,6 @@ var path = require('path'),
config.topicsPerPage = meta.config.topicsPerPage || 20; config.topicsPerPage = meta.config.topicsPerPage || 20;
config.postsPerPage = meta.config.postsPerPage || 20; config.postsPerPage = meta.config.postsPerPage || 20;
config.maximumFileSize = meta.config.maximumFileSize; config.maximumFileSize = meta.config.maximumFileSize;
config.emailSetup = !!meta.config['email:from'];
config.defaultLang = meta.config.defaultLang || 'en'; config.defaultLang = meta.config.defaultLang || 'en';
res.json(200, config); res.json(200, config);
@ -116,7 +116,8 @@ var path = require('path'),
app.get('/login', function (req, res) { app.get('/login', function (req, res) {
var data = {}, var data = {},
login_strategies = auth.get_login_strategies(), login_strategies = auth.get_login_strategies(),
num_strategies = login_strategies.length; num_strategies = login_strategies.length,
emailersPresent = Plugins.hasListeners('action:email.send');
if (num_strategies == 0) { if (num_strategies == 0) {
data = { data = {
@ -131,8 +132,8 @@ var path = require('path'),
} }
data.authentication = login_strategies; data.authentication = login_strategies;
data.token = res.locals.csrf_token; data.token = res.locals.csrf_token;
data.showResetLink = emailersPresent;
res.json(data); res.json(data);
}); });

Loading…
Cancel
Save