فهرست منبع

Update results page

Alessia 1 سال پیش
والد
کامیت
f1c08596f1
6فایلهای تغییر یافته به همراه408 افزوده شده و 513 حذف شده
  1. 0 229
      EvenTime.html
  2. 43 5
      css/evenTime.css
  3. 131 8
      js/geospace.js
  4. 23 13
      js/query/managerQuery.js
  5. 2 72
      js/results_query.js
  6. 209 186
      results.html

+ 0 - 229
EvenTime.html

@@ -1,229 +0,0 @@
-<!doctype html>
-<html>
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-	<meta name="description" content="">
-	<meta name="author" content="">
-
-	<title>Restore - Oggetto</title>
-
-	<link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-	<link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
-	<link href="vendor/simple-line-icons/css/simple-line-icons.css" rel="stylesheet" type="text/css">
-	<link href="https://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
-
-	<link href="css/pages.css" rel="stylesheet">
-	<link href="css/evenTime.css" rel="stylesheet">
-
-	<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-	<script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.2.1.min.js"></script>
-	<script src="https://d3js.org/d3.v4.min.js"></script>
-
-	<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
-	<script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
-
-	<link rel="stylesheet" href="js/dist/MarkerCluster.css" />
-	<link rel="stylesheet" href="js/dist/MarkerCluster.Default.css" />
-	<script src="js/dist/leaflet.markercluster-src.js"></script>
-
-	<link href="css/styles.min.css" rel="stylesheet">
-</head>
-
-<body>
-	<header class="sticky-top">
-		<nav class="navbar navbar-expand-lg navbar-light bg-white">
-			<div class="container-fluid">
-				<div class="navbar-brand">
-					<img src="img/Logo.png" width="100" alt="Restore" />
-				</div>
-				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
-					<span class="navbar-toggler-icon"></span>
-				</button>
-				<div class="collapse navbar-collapse justify-content-end" id="navbarNavDropdown">
-					<ul class="navbar-nav">
-						<li class="nav-item">
-							<a class="nav-link" href="index.html">Home</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" href="http://restore.ovi.cnr.it/">Progetto</a>
-						</li>
-						<li class="nav-item active">
-							<a class="nav-link" href="ricerca.html">Ricerca</a>
-						</li>
-						<!--<li class="nav-item">
-							<a class="nav-link" href="#">Indici</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link" href="#">Percorsi</a>
-						</li>-->
-						<li class="nav-item">
-							<a class="nav-link" href="standard.html">Standard</a>
-						</li>
-						<li class="nav-item dropdown">
-							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Sparql</a>
-							<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-								<a class="dropdown-item" href="http://dev.restore.ovi.cnr.it:8890/sparql/">Endpoint Sparql</a>
-								<a class="dropdown-item" href="sparql.html">Query</a>
-							</div>
-						</li>
-						<!--<li class="nav-item">
-							<a class="nav-link" href="download.html">Download</a>
-						</li>-->
-						<li class="nav-item dropdown">
-							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink1" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Collegamenti esterni</a>
-							<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink1">
-								<a class="dropdown-item" href="http://ckan.restore.ovi.cnr.it/" target="_blank">CKAN</a>
-								<a class="dropdown-item" href="http://dev.restore.ovi.cnr.it/lodlive/" target="_blank">LOD</a>
-							</div>
-						</li>
-					</ul>
-				</div>
-			</div>
-		</nav>
-	</header>
-
-	<main>
-		<section id="container_oggetto">
-			
-
-			<!-- Scheda -->
-			<div class="w-content section-small">
-				<div class="container-fluid">
-					<div class="col box-info">
-						<div class="container-fluid">
-							<div class="row box-info-title">
-								<div class="col">
-									<h1 id="nome_luogo" class="box-info-main-title"></h1>
-								</div>
-							</div>
-                          
-                          	<!-- Scheda -->
-							<div id="myTab" class="tab"></div>
-
-							<div class="row box-info-container">
-								
-								<div class="col-12" id="geo_info">
-									<div class="row no-gutters">
-
-										<div class="col" id="events_map">
-											<div id="map" style="height:400px; width:100%;"></div>
-										</div>
-
-										<div id="containerRight" class="col-4">
-											<div class="row">
-												<div class="col" id="timeline" style="height:400px; width:auto; overflow: auto;"></div>  
-											</div>
-
-
-										</div>
-
-									</div>
-
-									<div class="row">
-										<!--<button id="backToDate" class="backToDate btn btn-default">Back to Date</button>-->
-										<button id="backToAnni" class="backToAnni btn btn-default">Back to Anni</button>
-										
-									</div>
-									<div class="row"> 
-										<div id="list_dates" class="col">
-											<ul id="anni">
-
-											</ul>
-										</div> 
-									</div>
-
-								</div>
-							</div>
-
-							<div id="container_references" class="row box-info-container">
-
-								<div id="references" class="container-fluid">
-									<div class="row">
-
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</section>
-	</main>
-
-	<!-- Modal -->
-	<div id="myModal" class="modal"></div>
-
-	<footer id="footer" class="footer">
-		<div class="container">
-			<div class="row">
-				<div class="col-lg-7 h-100 text-center text-lg-left my-auto">
-					<ul class="list-inline mb-2">
-						<li class="list-inline-item">
-							<a href="#">About</a>
-						</li>
-						<li class="list-inline-item">&sdot;</li>
-						<li class="list-inline-item">
-							<a href="#">Contact</a>
-						</li>
-						<li class="list-inline-item">&sdot;</li>
-						<li class="list-inline-item">
-							<a href="#">Terms of Use</a>
-						</li>
-						<li class="list-inline-item">&sdot;</li>
-						<li class="list-inline-item">
-							<a href="#">Privacy Policy</a>
-						</li>
-					</ul>
-					<p class="small mb-4 mb-lg-0">&copy; RESTORE 2021. All Rights Reserved.</p>
-				</div>
-				<div class="col-lg-5 h-100 text-center my-auto">
-					<ul class="partner-list list-inline mb-0">
-						<li class="list-inline-item mr-3">
-							<a href="#">
-								<img class="img-logo" src="img/CNR.png" />
-							</a>
-						</li>
-						<li class="list-inline-item mr-3">
-							<a href="#">
-								<img class="img-logo" src="img/RegioneToscana.jpg" />
-							</a>
-						</li>
-						<li class="list-inline-item mr-3">
-							<a href="#">
-								<img class="img-logo" src="img/European-Union.png" />
-							</a>
-						</li>
-						<li class="list-inline-item mr-3">
-							<a href="#">
-								<img class="img-logo" src="img/RepubblicaItaliana.png" />
-							</a>
-						</li>
-						<li class="list-inline-item mr-3">
-							<a href="#">
-								<img class="img-logo" src="img/POR-FSE-Regione-Toscana.png" />
-							</a>
-						</li>
-						<li class="list-inline-item">
-							<a href="#">
-								<img class="img-logo" src="img/GiovaniSi.png" />
-							</a>
-						</li>
-					</ul>
-				</div>
-			</div>
-		</div>
-	</footer>
-
-	<script src="js/query/managerQuery.js"></script>
-	<script src="js/utilities.js"></script>
-	<script src="js/geospace.js"></script>
-
-	<!-- Bootstrap core JavaScript -->
-	<script src="vendor/jquery/jquery.min.js"></script>
-	<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
-</body>
-
-</html>

