From 928647e6cce82d8cab16b91ab549250d96742e94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rn=20A=CC=8Ane?= <yorinad@pvv.ntnu.no>
Date: Fri, 10 Aug 2018 22:30:01 +0200
Subject: [PATCH] Move user button before user menu, for later CSS changes

---
 inc/navbar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/navbar.php b/inc/navbar.php
index 3393e7a..5e9d3bb 100644
--- a/inc/navbar.php
+++ b/inc/navbar.php
@@ -49,6 +49,8 @@ function loginBar($sp = null, $pdo = null) {
 			$userManager = new \pvv\admin\UserManager($pdo);
 			$isAdmin = $userManager->isAdmin($uname);
 		}
+		$result .= "\t<a id=\"login\" href=\"#usermenu\" aria-hidden=\"true\">${svg}" . htmlspecialchars($uname) . "</a>\n";
+
 		$result .= "\n\t<ul id=\"usermenu\">\n";
 		$result .= "\n\t\t<li><a id=\"login\" href=\"#\">${svg}" . htmlspecialchars($uname) . "</a></li>\n";
 		if ($isAdmin) {
@@ -56,8 +58,6 @@ function loginBar($sp = null, $pdo = null) {
 		}
 		$result .= "\n\t\t<li><a href=\"" . htmlspecialchars($as->getLogoutURL()) . "\">Logg ut</a></li>\n";
 		$result .= "\n\t</ul>\n";
-
-		$result .= "\t<a id=\"login\" href=\"#usermenu\" aria-hidden=\"true\">${svg}" . htmlspecialchars($uname) . "</a>\n";
 	} else {
 		$result .= "\t<a id=\"login\" href=\"" . htmlspecialchars($as->getLoginURL()) . "\">${svg}Logg inn</a>\n";
 	}