From 28a29f3e5d7df95f1703d0f5acae9bd7364dbc65 Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Tue, 24 Nov 2020 14:18:08 +0100
Subject: [PATCH] Fixed active highlighting

---
 includes/navbar.php | 78 ++++++++++++---------------------------------
 1 file changed, 20 insertions(+), 58 deletions(-)

diff --git a/includes/navbar.php b/includes/navbar.php
index 9e2b031..24295a2 100644
--- a/includes/navbar.php
+++ b/includes/navbar.php
@@ -4,81 +4,43 @@
       id="navbar"
     >
       <div class="container">
-        <a class="navbar-brand" href="./"
-          ><img
-            src="./img/PfostenDynamics.png"
-            style="max-height: 60px"
-            class="d-inline-block align-top"
-            alt=""
-            loading="lazy"
-            id="pfostendynamics"
-        /></a>
-        <button
-          class="navbar-toggler"
-          type="button"
-          data-toggle="collapse"
-          data-target="#navbarNavDropdown"
-          aria-controls="navbarNavDropdown"
-          aria-expanded="false"
-          aria-label="Toggle navigation"
-        >
+        <a class="navbar-brand" href="./">
+          <img src="./img/PfostenDynamics.png" style="max-height: 60px" class="d-inline-block align-top" alt="" loading="lazy" id="pfostendynamics" />
+        </a>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
-        <div
-          class="collapse navbar-collapse justify-content-end"
-          id="navbarNavDropdown"
-        >
+        <div class="collapse navbar-collapse justify-content-end" id="navbarNavDropdown">
           <ul class="navbar-nav">
             <li class="nav-item home canactive <?php if (ACTIVE_MENUITEM == "home") { ?> active<?php } ?>">
-              <a class="nav-link" href="./"
-                >Home <span class="sr-only">(current)</span></a
-              >
+              <a class="nav-link" href="./">Home<?php if (ACTIVE_MENUITEM == "home") { ?> <span class="sr-only">(current)</span><?php } ?></a>
             </li>
-            <li
-              class="nav-item dropdown vehicles bobbycar bobbyquad bobbybob bobbyklo bobbyboot bobbyhubschrauber raupenfahrzeug canactive"
-            >
-              <a
-                class="nav-link dropdown-toggle"
-                href="#"
-                id="navbarDropdownMenuLink"
-                role="button"
-                data-toggle="dropdown"
-                aria-haspopup="true"
-                aria-expanded="false"
-              >
-                Vehicles
-              </a>
-              <div
-                class="dropdown-menu"
-                aria-labelledby="navbarDropdownMenuLink"
-              >
+            <li class="nav-item dropdown vehicles bobbycar bobbyquad bobbybob bobbyklo bobbyboot bobbyhubschrauber raupenfahrzeug canactive">
+              <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Vehicles</a>
+              <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
                 <a class="dropdown-item" href="./bobbycar">Bobbycar</a>
                 <a class="dropdown-item" href="./bobbyquad">Bobbyquad</a>
                 <a class="dropdown-item" href="./bobbybob">Bobbybob</a>
                 <a class="dropdown-item" href="./bobbyklo">Bobbyklo</a>
                 <a class="dropdown-item" href="./bobbyboot">Bobbyboot</a>
-                <a class="dropdown-item" href="./bobbyhubschrauber"
-                  >Bobbyhubschrauber</a
-                >
-                <a class="dropdown-item" href="./raupenfahrzeug"
-                  >Raupenfahrzeug</a
-                >
+                <a class="dropdown-item" href="./bobbyhubschrauber">Bobbyhubschrauber</a>
+                <a class="dropdown-item" href="./raupenfahrzeug">Raupenfahrzeug</a>
               </div>
             </li>
-            <li class="nav-item careers canactive <?php if (ACTIVE_MENUITEM == "careers") { ?> active<?php } ?>">
-              <a class="nav-link" href="./careers">Careers</a>
+            <li class="nav-item careers canactive<?php if (ACTIVE_MENUITEM == "careers") { ?> active<?php } ?>">
+              <a class="nav-link" href="./careers">Careers<?php if (ACTIVE_MENUITEM == "careers") { ?> <span class="sr-only">(current)</span><?php } ?></a>
             </li>
-            <li class="nav-item news canactive <?php if (ACTIVE_MENUITEM == "news") { ?> active<?php } ?>">
-              <a class="nav-link" href="./news">News</a>
+            <li class="nav-item news canactive<?php if (ACTIVE_MENUITEM == "news") { ?> active<?php } ?>">
+              <a class="nav-link" href="./news">News<?php if (ACTIVE_MENUITEM == "news") { ?> <span class="sr-only">(current)</span><?php } ?></a>
             </li>
-            <li class="nav-item about canactive <?php if (ACTIVE_MENUITEM == "about") { ?> active<?php } ?>">
-              <a class="nav-link" href="./about">About</a>
+            <li class="nav-item about canactive<?php if (ACTIVE_MENUITEM == "about") { ?> active<?php } ?>">
+              <a class="nav-link" href="./about">About<?php if (ACTIVE_MENUITEM == "about") { ?> <span class="sr-only">(current)</span><?php } ?></a>
             </li>
-            <li class="nav-item shop canactive <?php if (ACTIVE_MENUITEM == "shop") { ?> active<?php } ?>">
-              <a class="nav-link" href="./shop">Shop</a>
+            <li class="nav-item shop canactive<?php if (ACTIVE_MENUITEM == "shop") { ?> active<?php } ?>">
+              <a class="nav-link" href="./shop">Shop<?php if (ACTIVE_MENUITEM == "shop") { ?> <span class="sr-only">(current)</span><?php } ?></a>
             </li>
             <li class="nav-item impressum canactive<?php if (ACTIVE_MENUITEM == "impressum") { ?> active<?php } ?>">
-              <a class="nav-link" href="./impressum">Impressum</a>
+              <a class="nav-link" href="./impressum">Impressum<?php if (ACTIVE_MENUITEM == "impressum") { ?> <span class="sr-only">(current)</span><?php } ?></a>
             </li>
           </ul>
           <a class="nav-link" href="#" onclick="darkMode()"