Update navigation: remove Account/Admin links from navbar, move to dropdown

- Removed 'Account' and 'Admin' links from top navigation bar
- Added 'Account' as first item in user dropdown for all users
- Renamed 'Menu Management' to 'Users' in admin dropdown
- Dropdown now shows Account first, then role-specific options
parent 302caedd
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<a href="/train">Train</a> <a href="/train">Train</a>
<a href="/history">History</a> <a href="/history">History</a>
<a href="/api_tokens">API Tokens</a> <a href="/api_tokens">API Tokens</a>
<a href="/account" class="active">Account</a> <a href="/settings">Settings</a>
{% if user.get('role') == 'admin' %} {% if user.get('role') == 'admin' %}
<a href="/admin">Admin</a> <a href="/admin">Admin</a>
{% endif %} {% endif %}
...@@ -83,11 +83,11 @@ ...@@ -83,11 +83,11 @@
<i class="fas fa-user"></i> <i class="fas fa-user"></i>
</div> </div>
<div id="userDropdown" class="user-dropdown"> <div id="userDropdown" class="user-dropdown">
{% if user.get('role') != 'admin' %}
<a href="/account">Account</a> <a href="/account">Account</a>
{% if user.get('role') != 'admin' %}
<a href="/api_tokens">Tokens</a> <a href="/api_tokens">Tokens</a>
{% else %} {% else %}
<a href="/admin">Menu Management</a> <a href="/admin">Users</a>
<a href="/config">Configurations</a> <a href="/config">Configurations</a>
{% endif %} {% endif %}
<a href="/logout">Logout</a> <a href="/logout">Logout</a>
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<a href="/train">Train</a> <a href="/train">Train</a>
<a href="/history">History</a> <a href="/history">History</a>
<a href="/api_tokens">API Tokens</a> <a href="/api_tokens">API Tokens</a>
<a href="/account">Account</a> <a href="/settings">Settings</a>
<a href="/admin" class="active">Admin</a> <a href="/admin" class="active">Admin</a>
</nav> </nav>
<div class="user-menu"> <div class="user-menu">
...@@ -72,11 +72,11 @@ ...@@ -72,11 +72,11 @@
<i class="fas fa-user"></i> <i class="fas fa-user"></i>
</div> </div>
<div id="userDropdown" class="user-dropdown"> <div id="userDropdown" class="user-dropdown">
{% if user.get('role') != 'admin' %}
<a href="/account">Account</a> <a href="/account">Account</a>
{% if user.get('role') != 'admin' %}
<a href="/api_tokens">Tokens</a> <a href="/api_tokens">Tokens</a>
{% else %} {% else %}
<a href="/admin">Menu Management</a> <a href="/admin">Users</a>
<a href="/config">Configurations</a> <a href="/config">Configurations</a>
{% endif %} {% endif %}
<a href="/logout">Logout</a> <a href="/logout">Logout</a>
......
...@@ -197,21 +197,18 @@ ...@@ -197,21 +197,18 @@
<a href="/train">Train</a> <a href="/train">Train</a>
<a href="/history">History</a> <a href="/history">History</a>
<a href="/api_tokens">API Tokens</a> <a href="/api_tokens">API Tokens</a>
<a href="/account">Account</a> <a href="/settings">Settings</a>
{% if user.get('role') == 'admin' %}
<a href="/admin">Admin</a>
{% endif %}
</nav> </nav>
<div class="user-menu"> <div class="user-menu">
<div class="user-icon" onclick="toggleUserMenu()"> <div class="user-icon" onclick="toggleUserMenu()">
<i class="fas fa-user"></i> <i class="fas fa-user"></i>
</div> </div>
<div id="userDropdown" class="user-dropdown"> <div id="userDropdown" class="user-dropdown">
{% if user.get('role') != 'admin' %}
<a href="/account">Account</a> <a href="/account">Account</a>
{% if user.get('role') != 'admin' %}
<a href="/api_tokens">Tokens</a> <a href="/api_tokens">Tokens</a>
{% else %} {% else %}
<a href="/admin">Menu Management</a> <a href="/admin">Users</a>
<a href="/config">Configurations</a> <a href="/config">Configurations</a>
{% endif %} {% endif %}
<a href="/logout">Logout</a> <a href="/logout">Logout</a>
......
...@@ -60,20 +60,18 @@ ...@@ -60,20 +60,18 @@
<a href="/train">Train</a> <a href="/train">Train</a>
<a href="/history">History</a> <a href="/history">History</a>
<a href="/api_tokens" class="active">API Tokens</a> <a href="/api_tokens" class="active">API Tokens</a>
{% if user.get('role') == 'admin' %} <a href="/settings">Settings</a>
<a href="/admin">Admin</a>
{% endif %}
</nav> </nav>
<div class="user-menu"> <div class="user-menu">
<div class="user-icon" onclick="toggleUserMenu()"> <div class="user-icon" onclick="toggleUserMenu()">
<i class="fas fa-user"></i> <i class="fas fa-user"></i>
</div> </div>
<div id="userDropdown" class="user-dropdown"> <div id="userDropdown" class="user-dropdown">
{% if user.get('role') != 'admin' %}
<a href="/account">Account</a> <a href="/account">Account</a>
{% if user.get('role') != 'admin' %}
<a href="/api_tokens">Tokens</a> <a href="/api_tokens">Tokens</a>
{% else %} {% else %}
<a href="/admin">Menu Management</a> <a href="/admin">Users</a>
<a href="/config">Configurations</a> <a href="/config">Configurations</a>
{% endif %} {% endif %}
<a href="/logout">Logout</a> <a href="/logout">Logout</a>
......
...@@ -50,22 +50,18 @@ ...@@ -50,22 +50,18 @@
<a href="/train">Train</a> <a href="/train">Train</a>
<a href="/history">History</a> <a href="/history">History</a>
<a href="/api_tokens">API Tokens</a> <a href="/api_tokens">API Tokens</a>
<a href="/account">Account</a>
<a href="/settings">Settings</a> <a href="/settings">Settings</a>
{% if user.get('role') == 'admin' %}
<a href="/admin">Admin</a>
{% endif %}
</nav> </nav>
<div class="user-menu"> <div class="user-menu">
<div class="user-icon" onclick="toggleUserMenu()"> <div class="user-icon" onclick="toggleUserMenu()">
<i class="fas fa-user"></i> <i class="fas fa-user"></i>
</div> </div>
<div id="userDropdown" class="user-dropdown"> <div id="userDropdown" class="user-dropdown">
{% if user.get('role') != 'admin' %}
<a href="/account">Account</a> <a href="/account">Account</a>
{% if user.get('role') != 'admin' %}
<a href="/api_tokens">Tokens</a> <a href="/api_tokens">Tokens</a>
{% else %} {% else %}
<a href="/admin">Menu Management</a> <a href="/admin">Users</a>
<a href="/config">Configurations</a> <a href="/config">Configurations</a>
{% endif %} {% endif %}
<a href="/logout">Logout</a> <a href="/logout">Logout</a>
......
...@@ -49,22 +49,18 @@ ...@@ -49,22 +49,18 @@
<a href="/train">Train</a> <a href="/train">Train</a>
<a href="/history" class="active">History</a> <a href="/history" class="active">History</a>
<a href="/api_tokens">API Tokens</a> <a href="/api_tokens">API Tokens</a>
<a href="/account">Account</a>
<a href="/settings">Settings</a> <a href="/settings">Settings</a>
{% if user.get('role') == 'admin' %}
<a href="/admin">Admin</a>
{% endif %}
</nav> </nav>
<div class="user-menu"> <div class="user-menu">
<div class="user-icon" onclick="toggleUserMenu()"> <div class="user-icon" onclick="toggleUserMenu()">
<i class="fas fa-user"></i> <i class="fas fa-user"></i>
</div> </div>
<div id="userDropdown" class="user-dropdown"> <div id="userDropdown" class="user-dropdown">
{% if user.get('role') != 'admin' %}
<a href="/account">Account</a> <a href="/account">Account</a>
{% if user.get('role') != 'admin' %}
<a href="/api_tokens">Tokens</a> <a href="/api_tokens">Tokens</a>
{% else %} {% else %}
<a href="/admin">Menu Management</a> <a href="/admin">Users</a>
<a href="/config">Configurations</a> <a href="/config">Configurations</a>
{% endif %} {% endif %}
<a href="/logout">Logout</a> <a href="/logout">Logout</a>
......
...@@ -47,22 +47,18 @@ ...@@ -47,22 +47,18 @@
<a href="/train">Train</a> <a href="/train">Train</a>
<a href="/history">History</a> <a href="/history">History</a>
<a href="/api_tokens">API Tokens</a> <a href="/api_tokens">API Tokens</a>
<a href="/account">Account</a>
<a href="/settings" class="active">Settings</a> <a href="/settings" class="active">Settings</a>
{% if user.get('role') == 'admin' %}
<a href="/admin">Admin</a>
{% endif %}
</nav> </nav>
<div class="user-menu"> <div class="user-menu">
<div class="user-icon" onclick="toggleUserMenu()"> <div class="user-icon" onclick="toggleUserMenu()">
<i class="fas fa-user"></i> <i class="fas fa-user"></i>
</div> </div>
<div id="userDropdown" class="user-dropdown"> <div id="userDropdown" class="user-dropdown">
{% if user.get('role') != 'admin' %}
<a href="/account">Account</a> <a href="/account">Account</a>
{% if user.get('role') != 'admin' %}
<a href="/api_tokens">Tokens</a> <a href="/api_tokens">Tokens</a>
{% else %} {% else %}
<a href="/admin">Menu Management</a> <a href="/admin">Users</a>
<a href="/config">Configurations</a> <a href="/config">Configurations</a>
{% endif %} {% endif %}
<a href="/logout">Logout</a> <a href="/logout">Logout</a>
......
...@@ -48,22 +48,18 @@ ...@@ -48,22 +48,18 @@
<a href="/train" class="active">Train</a> <a href="/train" class="active">Train</a>
<a href="/history">History</a> <a href="/history">History</a>
<a href="/api_tokens">API Tokens</a> <a href="/api_tokens">API Tokens</a>
<a href="/account">Account</a>
<a href="/settings">Settings</a> <a href="/settings">Settings</a>
{% if user.get('role') == 'admin' %}
<a href="/admin">Admin</a>
{% endif %}
</nav> </nav>
<div class="user-menu"> <div class="user-menu">
<div class="user-icon" onclick="toggleUserMenu()"> <div class="user-icon" onclick="toggleUserMenu()">
<i class="fas fa-user"></i> <i class="fas fa-user"></i>
</div> </div>
<div id="userDropdown" class="user-dropdown"> <div id="userDropdown" class="user-dropdown">
{% if user.get('role') != 'admin' %}
<a href="/account">Account</a> <a href="/account">Account</a>
{% if user.get('role') != 'admin' %}
<a href="/api_tokens">Tokens</a> <a href="/api_tokens">Tokens</a>
{% else %} {% else %}
<a href="/admin">Menu Management</a> <a href="/admin">Users</a>
<a href="/config">Configurations</a> <a href="/config">Configurations</a>
{% endif %} {% endif %}
<a href="/logout">Logout</a> <a href="/logout">Logout</a>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment