From f2509e9547e9a0d6bcffb7b49afb179aefc9f0e0 Mon Sep 17 00:00:00 2001
From: pfleu <pierre.fleutot@audemarspiguet.com>
Date: Fri, 16 Feb 2024 15:26:23 +0100
Subject: [PATCH] =?UTF-8?q?Fix=20navbar=20si=20pas=20connect=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
templates/nav.html.twig | 118 +++++++++++++++++++---------------------
1 file changed, 57 insertions(+), 61 deletions(-)
diff --git a/templates/nav.html.twig b/templates/nav.html.twig
index fcc1f46..f298598 100644
--- a/templates/nav.html.twig
+++ b/templates/nav.html.twig
@@ -5,81 +5,77 @@
<span class="navbar-toggler-icon"></span>
</button>
- {% if not is_granted('ROLE_SUPER_ADMIN') %}
+ {% if app.user and not is_granted('ROLE_SUPER_ADMIN') %}
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<a title="{{ "Accueil"|trans }}" class="navbar-brand" href="{{ path('app_login') }}">
<div class="show-nav-margin-top d-inline-block"><i class="fa fa-home"></i> BALEX</div>
</a>
- {% if app.user %}
-
- <form id="searchHeadwordsForm" class="d-flex show-nav-margin-top" role="search" action="{{ path('app_headword_search') }}">
- <input name="searchHeadwordBox" class="form-control me-2" type="search" placeholder="{{ "Rechercher"|trans }}" aria-label="Search">
- <button id="searchHeadwordButton" class="btn btn-light me-3"><i class="fa fa-nav fa-search"></i></button>
- </form>
+ <form id="searchHeadwordsForm" class="d-flex show-nav-margin-top" role="search" action="{{ path('app_headword_search') }}">
+ <input name="searchHeadwordBox" class="form-control me-2" type="search" placeholder="{{ "Rechercher"|trans }}" aria-label="Search">
+ <button id="searchHeadwordButton" class="btn btn-light me-3"><i class="fa fa-nav fa-search"></i></button>
+ </form>
- <ul class="navbar-nav me-auto mb-2 mb-lg-0">
- <li class="nav-item">
- <a class="nav-link {{ 'app_label' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_label_index') }}">
- <i class="bi bi-nav bi-tags"></i> {{ "Labels"|trans }}</a>
- </li>
+ <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+ <li class="nav-item">
+ <a class="nav-link {{ 'app_label' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_label_index') }}">
+ <i class="bi bi-nav bi-tags"></i> {{ "Labels"|trans }}</a>
+ </li>
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle {{ 'app_lexicon' in app.request.attributes.get('_route') ? 'active' }}" data-bs-toggle="dropdown" href="#">
+ <img src="{{ asset('assets/images/Icon/notebook-white.png') }}" class="icon-nav"> {{ "Lexiques"|trans }}</a>
+ <ul class="dropdown-menu">
+ {% for lexicon in lexicon_manager.myLexicons(app.user) %}
+ <li><a class="dropdown-item {{ lexicon.user ? 'fw-bold' }}" href="{{ path('app_lexicon_show', {id: lexicon.id}) }}">{{ lexicon }}</a></li>
+ {% endfor %}
+ <li><a class="dropdown-item" href="{{ path('app_group_new') }}"><i class="fa fa-plus-circle"></i> {{ "Créer un lexique de groupe"|trans }}</a></li>
+ </ul>
+ </li>
+{# <li class="nav-item">#}
+{# <a class="nav-link {{ 'app_group' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_group_index') }}">#}
+{# <i class="fa fa-nav fa-users"></i> {{ "Groupes"|trans }}</a>#}
+{# </li>#}
+{# <li class="nav-item">
+ <a class="nav-link {{ 'app_friend' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_friend_index') }}">
+ <i class="bi bi-nav bi-person-heart"></i> {{ "Amis"|trans }}</a>
+ </li>#}
+ <li class="nav-item">
+ <a class="nav-link {{ 'app_dashboard' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_dashboard_index') }}">
+ <img src="{{ asset('assets/images/Icon/dashboard-white.png') }}" class="icon-nav"> {{ "Tableau de bord"|trans }}</a>
+ </li>
+
+
+ {% if is_granted('ROLE_ADMIN') %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle {{ 'app_lexicon' in app.request.attributes.get('_route') ? 'active' }}" data-bs-toggle="dropdown" href="#">
- <img src="{{ asset('assets/images/Icon/notebook-white.png') }}" class="icon-nav"> {{ "Lexiques"|trans }}</a>
+ <i class="fa fa-nav fa-cog"></i></a>
<ul class="dropdown-menu">
- {% for lexicon in lexicon_manager.myLexicons(app.user) %}
- <li><a class="dropdown-item {{ lexicon.user ? 'fw-bold' }}" href="{{ path('app_lexicon_show', {id: lexicon.id}) }}">{{ lexicon }}</a></li>
- {% endfor %}
- <li><a class="dropdown-item" href="{{ path('app_group_new') }}"><i class="fa fa-plus-circle"></i> {{ "Créer un lexique de groupe"|trans }}</a></li>
- </ul>
- </li>
- {# <li class="nav-item">#}
- {# <a class="nav-link {{ 'app_group' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_group_index') }}">#}
- {# <i class="fa fa-nav fa-users"></i> {{ "Groupes"|trans }}</a>#}
- {# </li>#}
- {# <li class="nav-item">
- <a class="nav-link {{ 'app_friend' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_friend_index') }}">
- <i class="bi bi-nav bi-person-heart"></i> {{ "Amis"|trans }}</a>
- </li>#}
- <li class="nav-item">
- <a class="nav-link {{ 'app_dashboard' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_dashboard_index') }}">
- <img src="{{ asset('assets/images/Icon/dashboard-white.png') }}" class="icon-nav"> {{ "Tableau de bord"|trans }}</a>
- </li>
-
-
- {% if is_granted('ROLE_ADMIN') %}
- <li class="nav-item dropdown">
- <a class="nav-link dropdown-toggle {{ 'app_lexicon' in app.request.attributes.get('_route') ? 'active' }}" data-bs-toggle="dropdown" href="#">
- <i class="fa fa-nav fa-cog"></i></a>
- <ul class="dropdown-menu">
+ <li>
+ <a class="dropdown-item" href="{{ path('app_user_index') }}">
+ <i class="bi bi-nav bi-person"></i> {{ "Utilisateurs"|trans }}</a>
+ </li>
+ {# <li>#}
+ {# <a class="dropdown-item" href="{{ path('app_lexicon_index') }}"><i class="bi bi-nav bi-card-list"></i> Lexiques</a>#}
+ {# </li>#}
+ <li>
+ <a class="dropdown-item" href="{{ path('app_client_index') }}">
+ <i class="bi bi-nav bi-window"></i> {{ "Applis clientes"|trans }}</a>
+ </li>
+ <li>
+ <a class="dropdown-item" href="{{ path('app.swagger_ui') }}"><i class="bi bi-nav bi-terminal"></i> Swagger</a>
+ </li>
+ {% if app.environment|upper == 'DEV' %}
<li>
- <a class="dropdown-item" href="{{ path('app_user_index') }}">
- <i class="bi bi-nav bi-person"></i> {{ "Utilisateurs"|trans }}</a>
+ <a class="dropdown-item" href="{{ path('app_wiktionnary_search') }}"><i class="bi bi-nav bi-book"></i> {{ "Wiktionnaire"|trans }}</a>
</li>
- {# <li>#}
- {# <a class="dropdown-item" href="{{ path('app_lexicon_index') }}"><i class="bi bi-nav bi-card-list"></i> Lexiques</a>#}
- {# </li>#}
- <li>
- <a class="dropdown-item" href="{{ path('app_client_index') }}">
- <i class="bi bi-nav bi-window"></i> {{ "Applis clientes"|trans }}</a>
- </li>
- <li>
- <a class="dropdown-item" href="{{ path('app.swagger_ui') }}"><i class="bi bi-nav bi-terminal"></i> Swagger</a>
- </li>
- {% if app.environment|upper == 'DEV' %}
- <li>
- <a class="dropdown-item" href="{{ path('app_wiktionnary_search') }}"><i class="bi bi-nav bi-book"></i> {{ "Wiktionnaire"|trans }}</a>
- </li>
- {% endif %}
- </ul>
- </li>
- {% endif %}
-
- </ul>
+ {% endif %}
+ </ul>
+ </li>
+ {% endif %}
- {% endif %}
+ </ul>
</div>
--
GitLab