From 84cfd165b4d3e34d15b024b9cbcc651b66aa8d8e Mon Sep 17 00:00:00 2001
From: Matt Scott <matt@azorian.solutions>
Date: Sun, 12 Mar 2023 10:27:04 -0400
Subject: [PATCH] Re-arranged side navigation to include the "Global Search"
 feature regardless of user role as the global search feature is now
 accessible to all users.

Also moved the "Activity" feature link higher in the menu to remove duplicate code from the navigation code base.
---
 powerdnsadmin/templates/base.html | 34 +++++++++++++------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/powerdnsadmin/templates/base.html b/powerdnsadmin/templates/base.html
index 5a47bd2..408f4be 100644
--- a/powerdnsadmin/templates/base.html
+++ b/powerdnsadmin/templates/base.html
@@ -101,14 +101,22 @@
                             </a>
                         </li>
                     {% endif %}
-                    {% if current_user.role.name in ['Administrator', 'Operator'] %}
-                        <li class="nav-header">Administration</li>
-                        <li class="{{ 'nav-item active' if active_page == 'admin_global_search' else 'nav-item' }}">
-                            <a href="{{ url_for('admin.global_search') }}" class="nav-link">
-                                <i class="nav-icon fa-solid fa-search"></i>
-                                <p>Global Search</p>
+                    <li class="nav-header">Administration</li>
+                    <li class="{{ 'nav-item active' if active_page == 'admin_global_search' else 'nav-item' }}">
+                        <a href="{{ url_for('admin.global_search') }}" class="nav-link">
+                            <i class="nav-icon fa-solid fa-search"></i>
+                            <p>Global Search</p>
+                        </a>
+                    </li>
+                    {% if current_user.role.name in ['Administrator', 'Operator'] or SETTING.get('allow_user_view_history') %}
+                        <li class="{{ 'nav-item active' if active_page == 'admin_history' else 'nav-item' }}">
+                            <a href="{{ url_for('admin.history') }}" class="nav-link">
+                                <i class="nav-icon fa-solid fa-timeline"></i>
+                                <p>Activity</p>
                             </a>
                         </li>
+                    {% endif %}
+                    {% if current_user.role.name in ['Administrator', 'Operator'] %}
                         <li class="{{ 'nav-item active' if active_page == 'server_statistics' else 'nav-item' }}">
                             <a href="{{ url_for('admin.server_statistics') }}" class="nav-link">
                                 <i class="nav-icon fa-solid fa-chart-simple"></i>
@@ -121,12 +129,6 @@
                                 <p>Server Configuration</p>
                             </a>
                         </li>
-                        <li class="{{ 'nav-item active' if active_page == 'admin_history' else 'nav-item' }}">
-                            <a href="{{ url_for('admin.history') }}" class="nav-link">
-                                <i class="nav-icon fa-solid fa-timeline"></i>
-                                <p>Activity</p>
-                            </a>
-                        </li>
                         <li class="{{ 'nav-item active' if active_page == 'admin_domain_template' else 'nav-item' }}">
                             <a href="{{ url_for('admin.templates') }}" class="nav-link">
                                 <i class="nav-icon fa-solid fa-clone"></i>
@@ -189,14 +191,6 @@
                                 {% endif %}
                             </ul>
                         </li>
-                    {% elif SETTING.get('allow_user_view_history') %}
-                        <li class="nav-header">Administration</li>
-                        <li class="{{ 'nav-item active' if active_page == 'admin_history' else 'nav-item' }}">
-                            <a href="{{ url_for('admin.history') }}" class="nav-link">
-                                <i class="nav-icon fa-solid fa-calendar-alt"></i>
-                                <p>History</p>
-                            </a>
-                        </li>
                     {% endif %}
                 </ul>
             {% endif %}