A few more qr code updates relating to VIVO-17

productMods/js/individual/individualUtils.js

@@ -109,7 +109,7 @@ $(document).ready(function(){
 		// only create the img the first time, so check if it already exists
 		if ( !$('img#codeImage').length ) {		
 			$.ajax({
-            	url: "/vivo/qrCodeAjax",
+            	url: baseUrl + "/qrCodeAjax",
             	dataType: "json",
             	data: {
                 	action: "getQrCodeDetails",
@@ -156,12 +156,15 @@ $(document).ready(function(){
 									  + "</a>";
 									
 							$('#qrCodeImage').prepend(spanStr);
+							$('#qrCodeImage').toggleClass('hidden');
 						}
                  	}
             	}
        		});        
         } 
+		else { 
 			$('#qrCodeImage').toggleClass('hidden');
+		}
     });
 
     // For pubs and grants on the foaf:person profile, and affiliated people

productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl

@@ -163,6 +163,7 @@
 var individualUri = '${individual.uri!}';
 var individualPhoto = '${individual.thumbNail!}';
 var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}';
+var baseUrl = '${urls.base}';
 var profileTypeData = {
     processingUrl: '${urls.base}/edit/primitiveRdfEdit',
     individualUri: '${individual.uri!}',

productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl

@@ -213,6 +213,7 @@
 var individualUri = '${individual.uri!}';
 var individualPhoto = '${individual.thumbNail!}';
 var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}';
+var baseUrl = '${urls.base}';
 var profileTypeData = {
     processingUrl: '${urls.base}/edit/primitiveRdfEdit',
     individualUri: '${individual.uri!}',

productMods/templates/freemarker/body/partials/individual/individual-iconControls.ftl

@@ -3,10 +3,12 @@
 <#-- Icon controls displayed in upper-right corner -->
 
 <img id="uriIcon" title="${individual.uri}" src="${urls.images}/individual/share-uri-icon.png" alt="${i18n().share_the_uri}" />
-<img id="qrIcon"  src="${urls.images}/individual/qr_icon.png" alt="${i18n().qr_icon}" />
+<#if checkNamesResult?has_content >
-<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!} 
+	<img id="qrIcon"  src="${urls.images}/individual/qr-code-icon.png" alt="${i18n().qr_icon}" />
+	<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!} 
 		<a class="qrCloseLink" href="#"  title="${i18n().qr_code}">${i18n().close_capitalized}</a>
-</span>
+	</span>
+</#if>
 
 
 <#--

src/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java

@@ -68,7 +68,6 @@ public class QrCodeDetails extends AbstractAjaxResponder {
 	@Override
 	public String prepareResponse() throws IOException, JSONException {
 		try {
-
             Individual individual = getIndividualFromRequest(vreq);
             String firstName = "";
             String lastName = "";

themes/wilma/templates/individual--foaf-person.ftl

@@ -145,6 +145,7 @@
 	var individualUri = '${individual.uri!}';
 	var individualPhoto = '${individual.thumbNail!}';
 	var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}';
+	var baseUrl = '${urls.base}';
     var i18nStrings = {
         displayLess: '${i18n().display_less}',
         displayMoreEllipsis: '${i18n().display_more_ellipsis}',