From dc8201888cc4bbb28c2512f2871728e062064e7f Mon Sep 17 00:00:00 2001
From: Luca Trupiano <luca.trupiano@isti.cnr.it>
Date: Fri, 4 Apr 2025 19:17:16 +0200
Subject: [PATCH] Aggiustate allineamento e spaziatura icone, vari bug corretti

---
 index_5.2.html      | 48 +++++++++++++++++++++++----------------------
 js/browseMgr_5.2.js | 30 ++++++++++++++--------------
 js/minimap_5.2.js   | 20 +++++++++++++++----
 js/script_5.2.js    | 10 +++++-----
 4 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/index_5.2.html b/index_5.2.html
index 41c8412..21e432e 100644
--- a/index_5.2.html
+++ b/index_5.2.html
@@ -18,7 +18,7 @@
 <link rel="stylesheet" id="style2-Custom" href="./css/custom2_4.3.css">
 <link rel="stylesheet" href="./css/collapsemod.css">
 <link rel="stylesheet" href="./css/bootstrap-slider.css">
-<link rel="stylesheet" href="./css/ionicons.css">
+<link rel="stylesheet" id="style2-Icons" href="./css/ionicons.css">
 
 <script src="https://code.jquery.com/jquery-3.6.0.js"></script>
 <script
@@ -562,12 +562,14 @@
 							
 								<ul class="nav nav-tabs" id="tab-list" role="tablist">
 									<li class="nav-item" role="presentation">
-										<a class="nav-link py-1 active" id="vis0-tab" data-toggle="tab" href="#vis0" role="tab" aria-controls="vis0" aria-selected="true"><span class=" btn-link"><i class="icon icon-document-attach"></i></span>
-										<span class="h6 btn-link" id="tabRiferimenti"> Riferimenti</span></a>
+										<a class="nav-link pb-1 pt-2 active" id="vis0-tab" data-toggle="tab" href="#vis0" role="tab" aria-controls="vis0" aria-selected="true" style="min-height: 40px;">
+										<span class=" btn-link mt-1"><i class="icon icon-document-attach"></i></span>
+										<span class="h6 btn-link font-weight-bold" id="tabRiferimenti"> Riferimenti</span></a>
 									</li>
 									<li class="nav-item" role="presentation">
-										<a class="nav-link py-1" id="vis1-tab" data-toggle="tab" href="#vis1" role="tab" aria-controls="vis1" aria-selected="true"><span class=" btn-link"><i class="icon icon-analytics"></i></span>
-										<span class="h6 btn-link"> Periodo</span></a>
+										<a class="nav-link pb-1 pt-2" id="vis1-tab" data-toggle="tab" href="#vis1" role="tab" aria-controls="vis1" aria-selected="true" style="min-height: 40px;">
+										<span class=" btn-link mt-1"><i class="icon icon-analytics"></i></span>
+										<span class="h6 btn-link  font-weight-bold" id="tabPeriodo"> Periodo</span></a>
 									</li>
 								</ul>
 								
@@ -603,8 +605,8 @@
 													</div>
 													<div class="d-flex flex-wrap-reverse ml-auto align-items-center justify-content-end px-1 pt-1 pb-0">
 														<button id="closeStruct0"
-															class="btn btn-sm btn-outline-warning btn-outline-warning-mod closeStruct rounded text-warning align-self-end noPrintA px-1 pb-0 ml-1 mb-1">
-															<i class="icon icon-close-circle"></i>
+															class="btn btn-sm btn-outline-warning btn-outline-warning-mod closeStruct rounded text-warning align-self-end noPrintA p-1 ml-1 mb-1">
+															<i class="icon icon-close-circle px-1"></i>
 														</button>
 													</div>
 												</div>
@@ -654,7 +656,7 @@
 												placeholder=' inserisci un termine'
 												style="height: 32px;">
 										</div>
-										<button class="btn btn-sm btn-secondary" type="submit"
+										<button class="btn btn-sm btn-secondary px-4" type="submit"
 											id='searchcomm'>
 											<i class="icon icon-search"></i>
 										</button>
