From 7a91ab5ef57ff1843a8213dd0f96df84ec8962de Mon Sep 17 00:00:00 2001
From: Vincent LAURENT <vince.laurent@gmail.com>
Date: Tue, 11 Oct 2022 00:42:45 +0200
Subject: [PATCH] =?UTF-8?q?Button=20cancel=20s=C3=A9l=C3=A9ction=20more=20?=
 =?UTF-8?q?visible=20in=20desktop=20and=20mobile=20mode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/organization.js       | 6 ++++++
 templates/organization.html.php | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/public/js/organization.js b/public/js/organization.js
index dc583bf..7de8f65 100644
--- a/public/js/organization.js
+++ b/public/js/organization.js
@@ -494,6 +494,7 @@ var updateGlobalState = function() {
         button.setAttribute('disabled', 'disabled');
     });
     document.querySelector('#container_btn_select .card-header span').innerText = "Aucune";
+    document.querySelector('#container_btn_select .card-footer').classList.add('d-none');
     document.querySelector('#backdrop_drag_mode').classList.add('d-none')
     document.querySelector('#div-margin-top').classList.remove('d-none');
     document.querySelector('#div-margin-bottom').classList.remove('d-none');;
@@ -519,6 +520,7 @@ var updateGlobalState = function() {
             button.classList.remove('btn-outline-secondary');
             button.removeAttribute('disabled');
         });
+        document.querySelector('#container_btn_select .card-footer').classList.remove('d-none');
         document.querySelectorAll('.canvas-container .btn-add').forEach(function(button) {
             button.classList.remove('d-none');
         });
@@ -621,6 +623,10 @@ var createEventsListener = function() {
         nbPagePerLine--;
         pageRenderAll();
     });
+    document.getElementById('btn_cancel_select_footer').addEventListener('click', function(event) {
+        document.getElementById('btn_cancel_select').click();
+        this.blur();
+    });
     document.getElementById('btn_cancel_select_mobile').addEventListener('click', function(event) {
         document.getElementById('btn_cancel_select').click();
         this.blur();
diff --git a/templates/organization.html.php b/templates/organization.html.php
index af16da1..0fdf52f 100644
--- a/templates/organization.html.php
+++ b/templates/organization.html.php
@@ -44,7 +44,7 @@
         </footer>
     </div>
     <div id="page-organization" style="padding-right: 350px;" class="d-none">
-        <div id="div-margin-top" style="height: 65px;" class="d-md-none"></div>
+        <div id="div-margin-top" style="height: 88px;" class="d-md-none"></div>
         <div id="container-pages" class="col-12 pt-1 vh-100 d-flex align-content-start flex-wrap position-relative" style="overflow-y: scroll; overflow-x: hidden;">
             <div id="backdrop_drag_mode" class="position-absolute bg-dark opacity-25 d-none"></div>
             <button id="btn_cancel_drag_mode" type="button" class="btn-close position-fixed d-none" aria-label="Close" style="z-index: 1047; right: 354px; top: 2px;"></button>
@@ -76,6 +76,7 @@
                         <button id="btn_delete_select" disabled="disabled" type="button" class="btn btn-sm btn-outline-secondary"><i class="bi bi-trash"></i> Supprimer</button>
                         <button id="save-select" class="btn btn-sm btn-outline-secondary" disabled="disabled" form="form_pdf" type="submit"><i class="bi bi-download"></i> Télécharger</button>
                     </div>
+                    <div class="card-footer d-none small text-center p-1 border-primary bg-primary bg-opacity-25"><a id="btn_cancel_select_footer" type="button" aria-label="Close" style="text-decoration: none;" class="text-primary"><i class="bi bi-x-lg"></i> Annuler la séléction</a></div>
                 </div>
 
                 <div class="position-absolute bottom-0 pb-2 ps-0 pe-4 w-100">
@@ -102,7 +103,10 @@
                 <button type="button" class="btn btn-outline-dark" onclick="document.getElementById('input_pdf_upload_2').click(); this.blur();"><i class="bi bi-plus-circle"></i> Ajouter un PDF</button>
             </div>
             <div id="top_bar_action_selection" class="d-none">
-                <div id="top_bar_action_selection_recap" class="bg-primary small text-white text-center rounded-top p-1"><span>Aucune</span> page(s) séléctionnée(s) <button id="btn_cancel_select_mobile" type="button" class="btn-close btn-close-white float-end" aria-label="Close"></button></div>
+                <div class="text-end">
+
+                </div>
+                <div id="top_bar_action_selection_recap" class="bg-primary text-white text-center rounded-top p-1 position-relative"><span>Aucune</span> page(s)<button id="btn_cancel_select_mobile" type="button" style="text-decoration: none;right: 0px; top:0px;" class="btn bg-white bg-opacity-50 text-primary position-absolute p-0 ps-1 pe-1 mt-1 me-1"><i class="bi bi-x-lg"></i>&nbsp;Annuler</button></div>
                 <div class="btn-group w-100">
                     <button id="btn_rotate_select_mobile" type="button" class="btn btn-outline-primary" style="border-top-left-radius: 0 !important;"><i class="bi bi-arrow-clockwise"></i> Tourner</button>
                     <button id="btn_drag_select_mobile" type="button" class="btn btn-outline-primary"><i class="bi bi-arrows-move"></i> Déplacer</button>