Mercurial > hg > ismi-richfaces

changeset 55:e15c7ddeb76c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
made links in public witness display link to openmind (configurable).
author casties
date Fri, 02 Oct 2015 12:59:15 +0000
parents 2e7447712fd1
children ce1cd2450848
files src/main/webapp/imageServer/resources/js/diva4ismi.js
diffstat 1 files changed, 23 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/webapp/imageServer/resources/js/diva4ismi.js	Fri Oct 02 11:52:42 2015 +0000
+++ b/src/main/webapp/imageServer/resources/js/diva4ismi.js	Fri Oct 02 12:59:15 2015 +0000
@@ -4,7 +4,8 @@
 		//rest_url : "https://openmind-ismi-dev.mpiwg-berlin.mpg.de/om4-ismi",
 		//rest_url : "http://ismi-dev.mpiwg-berlin.mpg.de:8080/ismi-richfaces",
 		iipServerURL: "https://images.rasi.mcgill.ca/fcgi-bin/iipsrv.fcgi",
-		drupal_url: "https://ismi-dev.mpiwg-berlin.mpg.de/drupal-ismi"
+		drupal_url: "https://ismi-dev.mpiwg-berlin.mpg.de/drupal-ismi",
+		entity_url: "https://ismi-dev.mpiwg-berlin.mpg.de/om4-ismi/browse/entityDetails.xhtml?eid="
 }
 
 function showTitleDetailsBig(titleId){
@@ -273,36 +274,37 @@
 	var fullTitle = json.data.fullTitle;
 	var fullTitleTranslit = json.data.fullTitleTranslit;
 	var titleContent = new String();
-    /*
-	if(fullTitle){
-		titleContent = "<table><tr><td class='tdTitle' style='width: 300px;''>"+
-		'<a href="../public/dynamicPage.xhtml?eid='+titleId+'">'+fullTitle+"</a>"+'<a href="'+divaGlobal.drupal_url+"/entity/"+titleId+'">(full)</a>'
+    
+	/* here the title is linked to the dynamicPage view
+	if(fullTitle && divaGlobal.entity_url){
+		titleContent = "<table><tr><td class='tdTitle' style='width: 300px; text-align=right;'>"+
+		'<a href="../public/dynamicPage.xhtml?eid='+titleId+'">'+fullTitle+"</a>"+'<a href="'+divaGlobal.entity_url+titleId+'">(full)</a>'
 		+"</td></tr><tr><td class='tdTitle'>"+fullTitleTranslit+"</td></tr></table>";
 	}else{
 		titleContent = "<table><tr><td class='tdTitle'>"+
-		'<a href="../public/dynamicPage.xhtml?eid='+titleId+'">'+fullTitleTranslit+"</a>"+'<a href="'+divaGlobal.drupal_url+"/entity/"+titleId+'">(full)</a>'
+		'<a href="../public/dynamicPage.xhtml?eid='+titleId+'">'+fullTitleTranslit+"</a>"+'<a href="'+divaGlobal.entity_url+titleId+'">(full)</a>'
+		+"</td></tr></table>"
+	}
+	*/
+	
+	/* here the title is linked to the entity_url */
+    if(fullTitle && divaGlobal.entity_url){
+		titleContent = "<table><tr><td class='tdTitle' style='width: 300px; text-align=right;'>"+
+		'<a target="_blank" href="'+divaGlobal.entity_url+titleId+'">'+fullTitle+'</a>'
+		+"</td></tr><tr><td class='tdTitle'>"+fullTitleTranslit+"</td></tr></table>";
+	}else{
+		titleContent = "<table><tr><td class='tdTitle'>"+
+		'<a target="_blank" href="'+divaGlobal.entity_url+titleId+'">'+fullTitleTranslit+'</a>'
 		+"</td></tr></table>"
 	}
 	
-	*/
-	// Below the Translit Title links to it's page on the drupal site. The link was removed for the launch
-	/*
-    if(fullTitle){
-		titleContent = "<table><tr><td class='tdTitle' style='width: 300px;''>"+
-		'<a href="'+divaGlobal.drupal_url+"/entity/"+titleId+'">'+fullTitle+'</a>'
-		+"</td></tr><tr><td class='tdTitle'>"+fullTitleTranslit+"</td></tr></table>";
-	}else{
-		titleContent = "<table><tr><td class='tdTitle'>"+
-		'<a href="'+divaGlobal.drupal_url+"/entity/"+titleId+'">'+fullTitleTranslit+'</a>'
-		+"</td></tr></table>"
-	}
-	*/
+	/* here the title is not linked
 	if(fullTitle){
 		titleContent = "<table><tr><td class='tdTitle' style='width: 300px; text-align:right'>"+fullTitle+"</td></tr>" +
 			"<tr><td class='tdTitle'>"+fullTitleTranslit+"</td></tr></table>";
 	}else{
 		titleContent = "<table><tr><td class='tdTitle'>"+fullTitleTranslit+"</td></tr></table>"
-	}
+	} */
 	var language = json.data.language;
 	var category = json.data.category;
 	var author = json.data.author;
@@ -345,11 +347,7 @@
 	$('#title-misattributions').parent().hide();
     };
 
-/*        var authorContent = '<a href="../public/dynamicPage.xhtml?eid='+authorId+'">'+author+"</a>"+'<a href="'+divaGlobal.drupal_url+"/entity/"+authorId+'">(full)</a>';
-*/     
-    var authorContent = '<a href="'+divaGlobal.drupal_url+"/entity/"+authorId+'">'+author+"</a>";
-    
-
+    var authorContent = '<a target="_blank" href="'+divaGlobal.entity_url+authorId+'">'+author+"</a>";
 
         var referencesContent="<table>";
 	for(var refKey in json.data.references){