+ 43 - 5
css/evenTime.css

@@ -6,7 +6,7 @@
   height:100px;
   overflow-x: auto;
   margin: 0;
-  border-top: 1px dashed #289ecb;
+  border-top: 1px solid #b61924;
 }
 
 #list_dates ul {
@@ -19,7 +19,7 @@
   width: 50px;
     height: 50px;
     margin: auto;
-    background: #289ecb;
+    background: #b61924;
     color: #fff;
     padding-top: 15px;
     border-radius: 1000px;
@@ -29,8 +29,8 @@
 
 #list_dates li div:hover {
   background-color: #fff;
-  color: #289ecb;
-  border: 1px solid #289ecb;
+  color: #b61924;
+  border: 1px solid #b61924;
 }
 
 #list_dates .date div {
@@ -45,7 +45,7 @@
   position: absolute;
   left: 50%;
   margin-left: -2px;
-  background: #289ecb;
+  background: #b61924;
   border-radius: 1000px;
 }
 
@@ -82,6 +82,7 @@
 
 .yearSeed {
   text-align: center;
+  color: #b61924;
 }
 
 .dateSeed {
@@ -92,4 +93,41 @@
 .eventSeed {
   text-align: justify;
   font-size: 12px;
+}
+
+#backToAnni {
+    background-color: #fff;
+    color: #b61924;
+    border: 1px solid #b61924;
+    margin-bottom: 15px;
+    margin-top: 15px;
+}
+
+#backToAnni:hover {
+  background-color: #b61924;
+  color: #fff;
+  border: 1px solid #b61924;
+}
+
+#lemma_buttons {
+  margin-bottom: 30px;
+    margin-top: -5px;
+}
+
+#lemma_buttons button:not(:last-child) {
+  margin-right: 20px;
+}
+#lemma_buttons button {
+  color: #30383f;
+  font-size: 15px;
+  position:relative;
+  width:12%;
+}
+
+#lemma_buttons button .fa {
+  position:absolute;
+  line-height: 24px;
+  top:50%;
+  margin-top: -12px; /* Half of line height to keep left middle postion of container */
+  left: 10px;
 }