@@ -668,8 +670,8 @@
 										<input style="display: none;" type="file" id="apriFile">
 										<span
 											class="border border-success rounded bg-light p-1 mb-1 align-text-bottom">
-											<i class="icon icon-save-outline curPoint"></i> 
-											<i class="icon icon-folder-open-outline curPoint"></i> </span>
+											<i class="icon icon-save-outline curPoint px-1"></i> 
+											<i class="icon icon-folder-open-outline curPoint px-1"></i> </span>
 
 									</div>
 									<div class="btn-group d-sm-inline flex-nowrap p-0 pr-1" role="group"
@@ -687,7 +689,7 @@
 											<span class="text-muted">Reset</span>
 										</button>
 									</div>
-										<button class="btn btn-sm btn-success border ml-2 mr-1" type="submit"
+										<button class="btn btn-sm btn-success border ml-2 mr-1 px-4" type="submit"
 											id='searchcomm2'>
 											<i class="icon icon-search" class="px-2"></i>
 										</button>
@@ -716,7 +718,7 @@
 														<div class="input-group input-group-sm px-1 pt-1" style="max-width: 150px;">
 															<div class="input-group-prepend">
 																<label
-																	class="input-group-text border-right-0 border-success"><i class="icon icon-receipt-outline"></i></label>
+																	class="input-group-text border-right-0 border-success px-2"><i class="icon icon-receipt-outline"></i></label>
 															</div>
 															<select
 																class="custom-select text-muted bg-light border border-success btn-outline-success "
@@ -1920,7 +1922,7 @@
 								class="col px-2 pt-1 align-self-start align-items-start justify-content-end text-right position-absolute"
 								style="z-index: 90">
 								<button id="trashClaCont-xX0"
-									class="btn btn-sm btn-outline-secondary bg-light trashClaCont border rounded text-secondary px-1 pb-0"
+									class="btn btn-sm btn-outline-secondary bg-light trashClaCont border rounded text-secondary p-1"
 									style="z-index: 90">
 									<i class="icon icon-refresh-circle"></i>
 								</button>
@@ -1969,8 +1971,8 @@
 											</div>
 										</div>
 										<div class="col-md-auto p-0 m-0 text-right text-success">
-											<button class="btn btn-sm removeCla noPrintA text-success border rounded px-1 pb-0" style="z-index: 90" id="removeClaxX3Xx">
-												<i class="icon icon-close-circle"></i>
+											<button class="btn btn-sm removeCla noPrintA text-success border rounded p-1" style="z-index: 90" id="removeClaxX3Xx">
+												<i class="icon icon-close-circle px-1"></i>
 											</button>
 										</div>
 									</div>
@@ -1982,7 +1984,7 @@
 								<div
 									class="col-auto pr-1 align-self-end align-items-end justify-content-end text-right text-success position-absolute noPrintA">
 									<button id="claCollapsexX1Xx"
-										class="btn btn-sm btn-link claCollBtn collapsed px-4 pb-0 border text-success btn-outline-success bg-light"
+										class="btn btn-sm btn-link claCollBtn collapsed px-4 pb-1 border text-success btn-outline-success bg-light"
 										data-toggle="collapse" data-target="#collapseClaxX1Xx"
 										aria-expanded="false" aria-controls="collapseClaxX1Xx">
 										<i class="icon icon-pencil"></i>
@@ -1992,7 +1994,7 @@
 						</div>
 						<div id="collapseClaxX1Xx" class="collapse noPrintB"
 							aria-labelledby="headingCxX1Xx" data-parent="#sortable0">
-							<div class="card-body p-0 mx-1 mb-1 bg-lida11 border rounded border-success"
+							<div class="card-body p-0 mx-1 my-0 bg-lida11 border rounded border-success"
 								id="claBodyxX1Xx"></div>
 						</div>
 					</li>
