From cf4da20dde79471834ced56f98e106937279de12 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 10 Oct 2018 18:24:22 +0100
Subject: [PATCH] talk: Add menu item for users page

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/templates/modules/menu.html | 20 --------------------
 src/templates/talk/base.html    | 22 +++++++++++++---------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/src/templates/modules/menu.html b/src/templates/modules/menu.html
index 521fd73c..383507de 100644
--- a/src/templates/modules/menu.html
+++ b/src/templates/modules/menu.html
@@ -41,26 +41,6 @@
 		<li class="nav-item">
 			<a class="nav-link" href="/?mode=upload">{{ _("Upload file") }}</a>
 		</li>
-	{% elif hostname == "talk.ipfire.org" and current_user %}
-		<li class="nav-item">
-			<a class="nav-link phonebook" href="/phonebook">{{ _("Phonebook") }}</a>
-		</li>
-
-		<li class="nav-item">
-			<a class="nav-link conferences" href="/conferences">{{ _("Conferences") }}</a>
-		</li>
-
-		<li class="nav-item">
-			<a class="nav-link" href="https://wiki.ipfire.org/en/community/talk.ipfire.org/start">
-				{{ _("Documentation") }}
-			</a>
-		</li>
-
-		{% if current_user.is_admin() %}
-			<li class="nav-item">
-				<a class="nav-link diagnosis" href="/diagnosis">{{ _("Diagnosis") }}</a>
-			</li>
-		{% end %}
 	{% elif hostname == "planet.ipfire.org" %}
 		<form class="form-inline" role="search" method="GET" action="/search">
 			<input type="text" class="form-control mx-2" name="q" placeholder="{{ _("Search") }}">
diff --git a/src/templates/talk/base.html b/src/templates/talk/base.html
index 3742ddb8..1afa1a33 100644
--- a/src/templates/talk/base.html
+++ b/src/templates/talk/base.html
@@ -3,16 +3,20 @@
 {% block subtitle %}{{ _("Talk") }}{% end block %}
 
 {% block menu %}
-	<form class="form-inline ml-auto my-2 my-lg-0" action="/search" method="GET">
-		<input class="form-control form-control-sm mr-sm-2" type="search" name="q"
-			placeholder="{{ _("Search") }}" aria-label="{{ _("Search") }}" value="{% try %}{{ q }}{% except %}{% end %}">
-	</form>
+	{% if current_user %}
+		<ul class="navbar-nav ml-auto mr-3">
+			<li class="nav-item">
+				<a class="nav-link {% if request.path.startswith("/users") %}active{% end %}" href="/users">
+					{{ _("Users") }}
+				</a>
+			</li>
+		</ul>
 
-	<ul class="navbar-nav">
-		<li class="nav-item">
-			<a class="nav-link" href="https://www.ipfire.org/">IPFire.org</a>
-		</li>
-	</ul>
+		<form class="form-inline my-2 my-lg-0" action="/search" method="GET">
+			<input class="form-control form-control-sm mr-sm-2" type="search" name="q"
+				placeholder="{{ _("Search") }}" aria-label="{{ _("Search") }}" value="{% try %}{{ q }}{% except %}{% end %}">
+		</form>
+	{% end %}
 {% end block %}
 
 {% block content %}
-- 
2.47.3