diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml index 7853e9ed52b8997cf8ea4c7252c6476a7eb41794..c77b508da101fd8921660abd48c3b80eb0c91307 100644 --- a/config/packages/framework.yaml +++ b/config/packages/framework.yaml @@ -10,8 +10,10 @@ framework: handler_id: null cookie_secure: auto cookie_samesite: lax + cookie_lifetime: 8640000 storage_factory_id: session.storage.factory.native + #esi: true #fragments: true php_errors: diff --git a/public/assets/css/app.css b/public/assets/css/app.css index d4507e8b31d8e72d6cf51a95394443a6ffe9be18..3a5582f8b19cd85a7643683ef9addf9be6ca0078 100644 --- a/public/assets/css/app.css +++ b/public/assets/css/app.css @@ -297,4 +297,9 @@ td:hover .fa.text-light-green, p:hover .fa.text-light-green, h4:hover .fa.text-l border: 2px solid black; font-size: 0.8rem; padding: 20px; +} + +#history { + max-height: 300px; + overflow-y: auto; } \ No newline at end of file diff --git a/templates/label/show.html.twig b/templates/label/show.html.twig index 46d6ac45cac0a02a5a12a99ae72edb391635333a..55503bc7f609afff62cdb7cd795d64266caddd92 100644 --- a/templates/label/show.html.twig +++ b/templates/label/show.html.twig @@ -26,7 +26,7 @@ </div> <div class="d-flex justify-content-start align-items-center mt-3"> - <h4>{{ label.description|nl2br|raw ? : 'Add a description'|trans }}</h4> + <h4 class="fst-italic">{{ label.description|nl2br|raw ? : 'Ajouter une description'|trans }}</h4> <a title="{{ 'Modifier la description'|trans }}" href="#" data-url="{{ path('app_label_edit_description', {id: label.id}) }}" class="modal-form ms-3 btn btn-dark btn-sm"><i class="fa fa-pencil"></i></a> </div> diff --git a/templates/nav.html.twig b/templates/nav.html.twig index b8cefd8f3b3b9c648cbe88c3f90123e58f41ffac..0ec8f0bf55652909173754474c720531f3a5e60a 100644 --- a/templates/nav.html.twig +++ b/templates/nav.html.twig @@ -41,22 +41,31 @@ </li> {% if is_granted('ROLE_ADMIN') %} - <li class="nav-item"> - <a class="nav-link {{ 'app_user' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_user_index') }}"> - <i class="bi bi-person"></i> {{ "Utilisateurs"|trans }}</a> - </li> -{# <li class="nav-item">#} -{# <a class="nav-link {{ 'app_lexicon' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_lexicon_index') }}"><i class="bi bi-card-list"></i> Lexiques</a>#} -{# </li>#} - <li class="nav-item"> - <a class="nav-link {{ 'app_client' in app.request.attributes.get('_route') ? 'active' }}" href="{{ path('app_client_index') }}"> - <i class="bi bi-window"></i> {{ "Applis clientes"|trans }}</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{ path('app.swagger_ui') }}"><i class="bi bi-terminal"></i> Swagger</a> - </li> - <li class="nav-item"> - <a class="nav-link" href="{{ path('app_wiktionnary_search') }}"><i class="bi bi-book"></i> {{ "Wiktionnaire"|trans }}</a> + <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-cog"></i></a> + <ul class="dropdown-menu"> + + <li> + <a class="dropdown-item" href="{{ path('app_user_index') }}"> + <i class="bi bi-person"></i> {{ "Utilisateurs"|trans }}</a> + </li> + {# <li>#} + {# <a class="dropdown-item" href="{{ path('app_lexicon_index') }}"><i class="bi bi-card-list"></i> Lexiques</a>#} + {# </li>#} + <li> + <a class="dropdown-item" href="{{ path('app_client_index') }}"> + <i class="bi bi-window"></i> {{ "Applis clientes"|trans }}</a> + </li> + <li> + <a class="dropdown-item" href="{{ path('app.swagger_ui') }}"><i class="bi 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-book"></i> {{ "Wiktionnaire"|trans }}</a> + </li> + {% endif %} + </ul> </li> {% endif %}