+ 131 - 8
js/geospace.js

@@ -1,9 +1,43 @@
-var link = thisUrlParams.link;
+/*var link = thisUrlParams.link;
 
 prefixes = queryManager['prefixes']['all'];
 
 queryURL = prefixes + (queryManager['queryTimeSpace']['queryTimeLetters']);
-doJsonQuery(queryURL).done(function(data) { manageJson(data); });
+doJsonQuery(queryURL).done(function(data) { manageJson(data); });*/
+
+
+// Raccatto i parametri dall'URL -- mi aspetto un parametro di nome 'link'!
+thisUrlParams = {};
+window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m,key,value) {
+    thisUrlParams[key] = value;
+});
+console.log('URL get params: ', thisUrlParams.params);
+
+var params = thisUrlParams.params;
+const pp = params.split(";");
+var tipo = pp[0];
+
+
+prefixes = queryManager['prefixes']['all'];
+
+if (tipo=="lemma") {
+    var uri_lemma = pp[1];
+    var lemma = pp[2].replace(/%20/g, " ");;
+    queryEsplora = prefixes + (queryManager['queryRES']['queryEsploraDocumenti']).replaceAll('{URI}', uri_lemma);
+    queryMappa = prefixes + (queryManager['queryRES']['queryEsploraMappa']).replaceAll('{URI}', uri_lemma);
+    doJsonQuery(queryEsplora).done(function(r) { handleLemma(r, lemma); });
+    doJsonQuery(queryMappa).done(function(r) { manageJson(r); });
+}
+
+if (tipo=="lettera") {
+    var uri_mittente = pp[2];
+    var uri_destinatario = pp[4];
+    var mittente = pp[1].replace(/%20/g, " ");
+    var destinatario = pp[3].replace(/%20/g, " ");
+    queryLettere = prefixes + (queryManager['queryRES']['queryExchange']).replace('{MITTENTE}', uri_mittente).replace('{DESTINATARIO}', uri_destinatario);
+    doJsonQuery(queryLettere).done(function(r) { handle_Letters(r, mittente, destinatario); });
+
+}
 
 //console.log(luoghi);
 var latitude = 43.8777049;
@@ -23,7 +57,7 @@ var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D7597
       latlng = new L.LatLng(latitude, longitude);
 
   
-var map = new L.Map('map', {center: latlng, zoom: 5, layers: [cloudmade]});
+map = new L.Map('map', {center: latlng, zoom: 5, layers: [cloudmade]});
 mapLink = '<a href="https://openstreetmap.org">OpenStreetMap</a>';
 
 //var markers = new L.MarkerClusterGroup();
@@ -35,16 +69,96 @@ var geo = new L.tileLayer(
     maxZoom: 18,
   }).addTo(map);
 
+
 var markerList = [];
 var markers = new L.MarkerClusterGroup();
 let anni = [];
 let eventi = {};
 
