Move admin-only navbar links into Admin dropdown and revert forced collapse

This commit is contained in:
Ivo Oskamp 2026-02-23 14:57:35 +01:00
parent 2cd704182c
commit abd98f5bc6
2 changed files with 18 additions and 90 deletions

View File

@ -87,64 +87,3 @@ main.dashboard-container {
margin-left: 0; margin-left: 0;
color: rgba(0, 0, 0, 0.7); color: rgba(0, 0, 0, 0.7);
} }
/* Navbar responsive behavior for split-screen/half-width desktop layouts */
@media (max-width: 2200px) {
/* Force collapsed navbar mode for split-screen desktop usage */
.navbar.navbar-force-collapse .navbar-toggler {
display: block !important;
}
.navbar.navbar-force-collapse .navbar-collapse {
display: none !important;
width: 100%;
flex-basis: 100%;
}
.navbar.navbar-force-collapse .navbar-collapse.show {
display: block !important;
}
.navbar.navbar-force-collapse .navbar-nav {
flex-direction: column !important;
}
}
@media (max-width: 1399.98px) {
.navbar .navbar-collapse {
align-items: stretch;
}
.navbar .navbar-search {
width: 100%;
margin-right: 0 !important;
}
.navbar .navbar-search .form-control {
width: 100%;
min-width: 0 !important;
}
.navbar .navbar-userinfo {
display: block;
margin-right: 0 !important;
margin-bottom: 0.5rem;
}
.navbar .navbar-role-form,
.navbar .navbar-theme-form {
width: 100%;
margin-right: 0 !important;
margin-bottom: 0.5rem;
}
.navbar .navbar-role-form .form-select,
.navbar .navbar-theme-form .form-select {
width: 100% !important;
min-width: 0 !important;
}
.navbar .navbar-logout-btn {
width: 100%;
}
}

View File

