From a49f68cf83a80af8ba507d44cfe5d60bbc19e020 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Sun, 14 Jan 2024 14:27:16 +0100
Subject: [PATCH] =?UTF-8?q?am=C3=A9lioration=20du=20focus=20sur=20le=20jou?=
 =?UTF-8?q?r=20d'hui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/static/style.scss                 |  4 ++++
 .../templates/agenda_culturel/day-inc.html            | 11 +++++++++++
 .../templates/agenda_culturel/page-week.html          |  8 ++++----
 .../templates/agenda_culturel/page.html               |  4 ++--
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss
index cd88ee0..202edd8 100644
--- a/src/agenda_culturel/static/style.scss
+++ b/src/agenda_culturel/static/style.scss
@@ -171,10 +171,14 @@ footer {
 #calendar {
     width: 100%;
     overflow: auto;
+    scroll-snap-type: both mandatory;
 
     .grid {
         grid-template-columns: repeat(auto-fit, minmax(0%, 1fr));
         min-width: 1500px;
+        article {
+            scroll-snap-align: start;
+        }
 
     }
     .grid.week-in-month {
diff --git a/src/agenda_culturel/templates/agenda_culturel/day-inc.html b/src/agenda_culturel/templates/agenda_culturel/day-inc.html
index fce6461..05d697a 100644
--- a/src/agenda_culturel/templates/agenda_culturel/day-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/day-inc.html
@@ -8,6 +8,17 @@
 {% with "date-"|add:daytag as daytag %}
 
 <article class="day{{ day|calendar_classes:fixed_style }}" id="{{ daytag }}">
+    {% if day.is_today %}
+    <script>
+        document.addEventListener("DOMContentLoaded", function(e) {
+            agenda = document.getElementById("calendar");
+            todayArticle = document.getElementById("today").parentElement;
+            left = todayArticle.offsetLeft;
+            top = todayArticle.offsetTop;
+            agenda.scrollTo({top: top, left: left});
+        });
+    </script>
+    {% endif %}
     <header{% if day.is_today %} id="today"{% endif %}>
     <{% if headers %}{{ headers }}{% else %}h2{% endif %}><a href="{{ day.date | url_day }}?{{ filter.get_url }}">{{ day.date | date:"l j" }}</a></{% if headers %}{{ headers }}{% else %}h2{% endif %}>
     </header>
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html
index bb07047..fec82bf 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 }}#today">
+            <a role="button" href="{% url 'week_view' calendar.previous_week.year calendar.previous_week|week %}?{{ filter.get_url }}">
                 {% 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 }}#today">suivante 
+            <a role="button" href="{% url 'week_view' calendar.next_week.year calendar.next_week|week %}?{{ filter.get_url }}">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 }}#week-{{ calendar.calendar_days_list.0.date.isocalendar.1 }}">{{ calendar.firstdate | date:"F o" }}</a>
+        <a role="button" href="{% url 'month_view' calendar.firstdate.year calendar.firstdate.month %}?{{ filter.get_url }}">{{ 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 }}#week-{{ calendar.calendar_days_list.0.date.isocalendar.1 }}">{{ calendar.lastdate | date:"F o" }}</a>
+            <a role="button" href="{% url 'month_view' calendar.lastdate.year calendar.lastdate.month %}?{{ filter.get_url }}">{{ 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 e03f054..7b2b9f2 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page.html
@@ -34,8 +34,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' %}#today">Cette semaine</a></li>
-                <li><a href="{% url 'ce_mois_ci' %}#today">Ce mois-ci</a></li>
+                <li><a href="{% url 'cette_semaine' %}">Cette semaine</a></li>
+                <li><a href="{% url 'ce_mois_ci' %}">Ce mois-ci</a></li>
             </ul>
         </div>
         <nav class="container-fluid">