From 4c03b69b1e6311097440f167e5c74a6cdd6547a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Wed, 24 Jan 2024 14:16:06 +0000
Subject: [PATCH] fixes #3620
Closes #3620
Merge request studip/studip!2513
---
resources/assets/stylesheets/scss/index.scss | 13 +++++++++++++
templates/_standard_loginform.php | 2 +-
templates/loginform.php | 2 ++
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/resources/assets/stylesheets/scss/index.scss b/resources/assets/stylesheets/scss/index.scss
index ad760ad431c..2e4fe65898c 100644
--- a/resources/assets/stylesheets/scss/index.scss
+++ b/resources/assets/stylesheets/scss/index.scss
@@ -207,4 +207,17 @@ $gap-between-boxes: calc($login-page-margin / 2);
float: left !important;
}
+
+ #login-footer-bottom {
+ display: flex;
+ align-items: flex-start;
+ justify-content: space-between;
+ margin-bottom: 1.5ex;
+ }
+
+ #login-footer-top {
+ display: flex;
+ align-items: flex-start;
+ justify-content: space-between;
+ }
}
diff --git a/templates/_standard_loginform.php b/templates/_standard_loginform.php
index a300cb608e0..7174287f060 100644
--- a/templates/_standard_loginform.php
+++ b/templates/_standard_loginform.php
@@ -65,7 +65,7 @@ $password_tooltip_text = (string)Config::get()->PASSWORD_TOOLTIP_TEXT;
<input type="hidden" name="login_ticket" value="<?= Seminar_Session::get_ticket() ?>">
<input type="hidden" name="resolution" value="">
- <div style="display: flex; align-items: flex-start; justify-content: space-between; height: 70px;">
+ <div id="<?=$login_footer_id?>">
<?= Button::createAccept(_('Anmelden'), _('Login'), ['id' => 'submit_login']); ?>
<? if (Config::get()->ENABLE_REQUEST_NEW_PASSWORD_BY_USER && in_array('Standard', $GLOBALS['STUDIP_AUTH_PLUGIN'])): ?>
diff --git a/templates/loginform.php b/templates/loginform.php
index e36f110241f..69fc1f06ab6 100644
--- a/templates/loginform.php
+++ b/templates/loginform.php
@@ -52,6 +52,7 @@ $show_hidden_login = !$show_login && StudipAuthAbstract::isLoginEnabled();
<? if ($show_login) : ?>
<?= $this->render_partial('_standard_loginform', [
'hidden' => false,
+ 'login_footer_id' => 'login-footer-top'
]) ?>
<? endif ?>
<nav>
@@ -80,6 +81,7 @@ $show_hidden_login = !$show_login && StudipAuthAbstract::isLoginEnabled();
<? if ($show_hidden_login) : ?>
<?= $this->render_partial('_standard_loginform', [
'hidden' => empty($loginerror),
+ 'login_footer_id' => 'login-footer-bottom'
]) ?>
<? endif ?>
--
GitLab