@ -59,7 +59,7 @@
</div> </div>
{% endif %} {% endif %}
<nav class="navbar navbar-expand-xxl navbar-force-collapse fixed-top bg-body-tertiary border-bottom"> <nav class="navbar navbar-expand-lg fixed-top bg-body-tertiary border-bottom">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="{{ url_for('main.dashboard') }}">Backupchecks</a> <a class="navbar-brand" href="{{ url_for('main.dashboard') }}">Backupchecks</a>
<button <button
@ -100,27 +100,12 @@
<a class="nav-link" href="{{ url_for('main.cove_accounts') }}">Cove Accounts</a> <a class="nav-link" href="{{ url_for('main.cove_accounts') }}">Cove Accounts</a>
</li> </li>
{% endif %} {% endif %}
{% if active_role == 'admin' %}
<li class="nav-item">
<a class="nav-link" href="{{ url_for('main.admin_all_mails') }}">All Mail</a>
</li>
{% endif %}
{% if active_role == 'admin' %}
<li class="nav-item">
<a class="nav-link" href="{{ url_for('main.inbox_deleted_mails') }}">Deleted mails</a>
</li>
{% endif %}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{ url_for('main.customers') }}">Customers</a> <a class="nav-link" href="{{ url_for('main.customers') }}">Customers</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{ url_for('main.jobs') }}">Jobs</a> <a class="nav-link" href="{{ url_for('main.jobs') }}">Jobs</a>
</li> </li>
{% if active_role == 'admin' %}
<li class="nav-item">
<a class="nav-link" href="{{ url_for('main.archived_jobs') }}">Archived Jobs</a>
</li>
{% endif %}
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{ url_for('main.daily_jobs') }}">Daily Jobs</a> <a class="nav-link" href="{{ url_for('main.daily_jobs') }}">Daily Jobs</a>
</li> </li>
@ -139,14 +124,18 @@
<a class="nav-link" href="{{ url_for('main.reports') }}">Reports</a> <a class="nav-link" href="{{ url_for('main.reports') }}">Reports</a>
</li> </li>
{% if active_role == 'admin' %} {% if active_role == 'admin' %}
<li class="nav-item"> <li class="nav-item dropdown">
<a class="nav-link" href="{{ url_for('main.settings') }}">Settings</a> <a class="nav-link dropdown-toggle" href="#" id="adminMenu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
</li> Admin
<li class="nav-item"> </a>
<a class="nav-link" href="{{ url_for('main.logging_page') }}">Logging</a> <ul class="dropdown-menu" aria-labelledby="adminMenu">
</li> <li><a class="dropdown-item" href="{{ url_for('main.admin_all_mails') }}">All Mail</a></li>
<li class="nav-item"> <li><a class="dropdown-item" href="{{ url_for('main.inbox_deleted_mails') }}">Deleted mails</a></li>
<a class="nav-link" href="{{ url_for('main.parsers_overview') }}">Parsers</a> <li><a class="dropdown-item" href="{{ url_for('main.archived_jobs') }}">Archived Jobs</a></li>
<li><a class="dropdown-item" href="{{ url_for('main.settings') }}">Settings</a></li>
<li><a class="dropdown-item" href="{{ url_for('main.logging_page') }}">Logging</a></li>
<li><a class="dropdown-item" href="{{ url_for('main.parsers_overview') }}">Parsers</a></li>
</ul>
</li> </li>
{% endif %} {% endif %}
<li class="nav-item"> <li class="nav-item">
@ -162,7 +151,7 @@
</li> </li>
{% endif %} {% endif %}
</ul> </ul>
<form method="get" action="{{ url_for('main.search_page') }}" class="navbar-search d-flex me-3 mb-2 mb-xxl-0" role="search" autocomplete="off"> <form method="get" action="{{ url_for('main.search_page') }}" class="d-flex me-3 mb-2 mb-lg-0" role="search" autocomplete="off">
<input <input
class="form-control form-control-sm me-2" class="form-control form-control-sm me-2"
type="search" type="search"
@ -174,14 +163,14 @@
/> />
<button class="btn btn-outline-secondary btn-sm" type="submit">Search</button> <button class="btn btn-outline-secondary btn-sm" type="submit">Search</button>
</form> </form>
<span class="navbar-text me-3 navbar-userinfo"> <span class="navbar-text me-3">
<a class="text-decoration-none" href="{{ url_for('main.user_settings') }}"> <a class="text-decoration-none" href="{{ url_for('main.user_settings') }}">
{{ current_user.username }} ({{ active_role }}) {{ current_user.username }} ({{ active_role }})
</a> </a>
</span> </span>
{% if current_user.is_authenticated and user_roles|length > 1 %} {% if current_user.is_authenticated and user_roles|length > 1 %}
<form method="post" action="{{ url_for('main.set_active_role_route') }}" class="me-2 navbar-role-form"> <form method="post" action="{{ url_for('main.set_active_role_route') }}" class="me-2">
<select <select
class="form-select form-select-sm" class="form-select form-select-sm"
name="active_role" name="active_role"
@ -195,7 +184,7 @@
</select> </select>
</form> </form>
{% endif %} {% endif %}
<form method="post" action="{{ url_for('main.set_theme_preference') }}" class="me-2 navbar-theme-form"> <form method="post" action="{{ url_for('main.set_theme_preference') }}" class="me-2">
<select <select
class="form-select form-select-sm" class="form-select form-select-sm"
name="theme" name="theme"
@ -208,7 +197,7 @@
<option value="auto" {% if _theme_pref == 'auto' %}selected{% endif %}>Auto</option> <option value="auto" {% if _theme_pref == 'auto' %}selected{% endif %}>Auto</option>
</select> </select>
</form> </form>
<a class="btn btn-outline-secondary navbar-logout-btn" href="{{ url_for('auth.logout') }}">Logout</a> <a class="btn btn-outline-secondary" href="{{ url_for('auth.logout') }}">Logout</a>
{% endif %} {% endif %}
</div> </div>
</div> </div>