From 071641270cfe81056f650e65713801157f2f3275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20P?= <nicolo.paraciani@cnr.it>
Date: Tue, 26 Nov 2024 14:30:19 +0100
Subject: [PATCH] Change content for sheets + layout

---
 webgis/index.html                   | 23 ++++++++++++++---------
 webgis/js/components/Finding.js     | 16 +++++-----------
 webgis/js/components/SiteSurveys.js |  2 +-
 webgis/js/icons.js                  | 18 +++++++++---------
 webgis/js/ui.js                     |  2 +-
 5 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/webgis/index.html b/webgis/index.html
index 108be3d..6f8ab03 100644
--- a/webgis/index.html
+++ b/webgis/index.html
@@ -61,18 +61,17 @@
         <div class="loading loading-lg"></div>
     </div>
     <div class="main columns">
-        <div class="column is-hidden is-overlay has-background-white" id="menu">
+        <div class="column is-hidden is-4 is-3-widescreen is-4-desktop is-5-mobile is-overlay has-background-white-ter" id="menu">
             <aside class="menu ml-4">
-                    <button title="Chiudi menu" class="button is-small is-pulled-right" id="close-menu">
-                        <span class="icon is-small">
-                        <i class="fa fa-chevron-left"></i>
-                        </span>
-                    </button>
-                <p class="menu-label is-size-5">
+                <button title="Chiudi menu" class="delete is-pulled-right" id="close-menu"></button>
+                <p class="menu-label is-size-5 mt-2 is-clickable">
                     <span class="icon pr-2">
                         <img class="image" src="img/icons/siti_menu.png"/>
                     </span>
                     Beni archeologici
+                    <span class="icon pl-2">
+                        <i class="fa fa-chevron-right"></i>
+                    </span>
                 </p>
                 <ul class="menu-list is-hidden" id="siti-list">
                     <li>
@@ -136,17 +135,23 @@
                         </ul>
                     </li>
                 </ul>
-                <p class="menu-label is-size-5">
+                <p class="menu-label is-size-5 is-clickable">
                     Beni non conservati
+                    <span class="icon pl-2">
+                        <i class="fa fa-chevron-right"></i>
+                    </span>
                 </p>
                 <ul class="menu-list is-hidden" id="not-conserved-list">
 
                 </ul>
-                <p class="menu-label is-size-5">
+                <p class="menu-label is-size-5 is-clickable">
                     <span class="icon pr-2">
                         <img class="image" src="img/icons/rinv_menu.png"/>
                     </span>
                     Rinvenimenti
+                    <span class="icon pl-2">
+                        <i class="fa fa-chevron-right"></i>
+                    </span>
                 </p>
                 <ul class="menu-list is-hidden" id="rinvenimenti-list">
                     <li>
diff --git a/webgis/js/components/Finding.js b/webgis/js/components/Finding.js
index 4cf0e83..0e035e5 100644
--- a/webgis/js/components/Finding.js
+++ b/webgis/js/components/Finding.js
@@ -19,25 +19,19 @@ export class Finding {
                 <strong>Materia:</strong> ${this._data.material}
             </p>
             <p class="p-2">
-                <strong>Misure</strong> ${this._data.measurements}
+                <strong>Misure:</strong> ${this._data.measurements}
             </p>
             <p class="p-2">
-                <strong>Inventario</strong> ${this._data.inventory}
+                <strong>Luogo e anno rinvenimento:</strong> ${this._data.place}. ${this._data.year}
             </p>
             <p class="p-2">
-                <strong>Luogo rinvenimento</strong> ${this._data.place}
+                <strong>Datazione:</strong> ${this._data.dating}
             </p>
             <p class="p-2">
-                <strong>Anno rinvenimento</strong> ${this._data.year}
+                <strong>Stato di conservazione:</strong> ${this._data.conservationState}
             </p>
             <p class="p-2">
-                <strong>Datazione</strong> ${this._data.dating}
-            </p>
-            <p class="p-2">
-                <strong>Stato di conservazione</strong> ${this._data.conservationState}
-            </p>
-            <p class="p-2">
-                <strong>Luogo di conservazione</strong> ${this._data.conservationPlace}
+                <strong>Luogo di conservazione:</strong> ${this._data.conservationPlace}
             </p>
             <p class="mt-4 pl-2 pr-5">
                 <span class="icon has-text-link">
diff --git a/webgis/js/components/SiteSurveys.js b/webgis/js/components/SiteSurveys.js
index 322ccde..166a56f 100644
--- a/webgis/js/components/SiteSurveys.js
+++ b/webgis/js/components/SiteSurveys.js
@@ -12,7 +12,7 @@ export class SiteSurveys {
 
     render() {
 		let content = `<div class="has-text-centered has-bottom-border mb-5 pb-5">
-			<p class="is-size-5 mt-3">Elaborazioni CNR da rilievi</p>`;
+			<p class="is-size-5 mt-3">Rilievi CNR-ISPC, elaborazioni grafiche</p>`;
 		content += `
 			<div style="max-width: 70%; margin: 0 auto">
 				<p class="is-size-6 has-text-centered">Cliccare sull'immagine per aprire la gallery</p>
diff --git a/webgis/js/icons.js b/webgis/js/icons.js
index c8ecfc0..bbdffd7 100644
--- a/webgis/js/icons.js
+++ b/webgis/js/icons.js
@@ -7,26 +7,26 @@ const Icons = {};
 Icons.site = L.icon(
     {
         iconUrl: 'img/icons/siti.png',
-        iconSize: [24, 36],
-        iconAnchor: [12, 32],
-        tooltipAnchor: [0, -26],
+        iconSize: [18, 27],
+        iconAnchor: [10, 24],
+        tooltipAnchor: [0, -22],
     }
 );
 Icons.notConserved = L.icon(
     {
         iconUrl: 'img/icons/non_conserv.png',
-        iconSize: [24, 36],
-        iconAnchor: [12, 32],
-        tooltipAnchor: [0, -26],
+        iconSize: [18, 27],
+        iconAnchor: [10, 24],
+        tooltipAnchor: [0, -22],
     }
 );
 
 Icons.finding = L.icon(
     {
         iconUrl: 'img/icons/rinvenimenti.png',
-        iconSize: [24, 36],
-        iconAnchor: [12, 32],
-        tooltipAnchor: [0, -26],
+        iconSize: [18, 27],
+        iconAnchor: [10, 24],
+        tooltipAnchor: [0, -22],
     }
 );
 
diff --git a/webgis/js/ui.js b/webgis/js/ui.js
index 242d79f..ca5dc13 100644
--- a/webgis/js/ui.js
+++ b/webgis/js/ui.js
@@ -76,7 +76,7 @@ UI.toggleMenu = function (triggerId, listId = null) {
 	const menu = document.querySelector('#menu');
 	trigger.addEventListener('click', () => {
 		menu.classList.remove('is-hidden');
-		menu.classList.add('is-3');
+		//menu.classList.add('is-3');
 		const lists = menu.querySelectorAll('ul');
 
 		if (listId !== null) {