diff --git a/themes/bootstrap3/js/lightbox.js b/themes/bootstrap3/js/lightbox.js index 018b171d27b18c7270ee0efee8da2f664efad3c0..0a0d8f87d9a41e63b07a7ca4c0cc613c02ba808f 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 b05dc486c325e9c46ac8201654a393e865733abc..ad171b3d2943c58add0c9c1537274c29ebcad377 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>