From 0e4695f77a32cb8c3ec07df4e0cf2e91aeb27cb8 Mon Sep 17 00:00:00 2001
From: Dorian Zedler <dorian@itsblue.de>
Date: Sun, 11 Jul 2021 18:23:14 +0200
Subject: [PATCH] Some changes to navbar

---
 theme.php | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/theme.php b/theme.php
index 3d3eaa0..eeaaa9e 100644
--- a/theme.php
+++ b/theme.php
@@ -146,6 +146,14 @@ class LandingpageTheme
         $this->_printHeader();
     ?>
         <style>
+        .mr-2, .mx-2 {
+    margin-right: 0.5rem !important;
+}
+
+.ml-auto {
+    margin-left: auto !important;
+}
+
             .flex-equal>* {
                 flex: 1;
             }
@@ -161,21 +169,21 @@ class LandingpageTheme
             <main>
                 <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
                     <div class="container-fluid">
-                        <a class="navbar-brand" href="#"><?= $this->_trId("globals.title") ?></a>
-                        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarTogglerDemo02" aria-controls="navbarTogglerDemo02" aria-expanded="false" aria-label="Toggle navigation">
+                        <a href="<?= $this->_globalConfig["basePath"] ?>/manage">
+                            <img class="d-inline-block align-top mr-2" src="<?= $this->_globalConfig['mainIcon'] ?>" alt="" width="40px">
+                        </a>
+                        <a class="navbar-brand" href="<?= $this->_globalConfig["basePath"] ?>/manage"><?= $this->_trId("globals.title") ?></a>
+                        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggler" aria-controls="navbarToggler" aria-expanded="false" aria-label="Toggle navigation">
                             <span class="navbar-toggler-icon"></span>
                         </button>
-                        <div class="collapse navbar-collapse" id="navbarTogglerDemo02">
-                            <ul class="navbar-nav nav-pills me-auto mb-2 mb-lg-0">
-                                <li class="nav-item">
-                                    <a class="nav-link active" aria-current="page" href="#"><?= $this->_trId("home.menu.manageTimerLabel") ?></a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link" aria-current="page" target="blank" href="<?= $this->_globalConfig["basePath"] ?>/t/<?= $_SESSION["auth"]["username"] ?>"><?= $this->_trId("home.menu.openTimerLabel") ?></a>
+                        <div class="collapse navbar-collapse" id="navbarToggler">
+                            <ul class="navbar-nav ml-auto mb-2 mb-lg-0">
+                                <li class="nav-item mr-2">
+                                    <a class="nav-link active" aria-current="page" target="blank" href="<?= $this->_globalConfig["basePath"] ?>/t/<?= $_SESSION["auth"]["username"] ?>"><?= $this->_trId("home.menu.openTimerLabel") ?></a>
                                 </li>
                             </ul>
                             <form action="logout/submit" method="post" class="d-felx">
-                                <input type="submit" value="<?= $this->_trId("home.menu.logoutLabel") ?>" class="btn btn-secondary">
+                                <button type="submit" class="btn btn-outline-light"><?= $this->_trId("home.menu.logoutLabel") ?></button>
                             </form>
                         </div>
                     </div>
@@ -450,7 +458,6 @@ class LandingpageTheme
             for (const button of formButtons) {
                 if (button.type === "submit") {
                     form.addEventListener("submit", () => {
-                        console.log(button)
                         button.innerHTML += ' <div class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></div>'
                         button.disabled = true
                     })