Bug fix

js/customPages.js

@@ -42,7 +42,7 @@ function handle_contrassegni(json){
 
 	thead = '<div class="row def_res"> \
 				<div class="col">Contrassegni</div> \
-				<div class="col">Esplora</div> \
+				<div class="col-3">Esplora</div> \
 			</div>';
 
 	var ContrassegniTable = thead;
@@ -52,14 +52,15 @@ function handle_contrassegni(json){
 		function (index, value) {
 		  	var uri = value['subject']['value'];
 			var label = value['label']['value'];
+			var uri_ct = value['uri_contrassegno']['value'];
 
 			ContrassegniTable += '<div class="row res"> \
-			<div class="col object" id="' + uri + '">' + label + '</div> \
-			<div class="col"><button title="Apri risorsa originale" class="btn btn-default" type="button" onclick="schedaASPO(\'' + uri + '\')"> \
+			<div class="col object link" id="' + uri + '">' + label + '</div> \
+			<div class="col-3"><button title="Apri risorsa originale" class="btn btn-default" type="button" onclick="schedaASPO(\'' + uri_ct + '\')"> \
 			<i class="fas fa-external-link-alt" aria-hidden="true"></i><p class="btn-text">Link</p></button> \
 			<button type="button" id="' + uri + 
 			'" class="object btn btn-default" alt="oggetto" title="' + label + 
-			'"><i class="fa fa-book"></i><p class="btn-text">Scheda Oggetto</p></button></div></div>' ;
+			'"><i class="fa fa-book"></i><p class="btn-text">Oggetto</p></button></div></div>' ;
 			
 
 	});
@@ -74,7 +75,7 @@ function handle_occupation(json, occ) {
 	
 	thead = '<div class="row def_res"> \
 				<div class="col">Persona</div> \
-				<div class="col">Esplora</div> \
+				<div class="col-3">Esplora</div> \
 			</div>';
 
 	var PeopleTable = thead;
@@ -116,9 +117,8 @@ function handle_occupation(json, occ) {
 			stringName = titleCase(stringName);
 
 			PeopleTable += '<div class="row res"> \
-			<div class="col persona" id="' + uri + '">' + stringName + '</div> \
-			<div class="col"><button title="Apri risorsa originale" class="btn btn-default" type="button" onclick="schedaASPO(\'' + uri + '\')"> \
-			<i class="fas fa-external-link-alt" aria-hidden="true"></i><p class="btn-text">Link</p></button> \
+			<div class="col persona link" id="' + uri + '">' + stringName + '</div> \
+			<div class="col-3"> \
 			<button type="button" id="' + uri + 
 			'" class="persona btn btn-default" alt="oggetto" title="' + stringName + 
 			'"><i class="fa fa-user"></i><p class="btn-text">Persona</p></button></div></div>' ;

js/geospace.js

@@ -683,8 +683,8 @@ function manageEvents(events) {
 				'" class="object btn btn-default" alt="oggetto" title="' + soggetto + 
 				'"><p class="geo-text">Vedi scheda oggetto <i class="fa fa-book"></i></p></button>';
 
-    Eventi = '<div data-point="' + coordinates + '"  class="row event"> \
-    <div class="col eventSeed"><div style="cursor:zoom-in;" class="row">' + soggetto + '</div><div class="row justify-content-end">' + object_button +'</div> \
+    Eventi = '<div class="row event"> \
+    <div class="col eventSeed"><div data-point="' + coordinates + '" style="cursor:zoom-in;" class="row event_title">' + soggetto + '</div><div class="row justify-content-end">' + object_button +'</div> \
     <div class="row">' + testo + '</div></div></div>';
     //<div class="col-2"><div class="row">' + object_button + '</div></div></div>';
   
@@ -781,7 +781,7 @@ $(document).on("mouseover", ".event", function(){
   map.setView([lat, lng], zoom);
 });
 */
-$(document).on("click", ".event", function(){
+$(document).on("click", ".event_title", function(){
   // parse lat and lng from the divs data attribute
   var latlng = $(this).data().point.split(', ');
   var lat = latlng[0];

js/object.js

@@ -210,11 +210,19 @@ function handle_contrassegni(json) {
   
   }
 
+  var Buttons = '<button title="Apri risorsa originale" class="btn btn-default" type="button" onclick="schedaASPO(\'' + uri + '\')"> \
+        <i class="fas fa-external-link-alt" aria-hidden="true"></i></button> \
+        <button title="Citazione" type="button" value="object" id="' + uri + '" class="cit btn btn-default" alt="scheda" title="Citazione"><i class="fa fa-quote-right"></i></button> \
+        <button title="Permalink" type="button" value="object" id="' + uri + '" class="hyp btn btn-default" alt="scheda" title="Hyperlink"><i class="fa fa-link"></i></button> \
+        <a href="http://dev.restore.ovi.cnr.it/lodlive/?' + uri + '" target="_blank"><button type="button" title="Naviga il grafo" class="btn btn-default info" alt="LOD" title="LodLive"><i class="fa fa-share-alt"></i></button></a></div></div>';
+
+
   var dataset = get_graph_name(graph);
 
 
   document.getElementById("nome_oggetto").innerHTML = contrassegno;
   document.getElementById("grafo").innerHTML = dataset;
+  document.getElementById("link_buttons").innerHTML = Buttons;
   
 
 }

js/query/managerQuery.js

@@ -1115,10 +1115,11 @@ var queryManager = {
 
     queryCustom : {
 
-        queryTipo : " SELECT DISTINCT ?subject ?label \
-        WHERE {GRAPH ?g {?subject rdf:type crm:E22_Man-Made_Object} \
-        ?subject crm:P2_has_type '{TYPE}' ; \
-        rdfs:label ?label . \
+        queryTipo : " SELECT DISTINCT ?subject ?uri_contrassegno ?label \
+        WHERE {  \
+        ?subject crm:P138_represents ?uri_contrassegno . \
+        ?uri_contrassegno rdfs:label ?label ; \
+        crm:P2_has_type '{TYPE}' . \
         }",
 
         queryOccupazione : "SELECT DISTINCT ?subject ?name ?id ?givenName ?familyName ?patronymic ?provenienza SAMPLE(?occupation) AS ?occupation \