From a41a1780395f7f94780092f71ccc20ff26c7e58e Mon Sep 17 00:00:00 2001 From: Luca Trupiano Date: Wed, 6 Dec 2023 16:24:03 +0100 Subject: [PATCH] Creato archivio file vecchi, modifiche live di Gaia --- .../NikBrowseSearch.html | 0 .../NikBrowseSearchCombined.html | 0 .../NikBrowseSearchCombinedNew.html | 0 .../NikBrowseSearchCombinedNewcesare.html | 0 .../cesareBrowse.html | 0 {css => archive/css}/browsingldc.css | 0 {css => archive/css}/browsingldcnick.css | 0 {css => archive/css}/custom.css | 0 {css => archive/css}/custom1_4.2.css | 0 {css => archive/css}/custom2_4.2.css | 0 {css => archive/css}/custom_4.2.css | 0 {css => archive/css}/custom_4.css | 0 {css => archive/css}/datatables.min.css | 0 .../css}/jquery.highlight-within-textarea.css | 0 {css => archive/css}/style.css | 0 index.html => archive/index.html | 0 .../index_3.3bis.html | 0 index_4.1.html => archive/index_4.1.html | 0 index_4.2.html => archive/index_4.2.html | 0 index_4.3.html => archive/index_4.3.html | 0 index_4.html => archive/index_4.html | 0 index_Nik.html => archive/index_Nik.html | 0 index_work.html => archive/index_work.html | 0 .../index_work_Nik.html | 0 .../index_work_grid.html | 0 {js => archive/js}/NikBrowseSearch.js | 0 {js => archive/js}/NikBrowseSearchCombined.js | 0 .../js}/NikBrowseSearchCombinedNew.js | 0 {js => archive/js}/cesareBrowseNick.js | 0 {js => archive/js}/cesareBrowse_buono.js | 0 {js => archive/js}/guimanager.js | 0 {js => archive/js}/guimanagerNik.js | 0 {js => archive/js}/minimap.js | 0 {js => archive/js}/script_3.3.js | 0 {js => archive/js}/script_4.1.js | 0 {js => archive/js}/script_4.2.js | 0 {js => archive/js}/script_4.js | 0 script.js => archive/script.js | 0 style.css => archive/style.css | 0 js/cesareBrowse.js | 57 +++++++++++-------- 40 files changed, 34 insertions(+), 23 deletions(-) rename NikBrowseSearch.html => archive/NikBrowseSearch.html (100%) rename NikBrowseSearchCombined.html => archive/NikBrowseSearchCombined.html (100%) rename NikBrowseSearchCombinedNew.html => archive/NikBrowseSearchCombinedNew.html (100%) rename NikBrowseSearchCombinedNewcesare.html => archive/NikBrowseSearchCombinedNewcesare.html (100%) rename cesareBrowse.html => archive/cesareBrowse.html (100%) rename {css => archive/css}/browsingldc.css (100%) rename {css => archive/css}/browsingldcnick.css (100%) rename {css => archive/css}/custom.css (100%) rename {css => archive/css}/custom1_4.2.css (100%) rename {css => archive/css}/custom2_4.2.css (100%) rename {css => archive/css}/custom_4.2.css (100%) rename {css => archive/css}/custom_4.css (100%) rename {css => archive/css}/datatables.min.css (100%) rename {css => archive/css}/jquery.highlight-within-textarea.css (100%) rename {css => archive/css}/style.css (100%) rename index.html => archive/index.html (100%) rename index_3.3bis.html => archive/index_3.3bis.html (100%) rename index_4.1.html => archive/index_4.1.html (100%) rename index_4.2.html => archive/index_4.2.html (100%) rename index_4.3.html => archive/index_4.3.html (100%) rename index_4.html => archive/index_4.html (100%) rename index_Nik.html => archive/index_Nik.html (100%) rename index_work.html => archive/index_work.html (100%) rename index_work_Nik.html => archive/index_work_Nik.html (100%) rename index_work_grid.html => archive/index_work_grid.html (100%) rename {js => archive/js}/NikBrowseSearch.js (100%) rename {js => archive/js}/NikBrowseSearchCombined.js (100%) rename {js => archive/js}/NikBrowseSearchCombinedNew.js (100%) rename {js => archive/js}/cesareBrowseNick.js (100%) rename {js => archive/js}/cesareBrowse_buono.js (100%) rename {js => archive/js}/guimanager.js (100%) rename {js => archive/js}/guimanagerNik.js (100%) rename {js => archive/js}/minimap.js (100%) rename {js => archive/js}/script_3.3.js (100%) rename {js => archive/js}/script_4.1.js (100%) rename {js => archive/js}/script_4.2.js (100%) rename {js => archive/js}/script_4.js (100%) rename script.js => archive/script.js (100%) rename style.css => archive/style.css (100%) diff --git a/NikBrowseSearch.html b/archive/NikBrowseSearch.html similarity index 100% rename from NikBrowseSearch.html rename to archive/NikBrowseSearch.html diff --git a/NikBrowseSearchCombined.html b/archive/NikBrowseSearchCombined.html similarity index 100% rename from NikBrowseSearchCombined.html rename to archive/NikBrowseSearchCombined.html diff --git a/NikBrowseSearchCombinedNew.html b/archive/NikBrowseSearchCombinedNew.html similarity index 100% rename from NikBrowseSearchCombinedNew.html rename to archive/NikBrowseSearchCombinedNew.html diff --git a/NikBrowseSearchCombinedNewcesare.html b/archive/NikBrowseSearchCombinedNewcesare.html similarity index 100% rename from NikBrowseSearchCombinedNewcesare.html rename to archive/NikBrowseSearchCombinedNewcesare.html diff --git a/cesareBrowse.html b/archive/cesareBrowse.html similarity index 100% rename from cesareBrowse.html rename to archive/cesareBrowse.html diff --git a/css/browsingldc.css b/archive/css/browsingldc.css similarity index 100% rename from css/browsingldc.css rename to archive/css/browsingldc.css diff --git a/css/browsingldcnick.css b/archive/css/browsingldcnick.css similarity index 100% rename from css/browsingldcnick.css rename to archive/css/browsingldcnick.css diff --git a/css/custom.css b/archive/css/custom.css similarity index 100% rename from css/custom.css rename to archive/css/custom.css diff --git a/css/custom1_4.2.css b/archive/css/custom1_4.2.css similarity index 100% rename from css/custom1_4.2.css rename to archive/css/custom1_4.2.css diff --git a/css/custom2_4.2.css b/archive/css/custom2_4.2.css similarity index 100% rename from css/custom2_4.2.css rename to archive/css/custom2_4.2.css diff --git a/css/custom_4.2.css b/archive/css/custom_4.2.css similarity index 100% rename from css/custom_4.2.css rename to archive/css/custom_4.2.css diff --git a/css/custom_4.css b/archive/css/custom_4.css similarity index 100% rename from css/custom_4.css rename to archive/css/custom_4.css diff --git a/css/datatables.min.css b/archive/css/datatables.min.css similarity index 100% rename from css/datatables.min.css rename to archive/css/datatables.min.css diff --git a/css/jquery.highlight-within-textarea.css b/archive/css/jquery.highlight-within-textarea.css similarity index 100% rename from css/jquery.highlight-within-textarea.css rename to archive/css/jquery.highlight-within-textarea.css diff --git a/css/style.css b/archive/css/style.css similarity index 100% rename from css/style.css rename to archive/css/style.css diff --git a/index.html b/archive/index.html similarity index 100% rename from index.html rename to archive/index.html diff --git a/index_3.3bis.html b/archive/index_3.3bis.html similarity index 100% rename from index_3.3bis.html rename to archive/index_3.3bis.html diff --git a/index_4.1.html b/archive/index_4.1.html similarity index 100% rename from index_4.1.html rename to archive/index_4.1.html diff --git a/index_4.2.html b/archive/index_4.2.html similarity index 100% rename from index_4.2.html rename to archive/index_4.2.html diff --git a/index_4.3.html b/archive/index_4.3.html similarity index 100% rename from index_4.3.html rename to archive/index_4.3.html diff --git a/index_4.html b/archive/index_4.html similarity index 100% rename from index_4.html rename to archive/index_4.html diff --git a/index_Nik.html b/archive/index_Nik.html similarity index 100% rename from index_Nik.html rename to archive/index_Nik.html diff --git a/index_work.html b/archive/index_work.html similarity index 100% rename from index_work.html rename to archive/index_work.html diff --git a/index_work_Nik.html b/archive/index_work_Nik.html similarity index 100% rename from index_work_Nik.html rename to archive/index_work_Nik.html diff --git a/index_work_grid.html b/archive/index_work_grid.html similarity index 100% rename from index_work_grid.html rename to archive/index_work_grid.html diff --git a/js/NikBrowseSearch.js b/archive/js/NikBrowseSearch.js similarity index 100% rename from js/NikBrowseSearch.js rename to archive/js/NikBrowseSearch.js diff --git a/js/NikBrowseSearchCombined.js b/archive/js/NikBrowseSearchCombined.js similarity index 100% rename from js/NikBrowseSearchCombined.js rename to archive/js/NikBrowseSearchCombined.js diff --git a/js/NikBrowseSearchCombinedNew.js b/archive/js/NikBrowseSearchCombinedNew.js similarity index 100% rename from js/NikBrowseSearchCombinedNew.js rename to archive/js/NikBrowseSearchCombinedNew.js diff --git a/js/cesareBrowseNick.js b/archive/js/cesareBrowseNick.js similarity index 100% rename from js/cesareBrowseNick.js rename to archive/js/cesareBrowseNick.js diff --git a/js/cesareBrowse_buono.js b/archive/js/cesareBrowse_buono.js similarity index 100% rename from js/cesareBrowse_buono.js rename to archive/js/cesareBrowse_buono.js diff --git a/js/guimanager.js b/archive/js/guimanager.js similarity index 100% rename from js/guimanager.js rename to archive/js/guimanager.js diff --git a/js/guimanagerNik.js b/archive/js/guimanagerNik.js similarity index 100% rename from js/guimanagerNik.js rename to archive/js/guimanagerNik.js diff --git a/js/minimap.js b/archive/js/minimap.js similarity index 100% rename from js/minimap.js rename to archive/js/minimap.js diff --git a/js/script_3.3.js b/archive/js/script_3.3.js similarity index 100% rename from js/script_3.3.js rename to archive/js/script_3.3.js diff --git a/js/script_4.1.js b/archive/js/script_4.1.js similarity index 100% rename from js/script_4.1.js rename to archive/js/script_4.1.js diff --git a/js/script_4.2.js b/archive/js/script_4.2.js similarity index 100% rename from js/script_4.2.js rename to archive/js/script_4.2.js diff --git a/js/script_4.js b/archive/js/script_4.js similarity index 100% rename from js/script_4.js rename to archive/js/script_4.js diff --git a/script.js b/archive/script.js similarity index 100% rename from script.js rename to archive/script.js diff --git a/style.css b/archive/style.css similarity index 100% rename from style.css rename to archive/style.css diff --git a/js/cesareBrowse.js b/js/cesareBrowse.js index bd01da7..a7f4902 100644 --- a/js/cesareBrowse.js +++ b/js/cesareBrowse.js @@ -804,15 +804,15 @@ function resetFrasi(){ createModule(collapseCardBody,"Testo della fonte: ", comments.TestoFonteCitazione, "1", id, pos) } if (comments.NaturaRiferimento != null){ - createDivSingola(divCampiSingoli, "Tipo Riferimento: ", comments.NaturaRiferimento) + createDivSingola(divCampiSingoli, "Tipo di riferimento: ", comments.NaturaRiferimento) divCampiSingoli.appendTo(collapseCardBody); } - if (comments.commentario != null){ - createDivSingola(divCampiSingoli, "Commentatore: ", comments.commentario) - divCampiSingoli.appendTo(collapseCardBody); - } + //if (comments.commentario != null){ + // createDivSingola(divCampiSingoli, "Commentatore: ", comments.commentario) + // divCampiSingoli.appendTo(collapseCardBody); + //} if (comments.RapportoSoggettoOggetto != null){ - createDivSingola(divCampiSingoli, "Rapporto Testo/Fonte: ", comments.RapportoSoggettoOggetto.charAt(0)+comments.RapportoSoggettoOggetto.substring(1).toLowerCase()) + createDivSingola(divCampiSingoli, "Rapporto testo/fonte: ", comments.RapportoSoggettoOggetto) divCampiSingoli.appendTo(collapseCardBody); } if (comments.RapportoCommentoCommentatoreText != null && comments.RapportoCommentoCommentatoreText != "nan"){ @@ -822,7 +822,7 @@ function resetFrasi(){ createModule(collapseCardBody,"Nota: ", comments.frammentoNota, "7", id, pos) } if (comments.annotazione != null && comments.annotazione != "nan"){ - createModule(collapseCardBody,"Annotazione completa: ", comments.annotazione, "6", id, pos) + createModule(collapseCardBody,"Nota completa: ", comments.annotazione, "6", id, pos) } if (comments.NotaFonteCitazione != null && comments.NotaFonteCitazione != "nan" && comments.NotaFonteCitazione != ""){ createModule(collapseCardBody,"Nota dell'annotatore: ", comments.NotaFonteCitazione, "8", id, pos) @@ -852,9 +852,14 @@ function resetFrasi(){ '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">'+ ''); - rigaNota.append('' + cantica + '' + ", Canto " + getRoman(parcid[2]) + " Verso " + parcid[3] + " - "); + rigaNota.append('' + cantica + '' + ", Canto " + getRoman(parcid[2]) + ", Verso " + parcid[3] + "
"); collapseButton.appendTo(buttons); closeButton.appendTo(buttons); + + if (comments.commentario != null){ + rigaNota.append('Commentatore: ' + comments.commentario + '
'); + } + if (comments.NomeAutoreCitazione == null) { nomeAutore = 'riferimento'; @@ -863,7 +868,7 @@ function resetFrasi(){ nomeAutore = comments.NomeAutoreCitazione; } if (comments.AutoreCitazione != null) { - rigaNota.append('Autore della fonte: ' + nomeAutore + ', '); + rigaNota.append('Autore della fonte: ' + nomeAutore + ' '); } else { rigaNota.append('Autore della fonte: ' + nomeAutore + ''); } @@ -873,9 +878,9 @@ function resetFrasi(){ titoloFonte = comments.TitoloFonteCitazione; } if (comments.FonteCitazione != null) { - rigaNota.append('Fonte: ' + titoloFonte + ', '); + rigaNota.append(' Fonte: ' + titoloFonte + ' '); } else { - rigaNota.append('Fonte: ' + titoloFonte + ''); + rigaNota.append(' Fonte: ' + titoloFonte + ''); } if (comments.LuogoFonteCitazione == null) { luogoFonte = "riferimento"; @@ -883,9 +888,9 @@ function resetFrasi(){ luogoFonte = comments.LuogoFonteCitazione; } if (comments.URLFonteCitazione != null) { - rigaNota.append('Coordinate della Fonte: ' + luogoFonte + ',
'); + rigaNota.append(' Coordinate della Fonte: ' + luogoFonte + '
'); } else { - rigaNota.append('Coordinate della Fonte: ' + luogoFonte + '
'); + rigaNota.append(' Coordinate della Fonte: ' + luogoFonte + '
'); } rigaNota.appendTo(commentHeader); buttons.appendTo(commentHeader); @@ -918,25 +923,31 @@ function resetFrasi(){ } function createModuleCommentatore(collapse, commento, num, id, pos){ - let mycomment = commento.replaceAll("'", '"') - let commentJson=JSON.parse(mycomment); - + var commentoCommentatore = commento.split(','); var divContent = $('
'); var divTesto = $('
') var nota; - var urlCommento = commentJson.Commento; - var esitoCommento = commentJson.Rapporto.charAt(0) + commentJson.Rapporto.substring(1).toLowerCase(); - var autoreCommento = commentJson.Autore + var urlCommento = commentoCommentatore[0]; + var position = urlCommento.indexOf("https"); + urlCommento = urlCommento.substring(position) + urlCommento = urlCommento.replaceAll("'", ""); + var esitoCommento = commentoCommentatore[3]; + esitoCommento = esitoCommento.replace("'Rapporto': ", "") + esitoCommento = esitoCommento.replaceAll("'", ""); + esitoCommento = esitoCommento.replaceAll('}', ""); + var autoreCommento = commentoCommentatore[1]+' '+commentoCommentatore[2]; + autoreCommento = autoreCommento.replace(" 'Autore':", "") + autoreCommento = autoreCommento.replaceAll("'", ""); if (autoreCommento == "") { - autoreCommento = "Autore" + autoreCommento = "Commento" } if (esitoCommento == "") { - esitoCommento = "NA " + esitoCommento = "Rapporto nullo" } if (urlCommento == "") { - nota = 'Rapporto Commento/Commentatore: '+esitoCommento+' Commento nullo, '+'
'; + nota = 'Rapporto commento/commentatore: '+esitoCommento+' Commento nullo, '+'
'; } else { - nota = 'Rapporto Commento/Commentatore: '+esitoCommento +' ' + autoreCommento+ '' + '
'; + nota = 'Rapporto commento/commentatore: '+esitoCommento +' ' + autoreCommento+ ', ' + '
'; } divTesto.append(nota); divContent.append(divTesto);