From e1f943f69dc8d4b064ad36d7a216012ed788390f Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Tue, 18 Oct 2016 17:36:19 +0300
Subject: [PATCH] Use lightbox for password recovery. (#831)
---
themes/bootstrap3/js/lightbox.js | 2 +-
themes/bootstrap3/templates/Auth/AbstractBase/login.phtml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/themes/bootstrap3/js/lightbox.js b/themes/bootstrap3/js/lightbox.js
index 018b171d27b..0a0d8f87d9a 100644
--- a/themes/bootstrap3/js/lightbox.js
+++ b/themes/bootstrap3/js/lightbox.js
@@ -141,7 +141,7 @@ VuFind.register('lightbox', function Lightbox() {
}
if ( // Close the lightbox after deliberate login
obj.method // is a form
- && ((obj.url.match(/MyResearch/) && !obj.url.match(/Bulk/) && !obj.url.match(/Delete/)) // that matches login/create account
+ && ((obj.url.match(/MyResearch/) && !obj.url.match(/Bulk/) && !obj.url.match(/Delete/) && !obj.url.match(/Recover/)) // that matches login/create account
|| obj.url.match(/catalogLogin/)) // or catalog login for holds
&& $('<div/>').html(content).find('.flash-message.alert-danger').length === 0 // skip failed logins
) {
diff --git a/themes/bootstrap3/templates/Auth/AbstractBase/login.phtml b/themes/bootstrap3/templates/Auth/AbstractBase/login.phtml
index b05dc486c32..ad171b3d294 100644
--- a/themes/bootstrap3/templates/Auth/AbstractBase/login.phtml
+++ b/themes/bootstrap3/templates/Auth/AbstractBase/login.phtml
@@ -13,7 +13,7 @@
<input class="btn btn-primary" type="submit" name="processLogin" value="<?=$this->transEsc('Login')?>">
<? if ($account->supportsRecovery()): ?>
<br/>
- <a class="btn btn-link" href="<?=$this->url('myresearch-recover') ?>?auth_method=<?=$account->getAuthMethod()?>" data-lightbox-ignore><?=$this->transEsc('Forgot Password')?></a>
+ <a class="btn btn-link" href="<?=$this->url('myresearch-recover') ?>?auth_method=<?=$account->getAuthMethod()?>"><?=$this->transEsc('Forgot Password')?></a>
<? endif; ?>
</div>
</div>
--
GitLab