From a7b8fb7b0b26c250c97a0b54d529f1b08bafdc24 Mon Sep 17 00:00:00 2001
From: pfleu <fleutotp@gmail.com>
Date: Mon, 29 May 2023 17:36:21 +0200
Subject: [PATCH] Change cookie lifetime. Fix CSS navbar
---
config/packages/framework.yaml | 2 ++
public/assets/css/app.css | 5 +++++
templates/label/show.html.twig | 2 +-
templates/nav.html.twig | 41 +++++++++++++++++++++-------------
4 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml
index 7853e9e..c77b508 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 d4507e8..3a5582f 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 46d6ac4..55503bc 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 b8cefd8..0ec8f0b 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 %}
--
GitLab