From bb8d26d04ef90c71d539398593cbb568fba6bffe Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Sun, 17 Dec 2023 16:33:15 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20de=20l'affichage=20-=20simp?=
 =?UTF-8?q?lification=20de=20certains=20titres=20-=20affichage=20de=20la?=
 =?UTF-8?q?=20date=20de=20l'=C3=A9v=C3=A9nement=20si=20n=C3=A9cessaire=20-?=
 =?UTF-8?q?=20ajout=20d'icones=20sur=20les=20boutons.=20Fix=20#52?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/static/style.scss                        | 5 +----
 .../templates/agenda_culturel/edit-buttons-inc.html          | 2 +-
 src/agenda_culturel/templates/agenda_culturel/page-day.html  | 4 ++--
 .../templates/agenda_culturel/page-month.html                | 2 +-
 src/agenda_culturel/templates/agenda_culturel/page-week.html | 2 +-
 .../single-event/event-in-list-by-day-inc.html               | 2 +-
 .../agenda_culturel/single-event/event-in-list-inc.html      | 2 +-
 src/agenda_culturel/templatetags/event_extra.py              | 2 +-
 8 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss
index 5020e0a..18cb31a 100644
--- a/src/agenda_culturel/static/style.scss
+++ b/src/agenda_culturel/static/style.scss
@@ -115,7 +115,7 @@ span.small-cat {
 }
 
 svg {
-    vertical-align: middle;
+    vertical-align: -0.125em;
 }
 
 .ephemeris {
@@ -601,9 +601,6 @@ nav .badge {
     font-size: 70%;
     padding: 0.2em .8em;
     border-radius: .5em;
-    svg {
-        vertical-align: -0.125em;
-    }
 }
 
 form [role="button"] {
diff --git a/src/agenda_culturel/templates/agenda_culturel/edit-buttons-inc.html b/src/agenda_culturel/templates/agenda_culturel/edit-buttons-inc.html
index cb7030a..981c132 100644
--- a/src/agenda_culturel/templates/agenda_culturel/edit-buttons-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/edit-buttons-inc.html
@@ -1,6 +1,6 @@
 
 {% load utils_extra %}
-<a href="{% url 'edit_event' event.id %}" role="button">modifier</a>
+<a href="{% url 'edit_event' event.id %}" role="button">modifier {% picto_from_name "edit" %}</a>
 
 {% if event.status != "published" %}
 <a href="{% url 'change_status_event' event.id 'published' %}" role="button">publier {% picto_from_name "eye" %}</a>
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-day.html b/src/agenda_culturel/templates/agenda_culturel/page-day.html
index 0f24715..c5a5981 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-day.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-day.html
@@ -16,14 +16,14 @@
 {% endblock %}
 
 {% block title %}
-Événements du {{ day | date:"l j F" }}
+{{ day | date:"l j F Y" }}
 {% endblock %}
 
 
  {% block content %}
 
 
- <h1>Les événements du {{ day | date:"l j F" }}</h1>
+ <h1>{{ day | date:"l j F Y" }}</h1>
  
  {% include "agenda_culturel/filter-inc.html" with filter=filter %}
 
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-month.html b/src/agenda_culturel/templates/agenda_culturel/page-month.html
index e4e2439..d815c50 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-month.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-month.html
@@ -17,7 +17,7 @@
 {% endblock %}
 
 {% block title %}
-Événements {{ calendar.firstdate | date:"F o"|add_de }}
+{{ calendar.firstdate | date:"F o" }}
 {% endblock %}
 
  {% block content %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html
index b4b8bc5..fec82bf 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-week.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html
@@ -17,7 +17,7 @@
 {% endblock %}
 
 {% block title %}
-Événements de la semaine {{ week }} - {{ year }}
+Semaine du {{ calendar.calendar_days_list.0.date }}
 {% endblock %}
 
  {% block content %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html
index c755ae5..a0c6492 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html
@@ -27,7 +27,7 @@
     </hgroup>
     {% endif %}
     
-    {% if event|need_complete_display:true %}<p>
+    {% if event|need_complete_display:True %}<p>
             {% picto_from_name "calendar" %}
     
             <em>{% if event.end_day %}Cet événement dure du {% else %}Cet événement a lieu le{% endif %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-inc.html
index f7aa74c..f7508ec 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-inc.html
@@ -21,7 +21,7 @@
     </h3>
     </hgroup>
     {% endif %}
-        {% if event|need_complete_display:false %}<p>
+        {% if event|need_complete_display:False %}<p>
             {% picto_from_name "calendar" %}
     
             <em>{% if event.end_day %}Cet événement dure du {% else %}Cet événement a lieu le{% endif %}
diff --git a/src/agenda_culturel/templatetags/event_extra.py b/src/agenda_culturel/templatetags/event_extra.py
index 28c3b9c..84df545 100644
--- a/src/agenda_culturel/templatetags/event_extra.py
+++ b/src/agenda_culturel/templatetags/event_extra.py
@@ -21,7 +21,7 @@ def can_show_start_time(event):
 
 
 @register.filter
-def need_complete_display(event, display_full):
+def need_complete_display(event, display_full=True):
     return event.end_day and event.end_day != event.start_day and (event.start_time or event.end_time or display_full)