From 144c724a00d87675fc0868d879fe1bfd75bd4f8d Mon Sep 17 00:00:00 2001
From: Luca Trupiano <luca.trupiano@isti.cnr.it>
Date: Tue, 5 Dec 2023 16:38:44 +0100
Subject: [PATCH] Modifiche grafiche e ai collapse, problema ridotto ma non
 risolto

---
 index_4.4.html     |  6 ++---
 js/cesareBrowse.js | 58 +++++++++++++++++++++++++---------------------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/index_4.4.html b/index_4.4.html
index 4532e93..9c56772 100644
--- a/index_4.4.html
+++ b/index_4.4.html
@@ -114,8 +114,8 @@
 								<select class="custom-select text-muted bg-light border border-secondary"
 									id="valoreVista">
 									<option value="forme">Forme</option>
-									<option value="frasi">Frasi</option>
-									<option value="citazioni">Citazioni</option>
+									<option value="frasi">Periodi</option>
+									<option value="riferimenti">Riferimenti</option>
 									<option value="dialoghi">Dialoghi</option>
 									<option value="metafore">Metafore</option>
 								</select>
@@ -471,7 +471,7 @@
 							<div class="d-table-cell p-0 pt-1" style="background-color: rgba(0,0,0,.03);">
 								<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"><ion-icon name="create"></ion-icon></span>
+										<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"><ion-icon name="document-attach"></ion-icon></span>
 										<span class="h6 btn-link"> Commenti</span></a>
 									</li>
 									<li class="nav-item" role="presentation">
