diff --git a/lib/navigation/LoginNavigation.php b/lib/navigation/LoginNavigation.php index bb63a03e97f19f655fdb4614630013e9643b6931..f5a1a3845ae87841afe43b6caf2f579ca9b204d5 100644 --- a/lib/navigation/LoginNavigation.php +++ b/lib/navigation/LoginNavigation.php @@ -31,7 +31,7 @@ class LoginNavigation extends Navigation $navigation->setLinkAttributes([ 'id' => 'toggle-login' ]); - $navigation->setURL('#login-form'); + $navigation->setURL('#toggle-login'); $this->addSubNavigation('standard_login', $navigation); $standard_login_active = true; } diff --git a/templates/loginform.php b/templates/loginform.php index 66a87a71a07d8228a2ef91172a63eb81e7649641..a024298e74eb58b635d402847b3fb4d87474690c 100644 --- a/templates/loginform.php +++ b/templates/loginform.php @@ -68,7 +68,7 @@ $show_hidden_login = false; <? $name_and_title = explode(' - ', $nav->getTitle()) ?> <li class="login_link"> <? if (is_internal_url($url = $nav->getURL())) : ?> - <? SkipLinks::addLink($name_and_title[0], $url) ?> + <? SkipLinks::addLink($name_and_title[0], URLHelper::getLink($url, ['cancel_login' => 1])) ?> <a href="<?= URLHelper::getLink($url, ['cancel_login' => 1]) ?>" <?= arrayToHtmlAttributes($nav->getLinkAttributes()) ?>> <? else : ?> <a href="<?= htmlReady($url) ?>" target="_blank" rel="noopener noreferrer"> @@ -83,7 +83,6 @@ $show_hidden_login = false; <? endforeach ?> </ul> </nav> - <? if ($show_hidden_login) : ?> <?= $this->render_partial('_standard_loginform', [ 'hidden' => empty($loginerror),