@@ -2029,9 +2031,9 @@
 										</div>
 										<div class="col-md-auto p-0 m-0 text-right text-success">
 											<button
-												class="btn btn-sm removeCla noPrintA text-success border rounded px-1 pb-0"
+												class="btn btn-sm removeCla noPrintA text-success border rounded p-1"
 												style="z-index: 90" id="removeRifxR3Rx">
-												<i class="icon icon-close-circle"></i>
+												<i class="icon icon-close-circle px-1"></i>
 											</button>
 										</div>
 									</div>
@@ -2043,7 +2045,7 @@
 								<div
 									class="col-auto pr-1 align-self-end align-items-end justify-content-end text-right text-success position-absolute noPrintA">
 									<button id="claCollapsexR1Rx"
-										class="btn btn-sm btn-link claCollBtn collapsed px-4 pb-0 border text-success btn-outline-success bg-light"
+										class="btn btn-sm btn-link claCollBtn collapsed px-4 pb-1 border text-success btn-outline-success bg-light"
 										data-toggle="collapse" data-target="#collapseClaxR1Rx"
 										aria-expanded="false" aria-controls="collapseClaxR1Rx">
 										<i class="icon icon-pencil"></i>
@@ -2057,7 +2059,7 @@
 							aria-labelledby="headingC1" data-parent="#sortableRif0"
 							style="">
 							<div
-								class="card-body p-0 mx-1 mb-1 bg-lida11 border rounded border-success"
+								class="card-body p-0 mx-1 my-0 bg-lida11 border rounded border-success"
 								id="rifBodyxR1Rx">
 								<div style=""
 									class="col-12 tab-pane px-0 bg-lida11 border-top campiRif"
@@ -2275,8 +2277,8 @@
 									</div>
 								</div>
 								<div class="col-md-auto p-0 mr-2 mt-0 text-right text-success">
-									<button class="btn btn-sm btn-outline-success iconClClass removeCond text-success border rounded px-1 pb-0" style="z-index: 90">
-										<i class="icon icon-close-circle"></i>
+									<button class="btn btn-sm btn-outline-success iconClClass removeCond text-success border rounded p-1" style="z-index: 90">
+										<i class="icon icon-close-circle px-1"></i>
 									</button>
 								</div>
 							</div>
