talk: Add menu item for users page

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/modules/menu.html b/src/templates/modules/menu.html
index 521fd73ca35b9d621bb00c653519f85ac65eafab..383507de383b1665c8ef6170bbcb2a914a7c0446 100644 (file)
--- 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 3742ddb88b2bc7956e94a1bef6058bc7d489e5a4..1afa1a33fc3e9ef567f5de47115711396edbd868 100644 (file)
--- 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 %}