Projects/nettsiden
Projects
/
nettsiden
8
0
Fork 0
Code Issues 5 Pull Requests 2 Activity

Remove kalender and aktiviteter from navbar, add Hendelser. Change webmail to /mail 

Finally
This commit is contained in:
Peder Bergebakken Sundt 2018-08-06 23:29:44 +02:00
parent 6c7241a2ac
commit f5c088fdc1
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inc/navbar.php
View File

@ -3,18 +3,20 @@ function navbar($depth, $active = NULL) {
$result = "\n\t<ul id=\"menu\">\n"; $result = "\n\t<ul id=\"menu\">\n";
$menuItems = [ $menuItems = [
'Hjem' => '', 'Hjem' => '',
'Kalender' => 'kalender', 'Hendelser' => 'hendelser',
'Aktiviteter' => 'aktiviteter', //'Kalender' => 'kalender',
//'Aktiviteter' => 'aktiviteter',
'Prosjekter' => 'prosjekt', 'Prosjekter' => 'prosjekt',
'Kontakt' => 'kontakt', 'Kontakt' => 'kontakt',
'Webmail' => 'https://webmail.pvv.ntnu.no/', 'Webmail' => 'mail',
//'Webmail' => 'https://webmail.pvv.ntnu.no/',
'Wiki' => 'pvv', 'Wiki' => 'pvv',
]; ];
foreach($menuItems as $caption => $link) { foreach($menuItems as $caption => $link) {
$isActive = $active === $link; $isActive = $active === $link;
if ($caption !== 'Webmail') { //if ($caption !== 'Webmail') {
$link = rtrim(str_repeat('../', $depth) . $link, '/') . '/'; $link = rtrim(str_repeat('../', $depth) . $link, '/') . '/';
} //}
if ($isActive) $link = '#'; if ($isActive) $link = '#';
$result .= "\t\t<li" . ($isActive ? ' class="active"' : '') . '>' $result .= "\t\t<li" . ($isActive ? ' class="active"' : '') . '>'
. '<a href="' . $link . '">' . '<a href="' . $link . '">'

2
www/css/style.css
View File

@ -34,6 +34,7 @@ nav {
height: 3em; height: 3em;
display: table; display: table;
white-space: nowrap; white-space: nowrap;
border: #024 0.1em solid;
} }
nav #menu, nav #login { nav #menu, nav #login {
display: table-cell; display: table-cell;
@ -64,6 +65,7 @@ nav #menu_toggle {
nav li, nav #menu_toggle, nav #login { nav li, nav #menu_toggle, nav #login {
line-height: 3em; line-height: 3em;
height: 3em; height: 3em;
border-bottom: 2px solid #024;
} }
nav a { nav a {
display: inline-block; display: inline-block;