diff --git a/js/cesareBrowse.js b/js/cesareBrowse.js
index 02532b7..b08d0db 100644
--- a/js/cesareBrowse.js
+++ b/js/cesareBrowse.js
@@ -741,7 +741,6 @@ function resetFrasi(){
 			canto='0'+canto
 		//console.log(cantica+', '+canto)
 		commentsArray=getVersiConCitazioni(cantica, canto)
-
 		//console.log("Array prima")
 		//console.log(commentsArray)
 
@@ -791,7 +790,7 @@ function resetFrasi(){
 		for (var pos in commentsArray){
 			console.log("Id: "+id);
 			var noteCard = $('<div class="card card-body well well-sm m-1 mt-2 p-0" id="noteCard' + id + '">');			
-			var collapseCardBody = $('<div class="card-body p-0 mx-1 mb-1 border rounded" >');
+			var collapseCardBody = $('<div class="card-body px-0 py-2 mx-1 mb-1 mt-0 border rounded" >');
 			var divCampiSingoli = $('<div class="d-flex align-content-start flex-wrap text-muted">');
 
 			var comments = commentsArray[pos]
@@ -842,15 +841,15 @@ function resetFrasi(){
 		var titoloFonte = "";
 		var luogoFonte = "";
 		var commentHeader = $('<div class="d-flex align-content-start flex-nowrap text-muted" id="commentoVerso' + id + '_' + pos + '">')
-		var rigaNota = $('<div class="p-2 mt-1">');
+		var rigaNota = $('<div class="px-3 py-1 mt-1">');
 		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 mb-auto text-primary align-self-end px-1 pb-0"'+
+				'class="btn btn-sm btn-outline-primary bg-light collapseNote border rounded text-primary align-self-end px-1 pb-0"'+
 				'data-toggle="collapse" data-target="#collapseNote'+id+ '_' + pos +'"'+
 				'aria-expanded="true" aria-controls="collapseNote'+id+ '_' + pos +'">'+
 				'<ion-icon name="archive"></ion-icon>');
 		var closeButton = $('<button id="closeNote'+id+ '_' + pos +'"'+
-				'class="btn btn-sm btn-outline-primary bg-light closeNote border rounded mb-auto text-primary align-self-end px-1 pb-0 ml-1">'+
+				'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">'+
 				'<ion-icon name="close-circle"></ion-icon>');
 		
 		rigaNota.append('<b>' + cantica + '</b><i>' + ", Canto " + getRoman(parcid[2]) + " Verso " + parcid[3] + "</i> - ");
@@ -894,31 +893,34 @@ function resetFrasi(){
 	}
 	
 	function createDivSingola(divCampi, campo, valore){
-		var divSingola = $('<div class="p-2">');
+		var divSingola = $('<div class="px-3 py-1">');
 		divSingola.append ('<b>'+campo+'</b><i>  '+valore+'</i>');
 		divSingola.appendTo(divCampi);
 	}
 
 	function createModule(collapse,label, testo, num, id, pos){
-		var divModule = $('<div class="module pb-0">');
-		var divNote = $('<div class="collapse" id="collapse'+num+'Note'+id+ '_' + pos +'" aria-expanded="false">')
+		console.log(label+": "+testo.length);
 		var divContent = $('<div class="d-flex align-content-start flex-wrap text-muted">');
-		var divTesto = $('<div class="p-2">')
+		var divTesto = $('<div class="px-3 py-1">')
 		var nota = '<b>'+label+'</b>'+testo;
-		divModule.append('<a class="read-more collapsed" data-toggle="collapse" href="#collapse'+num+'Note'+id+ '_' + pos +'" role="button"></a>')
       	divTesto.append(nota);
       	divContent.append(divTesto);
-      	divNote.append(divContent)
-      	divModule.append(divNote);
-      	divModule.appendTo(collapse);
+		if (testo.length > 260) {
+			var divModule = $('<div class="module pb-0">');
+			var divNote = $('<div class="collapse" id="collapse'+num+'Note'+id+ '_' + pos +'" aria-expanded="false">')
+			divModule.append('<a class="read-more collapsed" data-toggle="collapse" href="#collapse'+num+'Note'+id+ '_' + pos +'" role="button"></a>')
+	      	divNote.append(divContent)
+	      	divModule.append(divNote);
+	      	divModule.appendTo(collapse);
+		} else {
+			divContent.appendTo(collapse);
+		}
 	}
 	
 	function createModuleCommentatore(collapse, commento, num, id, pos){
 		var commentoCommentatore = commento.split(',');
-		var divModule = $('<div class="module pb-0">');
-		var divNote = $('<div class="collapse" id="collapse'+num+'Note'+id+ '_' + pos +'" aria-expanded="false">')
 		var divContent = $('<div class="d-flex align-content-start flex-wrap text-muted">');
-		var divTesto = $('<div class="p-2">')
+		var divTesto = $('<div class="px-3 py-1">')
 		var nota;
 		var urlCommento = commentoCommentatore[0];
 		var position = urlCommento.indexOf("https");
@@ -942,16 +944,21 @@ function resetFrasi(){
 		} else {
 			nota = '<b>Rapporto Commento/Commentatore: </b>'+esitoCommento +' <a href="'+urlCommento+'"target="_blank"<i>' + autoreCommento+ '</i></a>, ' +  '</b><br>';
 		}
-		divModule.append('<a class="read-more collapsed" data-toggle="collapse" href="#collapse'+num+'Note'+id+ '_' + pos +'" role="button"></a>')
-      	divTesto.append(nota);
+		divTesto.append(nota);
       	divContent.append(divTesto);
-      	divNote.append(divContent)
-      	divModule.append(divNote);
-      	divModule.appendTo(collapse);
+		if (nota.length > 260) {
+			var divModule = $('<div class="module pb-0">');
+			var divNote = $('<div class="collapse" id="collapse'+num+'Note'+id+ '_' + pos +'" aria-expanded="false">')
+			divModule.append('<a class="read-more collapsed" data-toggle="collapse" href="#collapse'+num+'Note'+id+ '_' + pos +'" role="button"></a>')
+	      	divNote.append(divContent)
+	      	divModule.append(divNote);
+	      	divModule.appendTo(collapse);
+		} else {
+			divContent.appendTo(collapse);
+		}
 	}
 
 	function hasComments(cid){
-		
 		var id = cid.substr(9);
 		for (var pos in commentsArray){
 			var comments = commentsArray[pos]
@@ -964,14 +971,13 @@ function resetFrasi(){
 	}
 
 	function numberOfComments(cid){
-		
 		var id = cid.substr(9);
 		//[....].filter(x => x==2).length
 		return commentsArray.filter(x => x.verso==id).length
-		
 	}
-	
-/*FINE GESTIONE CITAZIONI*/
+
+	/*FINE GESTIONE CITAZIONI*/
+
 	function getCantica(numeroCantica){
 	
 		switch (numeroCantica){