From ec837c3bb4c491c4fdcc3bca48c52a0380ebd80a Mon Sep 17 00:00:00 2001
From: Philipp Schafft <lion@lion.leolix.org>
Date: Thu, 1 Oct 2020 13:30:29 +0000
Subject: [PATCH] Fix: Corrected menu to allow navigation from/to/within admin
 area

---
 admin/includes/header.xsl   | 29 +++++++++++++----------------
 admin/includes/web-page.xsl |  2 +-
 web/assets/css/style.css    |  2 +-
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/admin/includes/header.xsl b/admin/includes/header.xsl
index f3f7dc6a..a8d0a1b5 100644
--- a/admin/includes/header.xsl
+++ b/admin/includes/header.xsl
@@ -2,27 +2,24 @@
 	<xsl:output method="html" doctype-system="about:legacy-compat" encoding="UTF-8" indent="yes" />
 	<xsl:template name="header">
 
-		<div class="header">
-			<h1>
-				<a href="/" title="Home page">Icecast</a>
-				<xsl:text> </xsl:text>
-				<span>administration</span>
-			</h1>
-			<div class="nav">
-				<label for="toggle-nav" class="nobar" title="Toggle navigation"></label>
-				<input type="checkbox" id="toggle-nav" />
+		<header>
+			<nav id="main-nav" role="primary">
+				<a href="/" id="branding">
+					<img src="/assets/img/icecast.png" alt="Logo" />
+					<h1>Icecast Server administration</h1>
+				</a>
 				<ul>
-					<li class="on"><a href="/admin/stats.xsl">Administration</a></li>
-					<li><a href="/admin/listmounts.xsl">Mountpoint list</a></li>
+					<li class="adminlink"><a href="/admin/stats.xsl">Server status</a></li>
+					<li class="adminlink"><a href="/admin/listmounts.xsl">Mountpoint list</a></li>
 					<xsl:for-each select="(/report/extension/icestats | /icestats | /iceresponse)/modules/module">
 						<xsl:if test="@management-url and @management-title">
-							<li><a href="{@management-url}"><xsl:value-of select="@management-title" /></a></li>
+							<li class="adminlink"><a href="{@management-url}"><xsl:value-of select="@management-title" /></a></li>
 						</xsl:if>
 					</xsl:for-each>
-					<li><a href="/status.xsl">Public area</a></li>
+					<li class="right"><a href="/status.xsl">Public area</a></li>
 				</ul>
-			</div>
-		</div>
+			</nav>
+		</header>
 
 	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/admin/includes/web-page.xsl b/admin/includes/web-page.xsl
index 87a9d167..c1b608b7 100644
--- a/admin/includes/web-page.xsl
+++ b/admin/includes/web-page.xsl
@@ -25,7 +25,7 @@
                         <ul>
                             <li><a href="status.xsl">Status</a></li>
                             <li><a href="server_version.xsl">Version</a></li>
-                            <li class="right"><a href="admin/">Administration</a></li>
+                            <li class="right adminlink"><a href="admin/">Administration</a></li>
                         </ul>
                     </nav>
                 </header>
diff --git a/web/assets/css/style.css b/web/assets/css/style.css
index 9df8e2f5..8e6a4659 100644
--- a/web/assets/css/style.css
+++ b/web/assets/css/style.css
@@ -70,7 +70,7 @@ html, body {
     transform: scaleX(0);
 }
 
-#main-nav > ul > li.right > a:after {
+#main-nav > ul > li.adminlink > a:after {
     border-bottom: 2px #ff704d solid;
 }