+function handleLemma(json, lemma) {
+
+	let anni = [];
+	
+	thead = '<div class="row def_res"> \
+				<div class="col-10">Documento</div> \
+				<div class="col-2">Esplora</div> \
+			</div>';
+
+	var DocumentsTable = thead;
+
+	var i = 0;
+
+	$.each(
+		json['results']['bindings'],
+		function (index, value) {
+		  	var document = value['document']['value'];
+			var uri_document = value['uri_document']['value'];
+			var uri_info = "";
+			var type = "";
+			var date = "";
+			var year = "";
+			var month = "";
+			var day = "";
+			var sigla = "";
+			var text = "Nessun testo trovato";
+			var object_button = "";
+		
+			if(value.hasOwnProperty('uri_infObj')) {
+				uri_info = value['uri_infObj']['value'];	
+			}
+			if(value.hasOwnProperty('types')) {
+				type = value['types']['value'];
+			}
+			if(value.hasOwnProperty('time_span')) {
+				date = value['time_span']['value'];
+			}
+			if(value.hasOwnProperty('year')) {
+				year = value['year']['value'];
+			}
+			if(value.hasOwnProperty('month')) {
+				month = value['month']['value'];
+			}
+			if(value.hasOwnProperty('day')) {
+				day = value['day']['value'];
+			}
+			if(value.hasOwnProperty('text')) {
+				text = value['text']['value'];
+			}
+			if(value.hasOwnProperty('sigla')) {
+				sigla = value['sigla']['value'];
+			}
+
+			if (type.includes("lettera")) {
+				object_button  = '<button type="button" id="' + uri_info + 
+				'" class="lettera btn btn-default" alt="opera d\'arte" title="' + document + 
+				'"><i class="fa fa-envelope"></i></button>';
+			} else {
+				object_button  = '<button type="button" id="' + uri_document + 
+				'" class="object btn btn-default" alt="oggetto" title="' + document + 
+				'"><i class="fa fa-book"></i></button>';
+			}
+			
+
+			DocumentsTable += '<div class="row res">' +
+			'<div id="' + uri_document + '" class="col-10 object">' + document + '</div>' +
+			'<div class="col-2">' + object_button + '</div>' +
+			'</div>';
+
+			i++;
+
+	});
+
+
+	document.getElementById("lemma_buttons").style.display = "flex";
+	document.getElementById("results_table").innerHTML = DocumentsTable;
+	document.getElementById("results_title").innerHTML = titleCase(lemma);
+
+}
+
 
 function manageJson(json) {
 
   var i=0;
-
   $.each(
     json['results']['bindings'],
     function (index, value) {
@@ -78,11 +192,10 @@ function manageJson(json) {
       i++;
 
     });
-
+ 
     handle_map(eventi);
     manageYears(anni);
-
-    manageEvents(eventi)
+    manageEvents(eventi);
 
 }
 
@@ -142,7 +255,7 @@ function handle_map(myArray) {
     for (var i = 0; i < luoghi.length; i++) {
       var a = luoghi[i];
       
-      var title = "<p>" + titleCase(a[0]) + "</p>";
+      var title = titleCase(a[0]);
       var marker = new L.Marker(new L.LatLng(a[1], a[2]), { title: title });
       //marker.bindPopup(title);
       //marker.on('click', markerOnClick);
@@ -558,3 +671,13 @@ $(document).on("click", "#backToDate", function (ev) {
   manageDates(time_span);   
 
 }); 
+
+function show_list(){
+	document.getElementById("res_container").style.display = "block";
+	document.getElementById("evenTime").style.display = "none";
+}
+
+function show_map(){
+	document.getElementById("res_container").style.display = "none";
+	document.getElementById("evenTime").style.display = "block";
+}

+ 23 - 13
js/query/managerQuery.js

@@ -192,22 +192,32 @@ var queryManager = {
         ?uri_id rdfs:label ?id} \
         LIMIT 1",
 
-        queryEsploraMappa : " SELECT DISTINCT ?place ?label ?coordinates \
+        queryEsploraMappa : " SELECT DISTINCT ?uri_subject ?subject ?uri_place ?uri_infObj ?place ?coords ?time_span ?year ?month ?day ?text \
         WHERE { \
-        VALUES ?uri {<{LEMMA}>} \
-        ?uri_thing crm:P128_carries ?uri . \
+        { ?uri_thing crm:P128_carries <{URI}> . \
         ?uri_infObj crm:P67_refers_to ?uri_thing . \
-        ?uri_document crm:P128_carries ?uri_infObj ; \
-        rdfs:label ?document ; \
-        crm:P25i_moved_by ?mov_ev . \
-        ?ev_send rdfs:subClassOf ?mov_ev ; \
+        } UNION { \
+        ?uri_infObj crm:P67_refers_to <{URI}> . } \
+        ?uri_subject crm:P128_carries ?uri_infObj ; \
+        rdfs:label ?subject .  \
+        ?uri_infObj crm:P190_has_symbolic_content ?text . \
+        ?uri_subject crm:P25i_moved_by ?mov_ev1 . \
+        ?send1 rdfs:subClassOf ?mov_ev1 ; \
+        rdf:type crm:EL2_Send_Letter . \
+        ?send1 crm:P4_has_time-span ?uri_time_span . \
+        ?uri_time_span rdfs:label ?time_span . \
+        ?uri_time_span time:year ?year . \
+        OPTIONAL {?uri_time_span time:month ?month } \
+        OPTIONAL {?uri_time_span time:day ?day } \
+        ?uri_subject crm:P25i_moved_by ?mov_ev2 . \
+        ?send2 rdfs:subClassOf ?mov_ev2 ; \
         rdf:type crm:EL2_Send_Letter ; \
-        crm:P27_moved_from ?place_from . \
-        ?place_from rdf:type crm:E53_Place ; \
-        owl:sameAs ?place . \
-        ?place rdfs:label ?label ; \
-        crm:P168_place_is_defined_by ?coordinates . \
-        }"
+        crm:P27_moved_from ?uri_placeNT . \
+        ?uri_place owl:sameAs ?uri_placeNT ; \
+        rdfs:label ?place ; \
+        crm:P168_place_is_defined_by ?coords . \
+        } \
+        ORDER BY ?year ?month ?day"
 
     },
 

+ 2 - 72
js/results_query.js

@@ -17,9 +17,9 @@ if (tipo=="lemma") {
     var uri_lemma = pp[1];
     var lemma = pp[2].replace(/%20/g, " ");;
     queryEsplora = prefixes + (queryManager['queryRES']['queryEsploraDocumenti']).replaceAll('{URI}', uri_lemma);
-    queryMappa = prefixes + (queryManager['queryRES']['queryEsploraMappa']).replaceAll('{LEMMA}', uri_lemma);
+    queryMappa = prefixes + (queryManager['queryRES']['queryEsploraMappa']).replaceAll('{URI}', uri_lemma);
     doJsonQuery(queryEsplora).done(function(r) { handleLemma(r, lemma); });
-    doJsonQuery(queryMappa).done(function(r) { handle_map(r); });
+    doJsonQuery(queryMappa).done(function(r) { manageJson(r); });
 }
 
 if (tipo=="lettera") {
@@ -31,73 +31,3 @@ if (tipo=="lettera") {
     doJsonQuery(queryLettere).done(function(r) { handle_Letters(r, mittente, destinatario); });
 
 }
-
-
-function prepareQueryURL(query){
-    sparqlEndpoint = 'http://dev.restore.ovi.cnr.it:8890/sparql/';
-    sparqlUrlParams = '?default-graph-uri=&query=' + encodeURIComponent(query) + '&output=json&callback=?';
-    return sparqlEndpoint + sparqlUrlParams;
-}
-
-function doJsonQuery(query) {
-	
-	queryURL = prepareQueryURL(query);
-	return $.ajax({
-		url: queryURL,
-        dataType: "json",
-		type: 'GET'
-    });
-}
-
-// Funzioni per raccattare + stringhificare l'output
-queryStringOutput = "";
-function stringifyResponse(val){
-    resultArray = val['results']['bindings'];
-    out = "";
-    for(i = 0; i < resultArray.length; i++){
-        out = out + JSON.stringify(resultArray[i])
-    }
-    queryStringOutput = (queryStringOutput + out).replace("}{",",");
-}
-
-////////////////////
-// TESTI DELLE QUERY
-////////////////////
-	
-
-/*prefixes = "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \
-PREFIX crm: <http://www.cidoc-crm.org/cidoc-crm/> \
-PREFIX dat: <http://datini.archiviodistato.prato.it/la-ricerca/scheda/> \
-PREFIX mpp: <http://palazzopretorio.comune.prato.it/it/le-opere/alcuni-capolavori/> \
-PREFIX aut: <http://palazzopretorio.comune.prato.it/it/opere/autori/>"
-
-queryLettere = prefixes + " SELECT DISTINCT ?uri_document ?document ?time_span_from ?time_span_to ?uri_place_from ?place_from ?uri_place_to ?place_to \
-{ \
-?event_from rdfs:subClassOf ?event ; \
-rdf:type crm:EL2_Send_Letter . \
-?event_to rdfs:subClassOf ?event ; \
-rdf:type crm:EL3_Receive_Letter . \
-\
-?event_from crm:P01_has_domain ?pc_from . \
-?pc_from crm:P02_has_range <" + uri_mittente + "> . \
-OPTIONAL {?event_from crm:P4_has_time-span ?uri_time_span_from . \
-?uri_time_span_from rdfs:label ?time_span_from} \
-OPTIONAL {?event_from crm:P27_moved_from ?aspo_place_from . \
-?aspo_place_from owl:sameAs ?uri_place_from . \
-?uri_place_from rdfs:label ?place_from ; \
-crm:P168_place_is_defined_by ?coords_from} \
-\
-?event_to crm:P01_has_domain ?pc_to . \
-?pc_to crm:P02_has_range <" + uri_destinatario + "> . \
-OPTIONAL {?event_to crm:P4_has_time-span ?uri_time_span_to . \
-?uri_time_span_to rdfs:label ?time_span_to} \
-OPTIONAL {?event_to crm:P26_moved_to ?aspo_place_to . \
-?aspo_place_to owl:sameAs ?uri_place_to . \
-?uri_place_to rdfs:label ?place_to ; \
-crm:P168_place_is_defined_by ?coords_to} \
-\
-?uri_document crm:P25i_moved_by ?event ; \
-rdfs:label ?document . \
-}"*/
-

+ 209 - 186
results.html

@@ -2,212 +2,235 @@
 <html>
 
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <meta name="description" content="">
-    <meta name="author" content="">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+	<meta name="description" content="">
+	<meta name="author" content="">
 
-    <title>Restore - Approfondimento</title>
+	<title>Restore - Approfondimenti</title>
 
-    <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
-    <link href="vendor/simple-line-icons/css/simple-line-icons.css" rel="stylesheet" type="text/css">
+	<link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+	<link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet">
+	<link href="vendor/simple-line-icons/css/simple-line-icons.css" rel="stylesheet" type="text/css">
+	<link href="https://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
 
-    <link href="css/pages.css" rel="stylesheet">
-    <link href="css/timeline.css" rel="stylesheet">
+	<link href="css/pages.css" rel="stylesheet">
+	<link href="css/evenTime.css" rel="stylesheet">
 
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-    <script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.2.1.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/gh/google/code-prettify@master/loader/run_prettify.js?lang=css&amp;skin=default"></script>
-    <!--<script src="js/jquery.csv.js"></script>
-    <script src="js/query/lemmi.js"></script>-->
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+	<script src="https://ajax.aspnetcdn.com/ajax/jQuery/jquery-3.2.1.min.js"></script>
+	<script src="https://d3js.org/d3.v4.min.js"></script>
 
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
+	<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.css" />
 	<script src="http://cdn.leafletjs.com/leaflet-0.4.4/leaflet.js"></script>
 
 	<link rel="stylesheet" href="js/dist/MarkerCluster.css" />
 	<link rel="stylesheet" href="js/dist/MarkerCluster.Default.css" />
 	<script src="js/dist/leaflet.markercluster-src.js"></script>
 
-
-
-    <link href="css/styles.min.css" rel="stylesheet">
+	<link href="css/styles.min.css" rel="stylesheet">
 </head>
 
 <body>
-    <header class="sticky-top">
-        <nav class="navbar navbar-expand-lg navbar-light bg-white">
-            <div class="container-fluid">
-                <div class="navbar-brand">
-                    <img src="img/Logo.png" width="100" alt="Restore" />
-                </div>
-                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <div class="collapse navbar-collapse justify-content-end" id="navbarNavDropdown">
-                    <ul class="navbar-nav">
-                        <li class="nav-item">
-                            <a class="nav-link" href="index.html">Home</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="http://restore.ovi.cnr.it/">Progetto</a>
-                        </li>
-                        <li class="nav-item active">
-                            <a class="nav-link" href="ricerca.html">Ricerca</a>
-                        </li>
-                        <!--<li class="nav-item">
-                            <a class="nav-link" href="#">Indici</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="#">Percorsi</a>
-                        </li>-->
-                        <li class="nav-item">
-                            <a class="nav-link" href="standard.html">Standard</a>
-                        </li>
-                        <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Sparql</a>
-                            <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                                <a class="dropdown-item" href="http://dev.restore.ovi.cnr.it:8890/sparql/">Endpoint Sparql</a>
-                                <a class="dropdown-item" href="sparql.html">Query</a>
-                            </div>
-                        </li>
-                        <!--<li class="nav-item">
-                            <a class="nav-link" href="download.html">Download</a>
-                        </li>-->
-                        <li class="nav-item dropdown">
-                            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink1" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Collegamenti esterni</a>
-                            <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink1">
-                                <a class="dropdown-item" href="http://ckan.restore.ovi.cnr.it/" target="_blank">CKAN</a>
-                                <a class="dropdown-item" href="http://dev.restore.ovi.cnr.it/lodlive/" target="_blank">LOD</a>
-                            </div>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </nav>
-    </header>
-
-    <main>
-        <section>
-            <div class="w-content section-small">
-                <div class="container-fluid">
-                    <div class="col box-info">
-                        <div class="container-fluid">
-                            <div class="row box-info-title" id="head_standard">
-                                <div class="col">
-                                    <h1 id="results_title" class="box-info-main-title"></h1>
-                                </div>
-                            </div>
+	<header class="sticky-top">
+		<nav class="navbar navbar-expand-lg navbar-light bg-white">
+			<div class="container-fluid">
+				<div class="navbar-brand">
+					<img src="img/Logo.png" width="100" alt="Restore" />
+				</div>
+				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
+					<span class="navbar-toggler-icon"></span>
+				</button>
+				<div class="collapse navbar-collapse justify-content-end" id="navbarNavDropdown">
+					<ul class="navbar-nav">
+						<li class="nav-item">
+							<a class="nav-link" href="index.html">Home</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link" href="http://restore.ovi.cnr.it/">Progetto</a>
+						</li>
+						<li class="nav-item active">
+							<a class="nav-link" href="ricerca.html">Ricerca</a>
+						</li>
+						<!--<li class="nav-item">
+							<a class="nav-link" href="#">Indici</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link" href="#">Percorsi</a>
+						</li>-->
+						<li class="nav-item">
+							<a class="nav-link" href="standard.html">Standard</a>
+						</li>
+						<li class="nav-item dropdown">
+							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Sparql</a>
+							<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+								<a class="dropdown-item" href="http://dev.restore.ovi.cnr.it:8890/sparql/">Endpoint Sparql</a>
+								<a class="dropdown-item" href="sparql.html">Query</a>
+							</div>
+						</li>
+						<!--<li class="nav-item">
+							<a class="nav-link" href="download.html">Download</a>
+						</li>-->
+						<li class="nav-item dropdown">
+							<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink1" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Collegamenti esterni</a>
+							<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink1">
+								<a class="dropdown-item" href="http://ckan.restore.ovi.cnr.it/" target="_blank">CKAN</a>
+								<a class="dropdown-item" href="http://dev.restore.ovi.cnr.it/lodlive/" target="_blank">LOD</a>
+							</div>
+						</li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+	</header>
+
+	<main>
+		<section id="container_oggetto">
+			
+
+			<!-- Scheda -->
+			<div class="w-content section-small">
+				<div class="container-fluid">
+					<div class="col box-info">
+						<div class="container-fluid">
+							<div class="row box-info-title">
+								<div class="col">
+									<h1 id="results_title" class="box-info-main-title"></h1>
+								</div>
+							</div>
 
                             <div id="lemma_buttons" class="justify-content-end" style="display:none;">
-                                <button type="button" class="btn btn-default nav-link active" data-toggle="tab" onclick="show_list()"><i class="fa fa-list" aria-hidden="true"></i>Lista</button>
-                                <button type="button" class="btn btn-default nav-link" data-toggle="tab" onclick="show_timeline()"><i class="fa fa-clock" aria-hidden="true"></i>Timeline</button>
                                 <button type="button" class="btn btn-default nav-link" data-toggle="tab" onclick="show_map()"><i class="fa fa-globe" aria-hidden="true"></i>Mappa</button>
+                                <button type="button" class="btn btn-default nav-link active" data-toggle="tab" onclick="show_list()"><i class="fa fa-list" aria-hidden="true"></i>Lista</button>
                             </div>
 
-                            <div class="container" id="lemmiMappa" style="display:none;">
-                                <div class="row">
-                                    <div class="col" id="place_map">
-                                        <div id="map" style="height:600px;"></div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="container" id="lemmiTimeline" style="display:none;">
-                                <div class="row">
-                                    <div class="col-2" id="anni">
-
-                                    </div>
-                                    <div class="col">
-                                        <ul id="docTimeline" class="timeline">
-                                            <div id="pos">
-                                            </div>
-                                        </ul>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="row box-info-container container-fluid" id="res_container">
-                                <div class="col inner_results" id="results_table">
-                                   
-                                </div>
+                            <div class="row box-info-container container-fluid" id="res_container" style="display:none;">
+                                <div class="col inner_results" id="results_table"></div>
                             </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-                           
-        </section>
-    </main>
-
-    <footer id="footer" class="footer">
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-7 h-100 text-center text-lg-left my-auto">
-                    <ul class="list-inline mb-2">
-                        <li class="list-inline-item">
-                            <a href="#">About</a>
-                        </li>
-                        <li class="list-inline-item">&sdot;</li>
-                        <li class="list-inline-item">
-                            <a href="#">Contact</a>
-                        </li>
-                        <li class="list-inline-item">&sdot;</li>
-                        <li class="list-inline-item">
-                            <a href="#">Terms of Use</a>
-                        </li>
-                        <li class="list-inline-item">&sdot;</li>
-                        <li class="list-inline-item">
-                            <a href="#">Privacy Policy</a>
-                        </li>
-                    </ul>
-                    <p class="small mb-4 mb-lg-0">&copy; RESTORE 2021. All Rights Reserved.</p>
-                </div>
-                <div class="col-lg-5 h-100 text-center my-auto">
-                    <ul class="partner-list list-inline mb-0">
-                        <li class="list-inline-item mr-3">
-                            <a href="#">
-                                <img class="img-logo" src="img/CNR.png" />
-                            </a>
-                        </li>
-                        <li class="list-inline-item mr-3">
-                            <a href="#">
-                                <img class="img-logo" src="img/RegioneToscana.jpg" />
-                            </a>
-                        </li>
-                        <li class="list-inline-item mr-3">
-                            <a href="#">
-                                <img class="img-logo" src="img/European-Union.png" />
-                            </a>
-                        </li>
-                        <li class="list-inline-item mr-3">
-                            <a href="#">
-                                <img class="img-logo" src="img/RepubblicaItaliana.png" />
-                            </a>
-                        </li>
-                        <li class="list-inline-item mr-3">
-                            <a href="#">
-                                <img class="img-logo" src="img/POR-FSE-Regione-Toscana.png" />
-                            </a>
-                        </li>
-                        <li class="list-inline-item">
-                            <a href="#">
-                                <img class="img-logo" src="img/GiovaniSi.png" />
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </footer>
-    <script src="js\query\managerQuery.js"></script>
-    <script src="js\results_query.js"></script>
-    <script src="js\results.js"></script>
-
-    <!-- Bootstrap core JavaScript -->
-    <script src="vendor/jquery/jquery.min.js"></script>
-    <script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
+                            
+                          
+							<div class="row box-info-container" id="evenTime">
+								
+								<div class="col-12" id="geo_info">
+									<div class="row no-gutters">
+
+										<div class="col" id="events_map">
+											<div id="map" style="height:400px; width:100%;"></div>
+										</div>
+
+										<div id="containerRight" class="col-5">
+											<div class="row">
+												<div class="col" id="timeline" style="height:400px; width:auto; overflow: auto;"></div>  
+											</div>
+
+
+										</div>
+
+									</div>
+
+									<div class="row">
+										<!--<button id="backToDate" class="backToDate btn btn-default">Back to Date</button>-->
+										<button id="backToAnni" class="backToAnni btn btn-default"><i class="fa fa-backward" aria-hidden="true"></i> Anni</button>
+										
+									</div>
+									<div class="row"> 
+										<div id="list_dates" class="col">
+											<ul id="anni">
+
+											</ul>
+										</div> 
+									</div>
+
+								</div>
+							</div>
+
+							<div id="container_references" class="row box-info-container">
+
+								<div id="references" class="container-fluid">
+									<div class="row">
+
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</section>
+	</main>
+
+	<!-- Modal -->
+	<div id="myModal" class="modal"></div>
+
+	<footer id="footer" class="footer">
+		<div class="container">
+			<div class="row">
+				<div class="col-lg-7 h-100 text-center text-lg-left my-auto">
+					<ul class="list-inline mb-2">
+						<li class="list-inline-item">
+							<a href="#">About</a>
+						</li>
+						<li class="list-inline-item">&sdot;</li>
+						<li class="list-inline-item">
+							<a href="#">Contact</a>
+						</li>
+						<li class="list-inline-item">&sdot;</li>
+						<li class="list-inline-item">
+							<a href="#">Terms of Use</a>
+						</li>
+						<li class="list-inline-item">&sdot;</li>
+						<li class="list-inline-item">
+							<a href="#">Privacy Policy</a>
+						</li>
+					</ul>
+					<p class="small mb-4 mb-lg-0">&copy; RESTORE 2021. All Rights Reserved.</p>
+				</div>
+				<div class="col-lg-5 h-100 text-center my-auto">
+					<ul class="partner-list list-inline mb-0">
+						<li class="list-inline-item mr-3">
+							<a href="#">
+								<img class="img-logo" src="img/CNR.png" />
+							</a>
+						</li>
+						<li class="list-inline-item mr-3">
+							<a href="#">
+								<img class="img-logo" src="img/RegioneToscana.jpg" />
+							</a>
+						</li>
+						<li class="list-inline-item mr-3">
+							<a href="#">
+								<img class="img-logo" src="img/European-Union.png" />
+							</a>
+						</li>
+						<li class="list-inline-item mr-3">
+							<a href="#">
+								<img class="img-logo" src="img/RepubblicaItaliana.png" />
+							</a>
+						</li>
+						<li class="list-inline-item mr-3">
+							<a href="#">
+								<img class="img-logo" src="img/POR-FSE-Regione-Toscana.png" />
+							</a>
+						</li>
+						<li class="list-inline-item">
+							<a href="#">
+								<img class="img-logo" src="img/GiovaniSi.png" />
+							</a>
+						</li>
+					</ul>
+				</div>
+			</div>
+		</div>
+	</footer>
+
+	<script src="js/query/managerQuery.js"></script>
+	<script src="js/utilities.js"></script>
+	<script src="js/geospace.js"></script>
+
+	<!-- Bootstrap core JavaScript -->
+	<script src="vendor/jquery/jquery.min.js"></script>
+	<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
 </body>
 
 </html>