From f5c088fdc1ba42742b6bd00ebe4948d5de59a32b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 6 Aug 2018 23:29:44 +0200
Subject: [PATCH] Remove kalender and aktiviteter from navbar, add Hendelser.
 Change webmail to /mail

Finally
---
 inc/navbar.php    | 12 +++++++-----
 www/css/style.css |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/inc/navbar.php b/inc/navbar.php
index c03e34c..fa89c4b 100644
--- a/inc/navbar.php
+++ b/inc/navbar.php
@@ -3,18 +3,20 @@ function navbar($depth, $active = NULL) {
 	$result = "\n\t<ul id=\"menu\">\n";
 	$menuItems = [
 		'Hjem' => '',
-		'Kalender' => 'kalender',
-		'Aktiviteter' => 'aktiviteter',
+		'Hendelser' => 'hendelser',
+		//'Kalender' => 'kalender',
+		//'Aktiviteter' => 'aktiviteter',
 		'Prosjekter' => 'prosjekt',
 		'Kontakt' => 'kontakt',
-		'Webmail' => 'https://webmail.pvv.ntnu.no/',
+		'Webmail' => 'mail',
+		//'Webmail' => 'https://webmail.pvv.ntnu.no/',
 		'Wiki' => 'pvv',
 	];
 	foreach($menuItems as $caption => $link) {
 		$isActive = $active === $link;
-		if ($caption !== 'Webmail') {
+		//if ($caption !== 'Webmail') {
 			$link = rtrim(str_repeat('../', $depth) . $link, '/') . '/';
-		}
+		//}
 		if ($isActive) $link = '#';
 		$result .= "\t\t<li" . ($isActive ? ' class="active"' : '') . '>'
 			. '<a href="' . $link . '">'
diff --git a/www/css/style.css b/www/css/style.css
index a373056..513d854 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -34,6 +34,7 @@ nav {
 	height: 3em;
 	display: table;
 	white-space: nowrap;
+	border: #024 0.1em solid;
 }
 nav #menu, nav #login {
 	display: table-cell;
@@ -64,6 +65,7 @@ nav #menu_toggle {
 nav li, nav #menu_toggle, nav #login {
 	line-height: 3em;
 	height: 3em;
+	border-bottom: 2px solid #024;
 }
 nav a {
 	display: inline-block;