From 85d7c6487516366c377358f494a7421266ca32f1 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <jean-marie.favreau@logiroad-center.com>
Date: Tue, 18 Mar 2025 22:56:27 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20de=20la=20navigation=20par?=
 =?UTF-8?q?=20tags:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fix #375: liens cliquables sur les modaux
- quand on est sur une page tag, les liens "quand" renvoient à l'agenda filtré par le tag de la pag
---
 .../templates/agenda_culturel/page-week.html  |  6 +++++-
 .../templates/agenda_culturel/tag.html        |  4 ++++
 .../templatetags/utils_extra.py               | 20 +++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html
index 56ab0c0..7856b51 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-week.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html
@@ -191,7 +191,11 @@
                                 </header>
                                 <div class="body-fixed">{{ event.description |linebreaks }}</div>
                                 <p>
-                                  {% for tag in event.sorted_tags %}{{ tag | tag_button }}{% endfor %}
+                                  {% for tag in event.sorted_tags %}
+                                    <a href="{% url 'view_tag' tag|prepare_tag %}"
+                                       role="button"
+                                       class="small-cat">{{ tag|tw_highlight }}</a>
+                                  {% endfor %}
                                 </p>
                                 <footer class="infos-and-buttons">
                                   <div class="buttons">
diff --git a/src/agenda_culturel/templates/agenda_culturel/tag.html b/src/agenda_culturel/templates/agenda_culturel/tag.html
index c1393f1..cafef3b 100644
--- a/src/agenda_culturel/templates/agenda_culturel/tag.html
+++ b/src/agenda_culturel/templates/agenda_culturel/tag.html
@@ -9,6 +9,10 @@
 {% block entete_header %}
   {% css_categories %}
 {% endblock %}
+{% block when_parameters %}tags={{ tag|prepare_tag }}{% endblock %}
+{% block navigation-menu %}
+  {% navigation_links_tag tag %}
+{% endblock %}
 {% block body-class %}tag{% endblock %}
 {% block content %}
   <article>
diff --git a/src/agenda_culturel/templatetags/utils_extra.py b/src/agenda_culturel/templatetags/utils_extra.py
index cc88261..fda6275 100644
--- a/src/agenda_culturel/templatetags/utils_extra.py
+++ b/src/agenda_culturel/templatetags/utils_extra.py
@@ -188,6 +188,26 @@ def no_emoji(text):
     return emoji.replace_emoji(text, replace="")
 
 
+@register.simple_tag
+def navigation_links_tag(tag):
+    from .tag_extra import prepare_tag
+
+    result = ""
+
+    extra = "?tags=" + prepare_tag(tag)
+    for t in [
+        ("aujourdhui", "aujourd'hui"),
+        ("a_venir", "ces jours-ci"),
+        ("cette_semaine", "cette semaine"),
+        ("ce_mois_ci", "ce mois-ci"),
+    ]:
+        result += (
+            '<li><a href="' + reverse_lazy(t[0]) + extra + '">' + t[1] + "</a></li>"
+        )
+
+    return mark_safe(result)
+
+
 @register.simple_tag
 def navigation_links(filter, category, calendar, current_view):
     extra = "?" + filter.get_url()