From 71f8aa6862fc71416ff0582cf7b25e8c72001585 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <jean-marie.favreau@logiroad-center.com>
Date: Sun, 6 Apr 2025 13:58:47 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20du=20rendu=20des=20pictos?=
 =?UTF-8?q?=20de=20cat=C3=A9gories?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #391
---
 src/agenda_culturel/static/style.scss         | 15 ++++++++
 .../templates/agenda_culturel/page-month.html |  2 +-
 .../agenda_culturel/page-upcoming.html        |  2 +-
 .../templates/agenda_culturel/page-week.html  |  2 +-
 src/agenda_culturel/templatetags/cat_extra.py | 34 +++++++++++++++++++
 5 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss
index 6f2a168..e6786e7 100644
--- a/src/agenda_culturel/static/style.scss
+++ b/src/agenda_culturel/static/style.scss
@@ -71,6 +71,21 @@ body>footer {
     font-size: 80%;
 }
 
+.cat.picto {
+    height: 1.6em;
+    width: 1.6em;
+    padding: 0 0.2em;
+    border-radius: .8em;
+    img {
+        margin-top: 0.1em;
+    }
+}
+.cat img {
+    @media only screen and (prefers-color-scheme: light) {
+        filter: invert(1);
+    }
+}
+
 .cat[data-tooltip]:not(a, button, input),
 .recurrent span[data-tooltip] {
     border: 0;
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-month.html b/src/agenda_culturel/templates/agenda_culturel/page-month.html
index 7e3feea..ba2ac97 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-month.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-month.html
@@ -155,7 +155,7 @@
                     <ul>
                       {% for category_group, events in day.events_by_category_ordered %}
                         <li>
-                          {{ events.0.category | circle_cat }}
+                          {{ events.0.category | circle_cat_picto }}
                           <a href="{{ day.date | url_day:category }}?{{ filter.get_url|add_url_category:events.0.category }}"
                              data-target="{{ daytag }}-category-{{ events.0.category.pk }}"
                              onClick="toggleModal(event)">{{ events | length }} {{ category_group }}</a>
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html b/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html
index 07363ed..5fdda66 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html
@@ -191,7 +191,7 @@
                     </li>
                   {% endif %}
                   <li>
-                    {{ event.category | circle_cat:event.has_recurrences }}
+                    {{ event.category | circle_cat_picto:event.has_recurrences }}
                     {% if event.start_time %}{{ event.start_time }}{% endif %}
                     {{ event|picto_status }} <a href="#event-{{ event.id }}">{{ event.title|no_emoji }}</a> {{ event|tw_badge }}
                   </li>
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html
index d9f519d..8591698 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-week.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html
@@ -144,7 +144,7 @@
                             </li>
                           {% endif %}
                           <li>
-                            {{ event.category | circle_cat:event.has_recurrences }}
+                            {{ event.category | circle_cat_picto:event.has_recurrences }}
                             {% if event.start_day == day.date and event.start_time %}{{ event.start_time }}{% endif %}
                             {{ event|picto_status }} <a href="{{ event.get_absolute_url }}"
     data-target="event-{{ event.id }}"
diff --git a/src/agenda_culturel/templatetags/cat_extra.py b/src/agenda_culturel/templatetags/cat_extra.py
index 210909e..471e8fa 100644
--- a/src/agenda_culturel/templatetags/cat_extra.py
+++ b/src/agenda_culturel/templatetags/cat_extra.py
@@ -219,6 +219,40 @@ def circle_cat(category, recurrence=False):
         )
 
 
+@register.filter
+def circle_cat_picto(category, recurrence=False):
+    if category is None:
+        category = Category.get_default_category()
+    c = category.css_class()
+    n = category.name
+
+    picto = (
+        '<span class="cat '
+        + c
+        + ' circ-cat picto" data-tooltip="'
+        + n
+        + '">'
+        + '<img src="'
+        + (
+            category.pictogram.url + '" alt="' + category.name + '" />'
+            if category.pictogram
+            else ""
+        )
+        + "</span>"
+    )
+    if recurrence:
+        return mark_safe(
+            picto
+            + '<span class="cat recurrent '
+            + c
+            + ' circ-cat">'
+            + picto_from_name("repeat", n + " [récurrent]")
+            + "</span>"
+        )
+    else:
+        return mark_safe(picto)
+
+
 def legend_cat(category, url, selected=True, first=False, with_title=False):
     c = category.css_class()
     n = category.name