From ded244c9ff024c8c65620c549781b855ce6d34d7 Mon Sep 17 00:00:00 2001
From: David Larlet <david@larlet.fr>
Date: Wed, 20 Dec 2023 22:02:00 -0500
Subject: [PATCH] Put CSS and JS blocks to their dedicated places

---
 umap/static/umap/content.css            | 19 ++++++++++++++--
 umap/templates/umap/map_table.html      | 30 -------------------------
 umap/templates/umap/user_dashboard.html | 16 +++++++++++++
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/umap/static/umap/content.css b/umap/static/umap/content.css
index 909501c1..dfd3848c 100644
--- a/umap/static/umap/content.css
+++ b/umap/static/umap/content.css
@@ -296,9 +296,9 @@ table.maps {
     width: 100%;
 }
 table.maps .map_fragment {
-    height: 100px;
+    display: block;
+    height: 80vh;
     width: 100%;
-    min-width: 200px;
 }
 table.maps tbody tr:nth-child(odd) {
     background-color: #f4f4f4;
@@ -310,6 +310,21 @@ table.maps thead tr {
     line-height: 2em;
 }
 
+/* **************************** */
+/*           Dialog             */
+/* **************************** */
+dialog {
+    width: 90vw;
+    height: 90vh;
+}
+dialog::backdrop {
+    background: #fff5;
+    backdrop-filter: blur(4px);
+}
+.close-dialog {
+    text-align: center;
+}
+
 
 /* ************************************************* */
 /* ********************* MOBILE ******************** */
diff --git a/umap/templates/umap/map_table.html b/umap/templates/umap/map_table.html
index 6da94810..5ad884a0 100644
--- a/umap/templates/umap/map_table.html
+++ b/umap/templates/umap/map_table.html
@@ -49,33 +49,3 @@
        class="button more_button neutral">{% trans "More" %}</a>
   </div>
 {% endif %}
-
-<style type="text/css">
-  dialog {
-    width: 90vw;
-    height: 90vh;
-  }
-  .close-dialog {
-    text-align: center;
-  }
-  table.maps .map_fragment {
-    display: block;
-    width: 100%;
-    height: 80vh;
-  }
-  dialog::backdrop {
-    background: #fff5;
-    backdrop-filter: blur(4px);
-  }
-</style>
-
-<script type="text/javascript">
-  for (const mapOpener of document.querySelectorAll("button.map-opener")) {
-    mapOpener.addEventListener('click', (event) => {
-      event.target.nextElementSibling.showModal()
-      const mapId = event.target.dataset.mapId
-      const previewSettings = JSON.parse(document.getElementById(mapId).textContent)
-      const map = new L.U.Map(`${mapId}_target`, previewSettings)
-    })
-  }
-</script>
diff --git a/umap/templates/umap/user_dashboard.html b/umap/templates/umap/user_dashboard.html
index 8cbc2710..3c4f897b 100644
--- a/umap/templates/umap/user_dashboard.html
+++ b/umap/templates/umap/user_dashboard.html
@@ -23,3 +23,19 @@
     </div>
   </div>
 {% endblock maincontent %}
+
+{% block bottom_js %}
+  {{ block.super }}
+  <script type="text/javascript">
+    !(function () {
+      for (const mapOpener of document.querySelectorAll("button.map-opener")) {
+        mapOpener.addEventListener('click', (event) => {
+          event.target.nextElementSibling.showModal()
+          const mapId = event.target.dataset.mapId
+          const previewSettings = JSON.parse(document.getElementById(mapId).textContent)
+          const map = new L.U.Map(`${mapId}_target`, previewSettings)
+        })
+      }
+    })()
+  </script>
+{% endblock bottom_js %}