From 70d65bfcc1a7e075db4e845a3a99678000485017 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Wed, 3 Jan 2024 11:49:39 +0100
Subject: [PATCH] =?UTF-8?q?On=20ajoute=20des=20liens=20qui=20focalisent=20?=
 =?UTF-8?q?sur=20la=20partie=20du=20calendrier=20qui=20nous=20int=C3=A9res?=
 =?UTF-8?q?se=20le=20plus:=20aujourd'hui,=20ou=20la=20semaine=20d'o=C3=B9?=
 =?UTF-8?q?=20l'on=20vient?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #63
---
 .../templates/agenda_culturel/page-month.html             | 8 ++++----
 .../templates/agenda_culturel/page-week.html              | 8 ++++----
 src/agenda_culturel/templates/agenda_culturel/page.html   | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/agenda_culturel/templates/agenda_culturel/page-month.html b/src/agenda_culturel/templates/agenda_culturel/page-month.html
index 490c33c..6f3396b 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-month.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-month.html
@@ -31,11 +31,11 @@
         <div class="title"><h1>{{ calendar.firstdate | date:"F o" }}</h1></div>
         <div class="navigation">
             <div>
-            <a role="button" href="{% url 'month_view' calendar.previous_month.year calendar.previous_month.month %}?{{ filter.get_url }}">
+            <a role="button" href="{% url 'month_view' calendar.previous_month.year calendar.previous_month.month %}?{{ filter.get_url }}#today">
                 {% picto_from_name "chevron-left" %} précédent</a>
             </div>
             <div class="right">
-                <a role="button" href="{% url 'month_view' calendar.next_month.year calendar.next_month.month %}?{{ filter.get_url }}">suivant 
+                <a role="button" href="{% url 'month_view' calendar.next_month.year calendar.next_month.month %}?{{ filter.get_url }}#today">suivant 
                 {% picto_from_name "chevron-right" %}
             </a>
             </div>
@@ -46,7 +46,7 @@
         {% for d in calendar.calendar_days_list %}
         {% if forloop.counter0|divisibleby:7 %}
             {% if not forloop.first %}</div><div class="grid week-in-month">{% endif %}
-                <div class="entete-semaine"><h2><a href="{% url 'week_view' calendar.year d.week %}?{{ filter.get_url }}">Semaine {{ d.week }}</a></h2></div>
+                <div id="week-{{ d.date.isocalendar.1 }}" class="entete-semaine"><h2><a href="{% url 'week_view' calendar.year d.week %}?{{ filter.get_url }}#today">Semaine {{ d.week }}</a></h2></div>
         {% endif %}
         {% include "agenda_culturel/day-inc.html" with day=d resume=1 fixed_style=calendar.all_in_past filter=filter headers="h3" %}
         {% endfor %}
@@ -60,7 +60,7 @@
     <footer>
         {% if calendar.today_in_calendar %}
         <a role="button" href="{% url 'aujourdhui' %}?{{ filter.get_url }}">Aujourd'hui</a>
-        <a role="button" href="{% url 'cette_semaine' %}?{{ filter.get_url }}">Cette semaine</a>
+        <a role="button" href="{% url 'cette_semaine' %}?{{ filter.get_url }}#today">Cette semaine</a>
         {% endif %}
         </footer>
 </article>
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html
index fec82bf..bb07047 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-week.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html
@@ -34,11 +34,11 @@ Semaine du {{ calendar.calendar_days_list.0.date }}
         <div class="title"><h1>Semaine du {{ calendar.calendar_days_list.0.date }}</h1></div>
         <div class="navigation">
             <div>
-            <a role="button" href="{% url 'week_view' calendar.previous_week.year calendar.previous_week|week %}?{{ filter.get_url }}">
+            <a role="button" href="{% url 'week_view' calendar.previous_week.year calendar.previous_week|week %}?{{ filter.get_url }}#today">
                 {% picto_from_name "chevron-left" %} précédente</a>
             </div>
             <div class="right">
-            <a role="button" href="{% url 'week_view' calendar.next_week.year calendar.next_week|week %}?{{ filter.get_url }}">suivante 
+            <a role="button" href="{% url 'week_view' calendar.next_week.year calendar.next_week|week %}?{{ filter.get_url }}#today">suivante 
                 {% picto_from_name "chevron-right" %}
             </a>
             </div>
@@ -61,9 +61,9 @@ Semaine du {{ calendar.calendar_days_list.0.date }}
         {% if calendar.today_in_calendar %}
         <a role="button" href="{% url 'aujourdhui' %}?{{ filter.get_url }}">Aujourd'hui</a>
         {% endif %}
-        <a role="button" href="{% url 'month_view' calendar.firstdate.year calendar.firstdate.month %}?{{ filter.get_url }}">{{ calendar.firstdate | date:"F o" }}</a>
+        <a role="button" href="{% url 'month_view' calendar.firstdate.year calendar.firstdate.month %}?{{ filter.get_url }}#week-{{ calendar.calendar_days_list.0.date.isocalendar.1 }}">{{ calendar.firstdate | date:"F o" }}</a>
         {% if calendar.firstdate.month != calendar.lastdate.month %}
-            <a role="button" href="{% url 'month_view' calendar.lastdate.year calendar.lastdate.month %}?{{ filter.get_url }}">{{ calendar.lastdate | date:"F o" }}</a>
+            <a role="button" href="{% url 'month_view' calendar.lastdate.year calendar.lastdate.month %}?{{ filter.get_url }}#week-{{ calendar.calendar_days_list.0.date.isocalendar.1 }}">{{ calendar.lastdate | date:"F o" }}</a>
             {% endif %}
         </footer>
 </article>
diff --git a/src/agenda_culturel/templates/agenda_culturel/page.html b/src/agenda_culturel/templates/agenda_culturel/page.html
index bba89df..241db77 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page.html
@@ -33,8 +33,8 @@
             <ul class="menu">
                 <li><a href="{% url 'event_search' %}">Rechercher {% picto_from_name "search" %}</a></li>
                 <li><a href="{% url 'aujourdhui' %}">Aujourd'hui</a></li>
-                <li><a href="{% url 'cette_semaine' %}">Cette semaine</a></li>
-                <li><a href="{% url 'ce_mois_ci' %}">Ce mois-ci</a></li>
+                <li><a href="{% url 'cette_semaine' %}#today">Cette semaine</a></li>
+                <li><a href="{% url 'ce_mois_ci' %}#today">Ce mois-ci</a></li>
             </ul>
         </div>
         <nav class="container-fluid">