From e802002c566a7c24a5cead6ec6136959e79eed29 Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Mon, 25 Jul 2022 17:32:39 +0200
Subject: repair after rebase, re #838

---
 resources/assets/stylesheets/scss/index.scss | 165 +++++++++++----------------
 templates/index_nobody.php                   | 154 +++++++++++++------------
 2 files changed, 143 insertions(+), 176 deletions(-)

diff --git a/resources/assets/stylesheets/scss/index.scss b/resources/assets/stylesheets/scss/index.scss
index b65b6d2..d26384c 100644
--- a/resources/assets/stylesheets/scss/index.scss
+++ b/resources/assets/stylesheets/scss/index.scss
@@ -1,116 +1,50 @@
-div.index_container {
-    margin: 0 0;
-    top: 111px;
-    bottom: 0px;
-    width: 100%;
-    height: calc(100% - 110px);
-
-    ul#tabs {
-        display: none;
-    }
-
-    #background-desktop {
-        position: absolute;
-        top: 0;
-        left: 0;
-        right: 0;
-        bottom: 0;
-        z-index: -1;
-    }
-
-    #background-mobile {
-        display: none;
-        z-index: -1;
-    }
+#background-desktop {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: -1;
+}
 
-    div.messagebox {
-        margin-left: 50px;
-        margin-top: 50px;
-        width: 428px;
-    }
+#background-mobile {
+    display: none;
+    z-index: -1;
+}
 
-    div.index_main {
-        background-color: rgba(255, 255, 255, 0.8);
-        box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.5);
-        margin-left: 50px;
-        margin-top: 50px;
-        width: 500px;
+#loginbox {
+    background-color: rgba(255, 255, 255, 0.8);
+    box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.5);
+    margin-left: 50px;
+    margin-top: 50px;
+    padding: 20px;
+    width: 450px;
 
