Selaa lähdekoodia

Fixed links on buttons

Alessia 2 vuotta sitten
vanhempi
commit
99eea61eda
2 muutettua tiedostoa jossa 49 lisäystä ja 35 poistoa
  1. 3 3
      css/landing-page.css
  2. 46 32
      js/search.js

+ 3 - 3
css/landing-page.css

@@ -570,21 +570,21 @@ table a:hover {
     font-style: italic;
 }
 
-.res a:link {
+.res .title_doc {
     color: #000;
     background-color: transparent;
     text-decoration: none;
     font-weight: bold;
 }
 
-.res a:visited {
+.res .title_doc:visited {
     color: #000;
     background-color: transparent;
     text-decoration: none;
     font-weight: bold;
 }
 
-.res a:hover {
+.res .title_doc:hover {
     color: #C41C22;
     background-color: transparent;
     text-decoration: underline;

+ 46 - 32
js/search.js

@@ -252,6 +252,7 @@ $(document).ready(function () {
 				var mmoType = "";
 				var mmoId = "";
 				var object_button = "";
+				var object_type = "";
 
 				if (value.hasOwnProperty('types')) {
 						mmoType = value['types']['value'];
@@ -262,21 +263,23 @@ $(document).ready(function () {
 					}
 				
 				if (mmoType.includes("Opera d'Arte")) {
+					object_type = "OA";
 					object_button  += '<button type="button" id="' + value['subject']['value'] + 
 					'" class="artwork btn btn-default" alt="opera d\'arte" title="' + value['label']['value'] + 
 					'"><i class="fas fa-paint-brush"></i><p class="btn-text">Scheda Opera d\'Arte</p></button>';
 				} else {
+					object_type = "object";
 					object_button  += '<button type="button" id="' + value['subject']['value'] + 
 					'" class="object btn btn-default" alt="oggetto" title="' + value['label']['value'] + 
 					'"><i class="fa fa-book"></i><p class="btn-text">Scheda Oggetto</p></button>';
 				}
 
 				object += /*INIZIO DIV*/ '<div class="row res"><div class="col-8">' + graph_name + '<br />' +
-				'<a href=' + value['subject']['value'] + ' target="_blank">' + value['label']['value'] + '</a><br />' +
+				'<span id="' + value['subject']['value'] + '" class="title_doc ' + object_type +'">' + value['label']['value'] + '</span><br />' +
 				'<i>' + mmoType + ' ' + mmoId + '</i></div>' +
 				'<div class="col d-flex align-items-start justify-content-end">' + object_button +
-				'<button type="button" id="' + value['subject']['value'] + '" class="cit btn btn-default" alt="scheda" title="Info"><i class="fa fa-quote-right"></i><p class="btn-text">Citazione</p></button>' +
-				/*DA QUI HYPERLINK ->*/'<button type="button" id="' + value['subject']['value'] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
+				'<button type="button" value="' + object_type + '" id="' + value['subject']['value'] + '" class="cit btn btn-default" alt="scheda" title="Info"><i class="fa fa-quote-right"></i><p class="btn-text">Citazione</p></button>' +
+				/*DA QUI HYPERLINK ->*/'<button type="button" value="' + object_type + '" id="' + value['subject']['value'] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
 				/*DA QUI LOD ->*/'<a href="http://dev.restore.ovi.cnr.it/lodlive/?' + value['subject']['value'] + '" 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>';
 
 				i++;
@@ -325,6 +328,8 @@ $(document).ready(function () {
 					let ind = string_text.indexOf(word);
 					let length = word.length;
 					var wl = ind + length;
+					var resource_type = "";
+					var link_type = "";
 					/*var start = 0;
 					var end = 0
 
@@ -386,23 +391,29 @@ $(document).ready(function () {
 						}
 					
 					if (tipo.includes("lettera")) {
+						resource_type = "lettera";
+						link_type = "lettera";
 						infObject_button  += '<button type="button" id="' + value['subject']['value'] + 
 						'" class="lettera btn btn-default" alt="lettera" title="' + value['label']['value'] + 
 						'"><i class="fa fa-envelope"></i><p class="btn-text">Scheda Lettera</p></button>';
 					} else {
+						resource_type = "object";
+						link_type = "object";
 						infObject_button  += '<button type="button" id="' + value['Physical_Object']['value'] + 
 						'" class="object btn btn-default" alt="oggetto" title="' + value['label']['value'] + 
 						'"><i class="fa fa-book"></i><p class="btn-text">Scheda Oggetto</p></button>';
 					}
 
+					'<div class="row res"><div class="col-8"><p>' + graph_name + '<br />' +
+				'<span id="' + value['subject']['value'] + '" class="title_doc luogo">' + value['label']['value'] + '</span></p></div>'
 
 					information += /*INIZIO DIV*/ '<div class="row res"><div class="col-8"><p>'+ snippet+'</p>' + 
 					'In: ' + graph_name + ';<br />' +
-					'<a href=' + value['subject']['value'] + ' target="_blank">' + value['label']['value'] + id + 
-					'</a>;<br /><i>' + tipo + '</i><br /></div>' + 
+					'<span id="' + value['subject']['value'] + '" class="title_doc ' + link_type + '">' + value['label']['value'] + id + 
+					'</span>;<br /><i>' + tipo + '</i><br /></div>' + 
 					'<div class="col d-flex align-items-start justify-content-end">' + infObject_button +
-					'<button type="button" id="' + value['subject']['value'] + '" class="cit btn btn-default" alt="scheda" title="Info"><i class="fa fa-quote-right"></i><p class="btn-text">Citazione</p></button>' +
-					/*DA QUI HYPERLINK ->*/'<button type="button" id="' + value['subject']['value'] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
+					'<button type="button" value="' + resource_type + '" id="' + value['subject']['value'] + '" class="cit btn btn-default" alt="scheda" title="Info"><i class="fa fa-quote-right"></i><p class="btn-text">Citazione</p></button>' +
+					/*DA QUI HYPERLINK ->*/'<button type="button" value="' + resource_type + '" id="' + value['subject']['value'] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
 					/*DA QUI LOD ->*/'<a href="http://dev.restore.ovi.cnr.it/lodlive/?' + value['subject']['value'] + '" 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>';
 
 					i++;
@@ -439,12 +450,12 @@ $(document).ready(function () {
 				var graph = value['graph']['value'];
 				var graph_name = rewrite_graph(graph);
 
-				person += /*INIZIO DIV*/ '<div class="row res"><div class="col-8">' + graph_name + '<br />' +
-				'<a href=' + value['subject']['value'] + ' target="_blank">' + value['name']['value'] + '</a></div>' +
+				person += /*INIZIO DIV*/ '<div class="row res"><div class="col-8"><p>' + graph_name + '<br />' +
+				'<span id="' + value['subject']['value'] + '" class="title_doc persona">' + value['name']['value'] + '</span></p></div>' +
 				'<div class="col d-flex align-items-start justify-content-end"><button type="button" id="' + value['subject']['value'] + '" class="persona btn btn-default" alt="persona" title="' +
 				value['name']['value'] + '"><i class="fa fa-user"></i><p class="btn-text">Scheda Persona</p></button>' +
-				'<button type="button" id="' + value['subject']['value'] + '" class="cit btn btn-default" alt="scheda" title="Info"><i class="fa fa-quote-right"></i><p class="btn-text">Citazione</p></button>' +
-				/*DA QUI HYPERLINK ->*/'<button type="button" id="' + value['subject']['value'] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
+				'<button type="button" value="Persona" id="' + value['subject']['value'] + '" class="cit btn btn-default" alt="scheda" title="Info"><i class="fa fa-quote-right"></i><p class="btn-text">Citazione</p></button>' +
+				/*DA QUI HYPERLINK ->*/'<button type="button" value="Persona" id="' + value['subject']['value'] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
 				/*DA QUI LOD ->*/'<a href="http://dev.restore.ovi.cnr.it/lodlive/?' + value['subject']['value'] + '" 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>';
 
 				i++;
@@ -479,13 +490,13 @@ $(document).ready(function () {
 				var place = ""; /*Inserisci VALUE TIPOLOGIA*/
 				var graph = value['graph']['value'];
 				var graph_name = rewrite_graph(graph);
-
-				place += /*INIZIO DIV*/ '<div class="row res"><div class="col-8">' + graph_name + '<br />' +
-				'<a href=' + value['subject']['value'] + ' target="_blank">' + value['label']['value'] + '</a></div>' +
+				
+				place += /*INIZIO DIV*/ '<div class="row res"><div class="col-8"><p>' + graph_name + '<br />' +
+				'<span id="' + value['subject']['value'] + '" class="title_doc luogo">' + value['label']['value'] + '</span></p></div>' +
 				'<div class="col d-flex align-items-start justify-content-end"><button type="button" id="' + value['subject']['value'] + '" class="luogo btn btn-default" alt="luogo" title="' +
 				value['label']['value'] + '"><i class="fa fa-map"></i><p class="btn-text">Scheda Luogo</p></button>' +
-				'<button type="button" id="' + value['subject']['value'] + '" class="cit btn btn-default" alt="scheda" title="Info"><i class="fa fa-quote-right"></i><p class="btn-text">Citazione</p></button>' +
-				/*DA QUI HYPERLINK ->*/'<button type="button" id="' + value['subject']['value'] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
+				'<button type="button" value="Luogo" id="' + value['subject']['value'] + '" class="cit btn btn-default" alt="scheda" title="Info"><i class="fa fa-quote-right"></i><p class="btn-text">Citazione</p></button>' +
+				/*DA QUI HYPERLINK ->*/'<button type="button" value="Luogo" id="' + value['subject']['value'] + '" class="hyp btn btn-default" alt="scheda" title="Info"><i class="fa fa-link"></i><p class="btn-text">Hyperlink</p></button>' +
 				/*DA QUI LOD ->*/'<a href="http://dev.restore.ovi.cnr.it/lodlive/?' + value['subject']['value'] + '" 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>'; 
 
 				i++;
@@ -524,16 +535,17 @@ $(document).ready(function () {
 
 	$(document).on("click", ".hyp", function (ev) {
 
+		var baseurl = window.location.origin+window.location.pathname;
+		let slash = baseurl.lastIndexOf("/");
+		var type = $(this).val() + '.html';
+		var link = this.id;
+		var url = baseurl.substr(0, slash+1) + type + "?link="+link;
 		var link = this.id;
-		//alert(nome_autore);
-		//$('#myModal').text("");
 		$("#myModal").empty();
 		$("#myModal").css("display", "block");
 		$('#myModal').append("<div class='modal-content'><div class='modal-close'><span class='close'>&times;</span></div><div id='myInput'>" +
-			link + "</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
-
-		
-
+		  url + "</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
+	  
 	});
 
 	$(document).on("click", ".lettera", function (ev) {
@@ -602,29 +614,31 @@ $(document).ready(function () {
 	});
 
 	$(document).on("click", ".cit", function (ev) {
-		
+  
 		var author ="RESTORE. smart access to digital heritage and memory"
-
+	  
 		var year = new Date().getFullYear()
-
+	  
 		var today = new Date();
 		var dd = String(today.getDate()).padStart(2, '0');
 		var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
 		var yyyy = today.getFullYear();
-
+	  
 		today = dd + '/' + mm + '/' + yyyy;
-
+	  
+		var baseurl = window.location.origin+window.location.pathname;
+		let slash = baseurl.lastIndexOf("/");
+		var type = $(this).val() + '.html';
 		var link = this.id;
+		var url = baseurl.substr(0, slash+1) + type + "?link="+link;
 		//alert(nome_autore);
 		//$('#myModal').text("");
 		$("#myModal").empty();
 		$("#myModal").css("display", "block");
 		$('#myModal').append("<div class='modal-content'><div class='modal-close'><span class='close'>&times;</span></div><div id='myInput'>" + 
-			author + " " + year + ", accesso effettuato: " + today + ", &lt;" + link + "&gt;</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
-
-		
-
-	});
+		  author + " " + year + ", accesso effettuato: " + today + ", &lt;" + url + "&gt;</div><button id='copy_btn' class='btn btn-theme-primary btn-md' onclick='myFunction()'>Copia</button>");
+	  
+	  });
 
 	$(document).on("click", ".scheda", function (ev) {