From 4cb60d1968a70aad28b045748db79e3f28a6ce62 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Thu, 3 Oct 2024 16:16:17 +0200
Subject: [PATCH] =?UTF-8?q?Facilitation=20d'ajouts=20d'=C3=A9v=C3=A9nement?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #160
---
 src/agenda_culturel/static/style.scss         | 42 ++++++++++++++++++-
 .../templates/agenda_culturel/event_form.html |  3 ++
 .../agenda_culturel/event_import.html         |  2 +
 .../templates/agenda_culturel/import.html     |  2 +
 .../templates/agenda_culturel/import_set.html |  1 +
 .../templates/agenda_culturel/imports.html    |  3 ++
 .../templates/agenda_culturel/page.html       | 12 ++++--
 .../templates/agenda_culturel/search.html     |  6 ++-
 8 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss
index 57c7c99..dc8cd3e 100644
--- a/src/agenda_culturel/static/style.scss
+++ b/src/agenda_culturel/static/style.scss
@@ -335,10 +335,10 @@ footer [data-tooltip] {
         display: none;
     }
     .slider-button.button-left {
-        left: 1em;
+        left: .4em;
     }
     .slider-button.button-right {
-        right: 1em;
+        right: .4em;
     }
 }
 
@@ -1163,4 +1163,42 @@ article {
         bottom: 0;
         box-shadow: 0 -1px 0 rgba(115, 130, 140, 0.2);
     }
+}
+
+#menu-rechercher, #menu-ajouter {
+    display: none;
+}
+
+#boutons-fixes {
+    li {
+        list-style: none;
+        @extend [role="button"], .secondary;
+        height: 2em;
+        width: 2em;
+        padding: 0;
+        font-size: 150%;
+        border-radius: 1em;
+        line-height: 2em;
+        text-align: center;
+        z-index: 10;
+        opacity: 0.9;
+        a {
+            color: var(--primary-inverse);
+        }
+        float: left;
+        clear: both;
+    }
+    position: fixed;
+    bottom: calc(var(--spacing) + .4em);
+    right: calc(var(--spacing) + .4em);
+}
+
+@media only screen and (min-width: 992px) {
+    #boutons-fixes {
+        display: none;
+    }
+    #menu-rechercher, #menu-ajouter {
+        display: inline-block;
+    }
+
 }
\ No newline at end of file
diff --git a/src/agenda_culturel/templates/agenda_culturel/event_form.html b/src/agenda_culturel/templates/agenda_culturel/event_form.html
index 05da15d..06aeda7 100644
--- a/src/agenda_culturel/templates/agenda_culturel/event_form.html
+++ b/src/agenda_culturel/templates/agenda_culturel/event_form.html
@@ -14,6 +14,9 @@
 {% endif %}
 {% endblock %}{% endblock %}
 
+{% block ajouter-bouton %}{% block ajouter-menu %}{% endblock %}{% endblock %}
+
+
 {% block entete_header %}
 <script src="{% static 'choicejs/choices.min.js' %}"></script>
 
diff --git a/src/agenda_culturel/templates/agenda_culturel/event_import.html b/src/agenda_culturel/templates/agenda_culturel/event_import.html
index f000dda..a034020 100644
--- a/src/agenda_culturel/templates/agenda_culturel/event_import.html
+++ b/src/agenda_culturel/templates/agenda_culturel/event_import.html
@@ -11,6 +11,8 @@
 
 {% block fluid %}{% endblock %}
 
+{% block ajouter-bouton %}{% block ajouter-menu %}{% endblock %}{% endblock %}
+
 
 {% block content %}
 <article>
diff --git a/src/agenda_culturel/templates/agenda_culturel/import.html b/src/agenda_culturel/templates/agenda_culturel/import.html
index d5ae706..0770ddc 100644
--- a/src/agenda_culturel/templates/agenda_culturel/import.html
+++ b/src/agenda_culturel/templates/agenda_culturel/import.html
@@ -6,6 +6,8 @@
 
 {% block fluid %}{% endblock %}
 
+{% block ajouter-bouton %}{% block ajouter-menu %}{% endblock %}{% endblock %}
+
 
 {% block content %}
 
