From 731cf0f1d83039a9fe0781304a65e5c4906d4dc0 Mon Sep 17 00:00:00 2001
From: Thedro Neely <thedroneely@gmail.com>
Date: Fri, 9 Nov 2018 22:59:33 -0500
Subject: app/model/Navigation: Improve navigation bar page tracking

---
 app/model/Navigation.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'app/model')

diff --git a/app/model/Navigation.php b/app/model/Navigation.php
index b10bf45..3394d03 100644
--- a/app/model/Navigation.php
+++ b/app/model/Navigation.php
@@ -5,10 +5,10 @@ class Navigation
     public function generateHomeButton()
     {
         if ($_SERVER['REQUEST_URI'] === '/') {
-            echo '<a class="navbar-active navbar-item" href="/">Home</a>';
+            echo '<a class="navbar__active navbar-item navbar__item" href="/">Home</a>';
             return;
         }
-        echo '<a class="navbar-item" href="/">Home</a>';
+        echo '<a class="navbar-item navbar__item" href="/">Home</a>';
     }
 
     public function generateNavBar()
@@ -22,10 +22,14 @@ class Navigation
 
         foreach ($navbar as $title => $route) {
             $append ='';
-            if ($route['uri'] === $_SERVER['REQUEST_URI'] || strpos($_SERVER['REQUEST_URI'], $route['uri']) !== false) {
-                $append = ' navbar-active';
+            if ($route['uri'] === $_SERVER['REQUEST_URI']
+                || strpos($_SERVER['REQUEST_URI'], $route['uri']) !== false
+            ) {
+                $append = 'navbar__active';
             }
-            echo str_repeat("\t", 4) . "<a class=\"navbar-item$append\"" . ' href="' . $route['uri'] . '">' . $title . '</a>' . "\n";
+            echo str_repeat("\t", 4) .
+            "<a class=\"navbar-item navbar__item $append\"" .
+            ' href="' . $route['uri'] . '">' . $title . '</a>' . "\n";
         }
     }
 
-- 
cgit v1.2.3