Alessia 1 rok pred
rodič
commit
727c20ecc2
6 zmenil súbory, kde vykonal 238 pridanie a 10 odobranie
  1. 195 0
      EvenTime.html
  2. 5 0
      css/lettera.css
  3. 10 0
      css/pages.css
  4. 5 0
      css/place_people.css
  5. 19 6
      js/object.js
  6. 4 4
      js/query/managerQuery.js

+ 195 - 0
EvenTime.html

@@ -0,0 +1,195 @@
+<!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">
+
+	<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">
+			<div id="col_graph">
+				<div class="w-content">
+					<div class="container-fluid">
+						<div class="row">
+							<div class="col-auto">
+								<span>Dataset:</span>
+							</div>
+							<div class="col-10" id="grafo"></div>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<!-- Scheda -->
+			<div id="myTab" class="tab"></div>
+
+			<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_oggetto" class="box-info-main-title"></h1>
+								</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/object.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>

+ 5 - 0
css/lettera.css

@@ -487,3 +487,8 @@ header.masthead {
 .explore {
   color: #b61924;
 }
+
+#link_buttons button[title]:hover::after {
+  content: attr(title);
+  margin-left: 10px;
+}

+ 10 - 0
css/pages.css

@@ -358,4 +358,14 @@ a {
 
 .res:not(:last-child) {
   border-bottom: 1px solid #000;
+}
+
+#link_buttons button[title]:hover::after {
+  content: attr(title);
+  margin-left: 10px;
+  /*left: 0; 
+  transition: 2s;
+  position: absolute;
+  top: -100%;
+  left: 0;*/
 }

+ 5 - 0
css/place_people.css

@@ -546,4 +546,9 @@ text.source {
 .res-events-container tbody th {
   padding-top: 15px;
   padding-bottom: 15px;
+}
+
+#link_buttons button[title]:hover::after {
+  content: attr(title);
+  margin-left: 10px;
 }

+ 19 - 6
js/object.js

@@ -97,8 +97,8 @@ function handle_objectData(json) {
         }
 
         if (uri_composed != "") {
-          button_doc = '<button title="Apri risorsa di livello superiore" id="' + uri_composed + '" class="object btn btn-default" type="button" title="Bene culturale" > \
-          <i class="fa fa-book" aria-hidden="true">	<p class="btn-text">Bene culturale</p></i></button>';
+          button_doc = '<button title="Apri risorsa di livello superiore" id="' + uri_composed + '" class="object btn btn-default" type="button" > \
+          <i class="fa fa-book" aria-hidden="true">	<p class="btn-text">Livello superiore</p></i></button>';
         }
 
         if (owner != "") {
@@ -229,17 +229,30 @@ function handle_citedPeople(json) {
     function (index, value) {
         var uri = value['uri_person']['value'];
         var name = value['name']['value'];
-        var tipo = "";
+        var tipo1 = "";
+        var tipo2 = "";
         var nota = "";
       
         if (value.hasOwnProperty('types')) {
           if (value['types']['value'] != "") {
-            tipo = value['types']['value'];
+            tipo1 = value['types']['value'];
+          }
+        }
+        if (value.hasOwnProperty('types2')) {
+          if (value['types2']['value'] != "") {
+            tipo2 = value['types2']['value'];
           }
         }
         if (value.hasOwnProperty('note')) {
           nota = value['note']['value'];
         } 
+        
+      var tipo = "";
+      if (tipo2 != "") {
+        tipo = tipo2;
+      } else {
+        tipo = tipo1;
+      }
 
       people.push([uri, name, tipo, nota]);
       
@@ -250,7 +263,7 @@ function handle_citedPeople(json) {
     for (var i=0; i<people.length; i++) {
       var object = '<div class="col-8"><p><span id="' + people[i][0] + '" class="title_doc persona">'+ people[i][1] + '</span>';
       if (people[i][2] != "") {
-        object = object + "<br />Citazione nel ruolo di: " + people[i][2];
+        object = object + "<br />Ruoli documentati: " + people[i][2];
       }
       if (people[i][3] != "") {
         object = object + "<br />Nota: " + people[i][3];
@@ -260,7 +273,7 @@ function handle_citedPeople(json) {
     
       Person +=  '<div class="row res">' + object +
       '<div class="col d-flex align-items-start justify-content-end"><button type="button" id="' + people[i][0] + '" class="persona btn btn-default" alt="persona" title="' +
-      people[i][1] + '"><i class="fa fa-user"></i><p class="btn-text">Scheda Persona</p></button>' +
+      people[i][1] + '"><i class="fa fa-user"></i><p class="btn-text">Persona</p></button>' +
       '<button type="button" value="Persona" id="' + people[i][0] + '" class="cit btn btn-default" alt="scheda" title="Info"><i class="fa fa-quote-right"></i><p class="btn-text">Citazione</p></button>' +
       '<button value="Persona" type="button" id="' + people[i][0] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
       '<a href="http://dev.restore.ovi.cnr.it/lodlive/?' + people[i][0] + '" target="_blank"><button type="button" class="btn btn-default info" alt="LOD"><i class="fa fa-share-alt"></i><p class="btn-text">Lod</p></button></a></div></div>';

+ 4 - 4
js/query/managerQuery.js

@@ -603,7 +603,7 @@ var queryManager = {
             GRAPH <http://dev.restore.ovi.cnr.it:8890/ovi/datini> {?InfObj rdf:type crm:E73_Information_Object } } \
             } ",
 
-            queryPersone : " SELECT DISTINCT ?uri_person ?name (group_concat(distinct ?p_type ; separator=', ') as ?types) ?person_note ?note \
+            queryPersone : " SELECT DISTINCT ?uri_person ?name (group_concat(distinct ?p_type ; separator=', ') as ?types) (group_concat(distinct ?person_note ; separator=', ') as ?types2) ?note \
             WHERE { \
             VALUES ?uri {<{URI}>} \
             { \
@@ -612,9 +612,6 @@ var queryManager = {
             ?uri_person foaf:name ?name ; \
             crm:P2_has_type ?person_type . \
             ?person_type rdfs:label ?p_type . \
-            OPTIONAL {?uri_person crm:P3_has_note ?uri_person_note . \
-            ?uri_person_note rdfs:label ?person_note; \
-            crm:P2_has_type 'Nota collegamento con gettatello' . } \
             } UNION { \
             ?uri crm:P92i_was_brought_into_existence_by ?creation . \
             ?creation crm:P67_refers_to ?uri_person . \
@@ -636,6 +633,9 @@ var queryManager = {
             crm:P14.1_in_the_role_of ?uri_role . \
             ?uri_role rdfs:label ?p_type . \
             ?uri_person rdfs:label ?name . \
+            OPTIONAL {?uri_person crm:P3_has_note ?uri_person_note . \
+            ?uri_person_note rdfs:label ?person_note; \
+            crm:P2_has_type 'Nota collegamento con gettatello' . } \
             } \
             }",