diff --git a/src/agenda_culturel/templates/agenda_culturel/import_set.html b/src/agenda_culturel/templates/agenda_culturel/import_set.html
index 6017163..66c724f 100644
--- a/src/agenda_culturel/templates/agenda_culturel/import_set.html
+++ b/src/agenda_culturel/templates/agenda_culturel/import_set.html
@@ -8,6 +8,7 @@
 
 {% block fluid %}{% endblock %}
 
+{% block ajouter-bouton %}{% block ajouter-menu %}{% endblock %}{% endblock %}
 
 {% block content %}
 
diff --git a/src/agenda_culturel/templates/agenda_culturel/imports.html b/src/agenda_culturel/templates/agenda_culturel/imports.html
index 406686d..f33e8c6 100644
--- a/src/agenda_culturel/templates/agenda_culturel/imports.html
+++ b/src/agenda_culturel/templates/agenda_culturel/imports.html
@@ -8,6 +8,9 @@
     {% css_categories %}
 {% endblock %}
 
+{% block ajouter-bouton %}{% block ajouter-menu %}{% endblock %}{% endblock %}
+
+
 {% block content %}
 <div class="grid two-columns">
 <article>
diff --git a/src/agenda_culturel/templates/agenda_culturel/page.html b/src/agenda_culturel/templates/agenda_culturel/page.html
index 74b86d8..4104bf1 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page.html
@@ -34,12 +34,19 @@
 {% load duplicated_extra %}
 {% load rimports_extra %}
 <body>
+    <div id="boutons-fixes">
+        <ul>
+            {% block ajouter-bouton %}<li class="ajouter-bouton"><a href="{% url 'add_event' %}" aria-label="Ajouter un événement">{% picto_from_name "plus" %}</a></li>{% endblock %}
+            {% block rechercher-bouton %}<li class="rechercher-bouton"><a href="{% url 'event_search' %}" aria-label="Rechercher">{% picto_from_name "search" %}</a></li>{% endblock %}
+        </ul>
+    </div>
     <div id="main-nav">
         <div class="header">
             <input class="menu-btn" type="checkbox" id="menu-btn" />
             <label class="menu-icon" for="menu-btn">{% picto_from_name "menu" %}</label>
             <ul class="menu">
-                <li><a href="{% url 'event_search' %}">Rechercher {% picto_from_name "search" %}</a></li>
+                {% block ajouter-menu %}<li id="menu-ajouter" class="ajouter-bouton"><a href="{% url 'add_event' %}">Ajouter un événement {% picto_from_name "plus-circle" %}</a></li>{% endblock %}
+                {% block rechercher-menu %}<li id="menu-rechercher" class="rechercher-bouton"><a href="{% url 'event_search' %}">Rechercher {% picto_from_name "search" %}</a></li>{% endblock %}
                 <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>
@@ -54,9 +61,6 @@
                 </li>
                 <li>
                     <div>
-                        {% if perms.agenda_culturel.add_event %}
-                        <a class="badge simple" href="{% url 'add_event_urls' %}">{% picto_from_name "plus-circle" %} {% picto_from_name "calendar" %}</a>
-                        {% endif %}
                         {% if perms.agenda_culturel.view_recurrentimport %}
                         {% show_badge_rimports "bottom" "failed" %}
                         {% show_badge_rimports "bottom" "running" %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/search.html b/src/agenda_culturel/templates/agenda_culturel/search.html
index 1be0d96..2626bc3 100644
--- a/src/agenda_culturel/templates/agenda_culturel/search.html
+++ b/src/agenda_culturel/templates/agenda_culturel/search.html
@@ -10,14 +10,18 @@
     {% css_categories %}
 {% endblock %}
 
+{% block rechercher-bouton %}{% block rechercher-menu %}{% endblock %}{% endblock %}
+
+{% block fluid %}{% endblock %}
 {% block content %}
 
+
 <article class="search">
     <header>
         <h1>Rechercher un événement</h1>
     </header>
 
-    <form method="get" class="form django-form" action="#results">
+    <form method="get" class="form django-form">
         {{ filter.form }}
         <button type="submit">Rechercher</button>