-        & > div {
-            padding: 20px;
-        }
+    header {
+        margin: 10px 0 0 10px;
 
-        form {
-            padding: 20px;
-            padding-bottom: 0;
+        h1 {
+            border-bottom: 0;
         }
+    }
 
-        footer {
-            overflow: auto;
-            padding: 20px;
-
-            div#languages {
-                border-top: 1px solid $light-gray-color;
-                font-size: 0.9em;
-                padding: 10px;
-
-                a {
-                    padding-right: 10px;
-                }
-            }
-
-            div#contrast {
-                display: flex;
-                align-items: center;
-                gap: 5px;
-                border-top: 1px solid $light-gray-color;
-                font-size: 0.9em;
-                padding: 10px;
-
-                a {
-                    text-decoration: underline;
-                    color: $contrast-blue;
-
-                    &:hover, &:focus {
-                        font-size: 1em;
-                        color: $red;
-                    }
-                }
-            }
-
-            div.login_info {
-                border-top: 1px solid $light-gray-color;
-                font-size: 0.8em;
-                div {
-                    text-align: right;
-                    float: left;
-                    padding: 5px;
-
-                    &:last-child {
-                        float:right;
-                    }
-                }
-            }
-            & > a {
-                margin-left: 12px;
-            }
-        }
-        nav {
-            h1 {
-                border-bottom: 0px;
-            }
-            padding: 10px;
-            margin-left: 20px;
-            margin-top: 20px;
+    nav {
+        ul {
             display: inline-block;
+            list-style-type: none;
+            margin: 0;
             width: 450px;
-            div.login_link {
+            padding: 0 10px;
+
+            .login_link {
                 display: inline-block;
                 width: 180px;
                 vertical-align: top;
                 padding-right: 25px;
+
                 a {
                     font-size: 1.5em;
+
                     p {
                         font-size: 0.5em;
                         color: $light-gray-color;
@@ -118,14 +52,45 @@ div.index_container {
                 }
             }
         }
+    }
 
+    footer {
+        overflow: auto;
+
+        div#languages {
+            border-top: 1px solid $light-gray-color;
+            font-size: 0.9em;
+            padding: 10px;
+
+            a {
+                padding-right: 10px;
+            }
+        }
+
+        div.login_info {
+            border-top: 1px solid $light-gray-color;
+            font-size: 0.8em;
+            div {
+                text-align: right;
+                float: left;
+                padding: 5px;
+
+                &:last-child {
+                    float:right;
+                }
+            }
+        }
+        & > a {
+            margin-left: 12px;
+        }
     }
 }
 
 #index,
 #login {
     .messagebox {
-        margin-bottom: -25px;
+        margin: 50px 0 -25px 50px;
+        width: 418px;
     }
 }
 
diff --git a/templates/index_nobody.php b/templates/index_nobody.php
index 8967130..f1690d6 100644
--- a/templates/index_nobody.php
+++ b/templates/index_nobody.php
@@ -18,95 +18,97 @@ if ($bg_mobile) {
 ?>
 <!-- Startseite (nicht eingeloggt) -->
 </header>
-<main id="content">
-    <? if (!empty($logout)) : ?>
-        <?= MessageBox::success(_("Sie sind nun aus dem System abgemeldet."), array_filter([$GLOBALS['UNI_LOGOUT_ADD']])) ?>
-    <? endif; ?>
+<main id="content-wrapper">
+    <div id="content">
+        <? if (!empty($logout)) : ?>
+            <?= MessageBox::success(_("Sie sind nun aus dem System abgemeldet."), array_filter([$GLOBALS['UNI_LOGOUT_ADD']])) ?>
+        <? endif; ?>
 
-    <div id="background-desktop" style="background: url(<?= $bg_desktop ?>) no-repeat top left/cover;"></div>
-    <div id="background-mobile" style="background: url(<?= $bg_mobile ?>) no-repeat top left/cover;"></div>
-    <div id="loginbox" aria-current="page">
-        <header>
-            <h1><?= htmlReady(Config::get()->UNI_NAME_CLEAN) ?></h1>
-        </header>
-        <nav>
-            <ul>
-                <? foreach (Navigation::getItem('/login') as $key => $nav) : ?>
-                    <? if ($nav->isVisible()) : ?>
-                        <? $name_and_title = explode(' - ', $nav->getTitle()) ?>
-                        <li class="login_link">
-                            <? if (is_internal_url($url = $nav->getURL())) : ?>
-                            <? SkipLinks::addLink($name_and_title[0], $url) ?>
-                            <a href="<?= URLHelper::getLink($url) ?>">
-                                <? else : ?>
-                                <a href="<?= htmlReady($url) ?>" target="_blank" rel="noopener noreferrer">
-                                    <? endif ?>
-                                    <?= htmlReady($name_and_title[0]) ?>
-                                    <p>
-                                        <?= htmlReady(!empty($name_and_title[1]) ? $name_and_title[1] : $nav->getDescription()) ?>
-                                    </p>
-                                </a>
-                        </li>
-                    <? endif ?>
-                <? endforeach ?>
-            </ul>
-        </nav>
-        <footer>
-            <? if ($GLOBALS['UNI_LOGIN_ADD']) : ?>
-                <div class="uni_login_add">
-                    <?= $GLOBALS['UNI_LOGIN_ADD'] ?>
+        <div id="background-desktop" style="background: url(<?= $bg_desktop ?>) no-repeat top left/cover;"></div>
+        <div id="background-mobile" style="background: url(<?= $bg_mobile ?>) no-repeat top left/cover;"></div>
+        <div id="loginbox" aria-current="page">
+            <header>
+                <h1><?= htmlReady(Config::get()->UNI_NAME_CLEAN) ?></h1>
+            </header>
+            <nav>
+                <ul>
+                    <? foreach (Navigation::getItem('/login') as $key => $nav) : ?>
+                        <? if ($nav->isVisible()) : ?>
+                            <? $name_and_title = explode(' - ', $nav->getTitle()) ?>
+                            <li class="login_link">
+                                <? if (is_internal_url($url = $nav->getURL())) : ?>
+                                <? SkipLinks::addLink($name_and_title[0], $url) ?>
+                                <a href="<?= URLHelper::getLink($url) ?>">
+                                    <? else : ?>
+                                    <a href="<?= htmlReady($url) ?>" target="_blank" rel="noopener noreferrer">
+                                        <? endif ?>
+                                        <?= htmlReady($name_and_title[0]) ?>
+                                        <p>
+                                            <?= htmlReady(!empty($name_and_title[1]) ? $name_and_title[1] : $nav->getDescription()) ?>
+                                        </p>
+                                    </a>
+                            </li>
+                        <? endif ?>
+                    <? endforeach ?>
+                </ul>
+            </nav>
+            <footer>
+                <? if ($GLOBALS['UNI_LOGIN_ADD']) : ?>
+                    <div class="uni_login_add">
+                        <?= $GLOBALS['UNI_LOGIN_ADD'] ?>
+                    </div>
+                <? endif; ?>
+
+                <div id="languages">
+                    <? foreach ($GLOBALS['INSTALLED_LANGUAGES'] as $temp_language_key => $temp_language): ?>
+                        <a href="index.php?set_language=<?= $temp_language_key ?>">
+                            <?= Assets::img('languages/' . $temp_language['picture'], tooltip2($temp_language['name'])) ?>
+                            <?= htmlReady($temp_language['name']) ?>
+                        </a>
+                    <? endforeach; ?>
                 </div>
-            <? endif; ?>
 
-            <div id="languages">
-                <? foreach ($GLOBALS['INSTALLED_LANGUAGES'] as $temp_language_key => $temp_language): ?>
-                    <a href="index.php?set_language=<?= $temp_language_key ?>">
-                        <?= Assets::img('languages/' . $temp_language['picture'], tooltip2($temp_language['name'])) ?>
-                        <?= htmlReady($temp_language['name']) ?>
-                    </a>
-                <? endforeach; ?>
+            <div id="contrast">
+                <? if (isset($_SESSION['contrast'])) : ?>
+                    <?= Icon::create('accessibility')->asImg(24) ?>
+                    <a href="index.php?unset_contrast=1"><?= _('Normalen Kontrast aktivieren') ?></a>
+                    <?= tooltipIcon(_('Aktiviert standardmäßige, nicht barrierefreie Kontraste.')); ?>
+                <? else : ?>
+                    <?= Icon::create('accessibility')->asImg(24) ?>
+                    <a href="index.php?set_contrast=1" id="highcontrastlink"><?= _('Hohen Kontrast aktivieren')?></a>
+                    <?= tooltipIcon(_('Aktiviert einen hohen Kontrast gemäß WCAG 2.1. Diese Einstellung wird nach dem Login übernommen.
+                    Sie können sie in Ihren persönlichen Einstellungen ändern.')); ?>
+                <? endif ?>
             </div>
 
-        <div id="contrast">
-            <? if (isset($_SESSION['contrast'])) : ?>
-                <?= Icon::create('accessibility')->asImg(24) ?>
-                <a href="index.php?unset_contrast=1"><?= _('Normalen Kontrast aktivieren') ?></a>
-                <?= tooltipIcon(_('Aktiviert standardmäßige, nicht barrierefreie Kontraste.')); ?>
-            <? else : ?>
-                <?= Icon::create('accessibility')->asImg(24) ?>
-                <a href="index.php?set_contrast=1" id="highcontrastlink"><?= _('Hohen Kontrast aktivieren')?></a>
-                <?= tooltipIcon(_('Aktiviert einen hohen Kontrast gemäß WCAG 2.1. Diese Einstellung wird nach dem Login übernommen.
-                Sie können sie in Ihren persönlichen Einstellungen ändern.')); ?>
-            <? endif ?>
-        </div>
-
-        <div class="login_info">
-            <div>
-                <?= _('Aktive Veranstaltungen') ?>:
-                <?= number_format($num_active_courses, 0, ',', '.') ?>
-            </div>
             <div class="login_info">
                 <div>
                     <?= _('Aktive Veranstaltungen') ?>:
                     <?= number_format($num_active_courses, 0, ',', '.') ?>
                 </div>
+                <div class="login_info">
+                    <div>
+                        <?= _('Aktive Veranstaltungen') ?>:
+                        <?= number_format($num_active_courses, 0, ',', '.') ?>
+                    </div>
 
-                <div>
-                    <?= _('Registrierte NutzerInnen') ?>:
-                    <?= number_format($num_registered_users, 0, ',', '.') ?>
-                </div>
+                    <div>
+                        <?= _('Registrierte NutzerInnen') ?>:
+                        <?= number_format($num_registered_users, 0, ',', '.') ?>
+                    </div>
 
-                <div>
-                    <?= _('Davon online') ?>:
-                    <?= number_format($num_online_users, 0, ',', '.') ?>
-                </div>
+                    <div>
+                        <?= _('Davon online') ?>:
+                        <?= number_format($num_online_users, 0, ',', '.') ?>
+                    </div>
 
-                <div>
-                    <a href="dispatch.php/siteinfo/show">
-                        <?= _('mehr') ?> &hellip;
-                    </a>
+                    <div>
+                        <a href="dispatch.php/siteinfo/show">
+                            <?= _('mehr') ?> &hellip;
+                        </a>
+                    </div>
                 </div>
-            </div>
-        </footer>
+            </footer>
+        </div>
     </div>
 </main>
-- 
cgit v1.0