diff --git a/js/browseMgr_5.2.js b/js/browseMgr_5.2.js
index b773e1f..e761199 100644
--- a/js/browseMgr_5.2.js
+++ b/js/browseMgr_5.2.js
@@ -467,10 +467,10 @@ $(document).ready(function() {
 			comandiGrp.attr('class', 'btn-group flex-nowrap d-inline pr-3 mt-1 mr-3 align-text-bottom');
 			comandiGrp.attr('role', "group")
 
-			var spanBadgeExpand = $('<button class="btn btn-sm btn-outline-primary espandiFrase noPrintA px-1 pt-1 pb-0"/>');
+			var spanBadgeExpand = $('<button class="btn btn-sm btn-outline-primary espandiFrase noPrintA p-1"/>');
 			var expandIcon = '<i class="icon icon-expand-outline"></i>';
 			//spanBadgeExpand.attr('class', 'btn btn-sm btn-outline-primary espandiFrase px-1 pt-1 pb-0');
-			var spanBadgeReduce = $('<button class="btn btn-sm btn-outline-secondary riduciFrase noPrintA px-1 pt-1 pb-0 ml-1 disabled"/>');
+			var spanBadgeReduce = $('<button class="btn btn-sm btn-outline-secondary riduciFrase noPrintA p-1 ml-1 disabled"/>');
 			var reduceIcon = '<i class="icon icon-contract-outline"></i>';
 
 			//spanBadgeReduce.attr('class', 'btn btn-sm btn-outline-secondary riduciFrase px-1 pt-1 pb-0 ml-1 disabled');
@@ -1218,8 +1218,8 @@ $(document).ready(function() {
 		var rigaNota = $('<div class="p-0 m-0">');
 		var buttons = $('<div class="d-flex flex-wrap-reverse ml-auto align-items-center justify-content-end px-1 pt-1 pb-0">')
 		var closeButton = $('<button id="closeNote' + id + '"' +
-			'class="btn btn-sm btn-outline-warning btn-outline-warning-mod closeNote rounded text-warning align-self-end noPrintA px-1 pb-0 ml-1 mb-1">' +
-			'<i class="icon icon-close-circle"></i>');
+			'class="btn btn-sm btn-outline-warning btn-outline-warning-mod closeNote rounded text-warning align-self-end noPrintA p-1 ml-1 mb-1">' +
+			'<i class="icon icon-close-circle px-1"></i>');
 		closeButton.appendTo(buttons);
 		if (len > 1) {
 			var commentiSP = " commenti su "
@@ -1366,10 +1366,10 @@ $(document).ready(function() {
 		var rigaNota = $('<div class="px-3 py-1 m-0">');
 		var buttons = $('<div class="d-flex flex-wrap-reverse ml-auto align-items-center justify-content-end p-1">')
 		var collapseButton = $('<button id="collapseBtnNote' + id + '_' + pos + '"' +
-			'class="btn btn-sm btn-outline-primary bg-light collapseNote border rounded text-primary align-self-end noPrintA px-1 pb-0"' +
+			'class="btn btn-sm btn-outline-primary bg-light collapseNote border rounded text-primary align-self-end noPrintA p-1"' +
 			'data-toggle="collapse" data-target="#collapseNote' + id + '_' + pos + '"' +
 			'aria-expanded="true" aria-controls="collapseNote' + id + '_' + pos + '">' +
-			'<i class="icon icon-archive"></i>');
+			'<i class="icon icon-archive px-1"></i>');
 		//var closeButton = $('<button id="closeNote'+id+ '_' + pos +'"'+
 		//		'class="btn btn-sm btn-outline-primary bg-light closeNote border rounded text-primary align-self-end px-1 pb-0 ml-1 mb-1">'+
 		//		'<i class="icon icon-close-circle"></i>');
@@ -1903,16 +1903,16 @@ $(document).ready(function() {
 			return;
 		}
 		if (!filterBottonAdded) {
-			var cardRiferimenti = $("#tabRiferimenti")
+			var cardRiferimenti = $("#tabRiferimenti").closest('a');
 			var filterButton = $('<button />');
 			filterButton.attr('id', 'filterRiferimentiOn')
-			filterButton.attr('class', 'btn btn-sm btn-outline-primary filterRiferimentiOn showcomments border-0 rounded text-primary px-1 pt-1 pb-0 ml-1');
-			var filterIcon = '<i class="icon icon-funnel"></i>';
-			var filterIcon1 = '<i class="icon icon-funnel"></i>';
+			filterButton.attr('class', 'btn btn-sm btn-outline-primary bg-light filterRiferimentiOn showcomments border-0 rounded text-primary px-1 py-0 ml-2');
+			var filterIcon = '<i class="icon icon-funnel px-1 py-0"></i>';
+			var filterIcon1 = '<i class="icon icon-funnel pl-1 py-0"></i>';
 			var filterButton1 = $('<button />');
 			filterButton1.attr('id', 'filterRiferimentiOff')
-			filterButton1.attr('class', 'btn btn-sm btn-outline-primary filterRiferimentiOff showcomments border-0 rounded text-primary px-1 pt-1 pb-0 ml-1');
-			var removeFilter = '<i class="icon icon-close"></i>';
+			filterButton1.attr('class', 'btn btn-sm btn-outline-primary bg-light filterRiferimentiOff showcomments border-0 rounded text-primary px-1 py-0 ml-2');
+			var removeFilter = '<i class="icon icon-close pr-1 py-0"></i>';
 			filterButton1.append(filterIcon1)
 			filterButton1.append(removeFilter)
 
@@ -2251,7 +2251,7 @@ $(document).ready(function() {
 		var proemiooccorrenza = $('<button />')
 		proemiooccorrenza.attr('id', idVerso)
 
-		proemiooccorrenza.attr('class', 'btn btn-sm btn-outline-primary showcomments bg-light border-0 rounded text-primary px-1 pt-1 pb-0 ml-1');
+		proemiooccorrenza.attr('class', 'btn btn-sm btn-outline-primary showcomments bg-light border-0 rounded text-primary p-1 ml-1');
 
 		var commentIcon = '<i class="icon icon-document-attach"></i>';
 
@@ -2267,9 +2267,9 @@ $(document).ready(function() {
 		spanoccorrenza.attr('id', idVerso)
 		//btn-sm btn-outline-secondary
 		if (idVerso.startsWith("CommentoRes_") && flagRisultato) {
-			spanoccorrenza.attr('class', 'btn btn-sm btn-outline-primary risultato showcomments bg-light border-0 rounded text-primary px-1 pt-1 pb-0 ml-1');
+			spanoccorrenza.attr('class', 'btn btn-sm btn-outline-primary risultato showcomments bg-light border-0 rounded text-primary p-1 ml-1');
 		} else {
-			spanoccorrenza.attr('class', 'btn btn-sm btn-outline-primary showcomments bg-light border-0 rounded text-primary px-1 pt-1 pb-0 ml-1');
+			spanoccorrenza.attr('class', 'btn btn-sm btn-outline-primary showcomments bg-light border-0 rounded text-primary p-1 ml-1');
 
 		}
 		if (numberOfComments > 1) {
diff --git a/js/minimap_5.2.js b/js/minimap_5.2.js
index 4f5ae32..c0a4e63 100644
--- a/js/minimap_5.2.js
+++ b/js/minimap_5.2.js
@@ -20,8 +20,11 @@ let minimapContent = document.createElement('iframe');
 let realScale;
 let currentMinimap = '';
 let initOffset = '';
+//let correctionFactor = 1.003;
 let correctionFactor = 1;
-let scrollCorrectionFactor = 0.997;
+//let correctionFactor = 0.99;
+let scrollCorrectionFactor = 1;
+//let scrollCorrectionFactor = 0.997;
 
 
 function drawMinimap(name, onlyContent = false, cantoOffset = 0){
@@ -31,15 +34,18 @@ function drawMinimap(name, onlyContent = false, cantoOffset = 0){
 	$(displayCantoId).css("max-height", maxCantoHeightToSet);	
 
 	currentMinimap = name;
-	
 	if (currentMinimap == '#vistaFrasi') {
 		//correctionFactor = 1.003;
-		correctionFactor = 1.009;
+		correctionFactor = 1;
+		//correctionFactor = 1.009;
 		scrollCorrectionFactor = 0.997;
 		//scrollCorrectionFactor = 1;
 	} else {
+		//correctionFactor = 1.003;
+		//correctionFactor = 0.99;
 		correctionFactor = 1;
-		scrollCorrectionFactor = 0.997;
+		//scrollCorrectionFactor = 0.997;
+		scrollCorrectionFactor = 1;
 	};
 	
 	initOffset = parseInt($("body").css("padding-top").replace("px", ""))+63;
@@ -97,6 +103,11 @@ function showMinimap(onlyContent) {
 		cssLinkscroll.rel = "stylesheet";
 		cssLinkscroll.type = "text/css";
 
+		var cssLinkicons = document.createElement("link");
+		cssLinkicons.href = $("#" + currStyle + "-Icons")[0].href;
+		cssLinkicons.rel = "stylesheet";
+		cssLinkicons.type = "text/css";
+
 		iFrameDoc.open();
 		iFrameDoc.write('<div class="blog-main w-100 " style="display: d-flex;">'); // da pulire...
 		iFrameDoc.write(html);
@@ -106,6 +117,7 @@ function showMinimap(onlyContent) {
 
 		iFrameDoc.head.appendChild(cssLinkb);
 		iFrameDoc.head.appendChild(cssLinkscroll);
+		iFrameDoc.head.appendChild(cssLinkicons);
 
 		let bgCanto = $(visCantoClass).css('background-color');
 		$('iframe').contents().find('body').css('background-color', bgCanto + ' !important;');
diff --git a/js/script_5.2.js b/js/script_5.2.js
index a5cbc60..8384673 100644
--- a/js/script_5.2.js
+++ b/js/script_5.2.js
@@ -724,9 +724,9 @@ $(document).ready(function() {
 
     // Variabili testuali per compattezza
     const iconReset = '<div class="p-0 align-self-start align-items-start justify-content-end text-right"> \
-						<button class="btn btn-sm btn-outline-success bg-light radioReset border rounded text-success px-1 pb-0" style="margin-top: 1px !important;margin-right: 1px !important;"> \
+						<button class="btn btn-sm btn-outline-success bg-light radioReset border rounded text-success p-1" style="margin-top: 1px !important;margin-right: 1px !important; padding-left: .35rem !important; padding-right: .35rem !important; padding-bottom: .1rem !important; padding-top: .15rem !important;"> \
 						<i class="icon icon-refresh-circle"></i></button></div>';
-    const iconCloseCond = '<div class="p-0 mr-3 mt-0 text-right text-success"><span class="iconClClass removeCond"><i class="icon icon-close-circle"></i></span></div>';
+    const iconCloseCond = '<div class="p-0 mr-3 mt-0 text-right text-success"><span class="iconClClass removeCond"><i class="icon icon-close-circle px-1"></i></span></div>';
 	const emptyClaList = '<li id="li-cla0" class="list-group-item align-items-center my-1 ui-state-default ui-state-disabled border text-muted bg-white ui-state-disabled-opacity-06 small">Nessuna clausola aggiunta.</li>';
 	const emptyRifList = '<li id="li-rif0" class="list-group-item align-items-center my-1 ui-state-default ui-state-disabled border text-muted bg-white ui-state-disabled-opacity-06 small">Nessuna clausola aggiunta.</li>';
 	const defaultCond = '<div id="cla-defaultCond" class="col-12 p-1 small font-weight-bold text-muted"> Clausole e condizioni in AND di default</div>';
@@ -1502,7 +1502,7 @@ $(document).ready(function() {
 
 						};
 						if (inactiveLI == 0) {
-							$(iconBtn).attr("class", "btn btn-sm btn-outline-success iconClClass removeCond text-success border rounded px-1 pb-0");
+							$(iconBtn).attr("class", "btn btn-sm btn-outline-success iconClClass removeCond text-success border rounded p-1");
 							$(iconBtn).prop("disabled", false);
 							$(iconDiv).attr("class", "col-md-auto p-0 mr-2 mt-0 text-right text-success");
 						};
@@ -1528,7 +1528,7 @@ $(document).ready(function() {
 							});
 							$(placeholderID).fadeTo(100, 0.9).fadeTo(300, 0.6);
 						};
-						$(iconBtn).attr("class", "btn btn-sm iconClClass NOremoveCond noPrintA text-muted border rounded px-1 pb-0");
+						$(iconBtn).attr("class", "btn btn-sm iconClClass NOremoveCond noPrintA text-muted border rounded p-1");
 						$(iconBtn).prop("disabled", true);
 						$(iconDiv).attr("class", "col-md-auto p-0 mr-2 mt-0 text-right text-muted");
 						break;
@@ -1538,7 +1538,7 @@ $(document).ready(function() {
 								$(placeholderID).remove();
 							});
 						};
-						$(iconBtn).attr("class", "btn btn-sm iconClClass NOremoveCond noPrintA text-muted border rounded px-1 pb-0");
+						$(iconBtn).attr("class", "btn btn-sm iconClClass NOremoveCond noPrintA text-muted border rounded p-1");
 						$(iconBtn).prop("disabled", true);
 						$(iconDiv).attr("class", "col-md-auto p-0 mr-2 mt-0 text-right text-muted");
 						break;