diff --git a/doc/upgrade-1.4.html b/doc/upgrade-1.4.html
new file mode 100644
index 00000000..4c63f8e3
--- /dev/null
+++ b/doc/upgrade-1.4.html
@@ -0,0 +1,56 @@
+
+
+
+
+
+ VIVO Release 1 V1.4 Upgrade Guide
+
+
+
+
+
+
+
VIVO Release 1 V1.4 Upgrade Guide
+
+ Upgrading from Release 1 V1.3 to Release 1 V1.4
+
+
+
+
Template changes
+
+ ${stylesheets.list}
, ${scripts.list}
, and ${headscripts.list}
have changed to
+ ${stylesheets.list()}
, ${scripts.list()}
, and ${headscripts.list()}
, respectively.
+
+
+
+
+
+
+
+
+
+
+
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
index ba5655d3..11be27d6 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
@@ -27,14 +27,15 @@
-->
<#macro renderCode display="icon" width="125">
<#if hasValidVCard()>
- <#assign qrCodeLinkedImage><@qrCodeVCard qrCodeWidth=width /> #assign>
+ <#local qrData = individual.qrData()>
+ <#local qrCodeLinkedImage><@qrCodeVCard qrCodeWidth=width /> #local>
<#if (display == "full")>
vCard QR
${qrCodeLinkedImage}
<#elseif (display == "icon")>
-
+
${qrCodeLinkedImage} Close
<#else>
@@ -48,7 +49,7 @@
<#function getQrCodeUrlForVCard qrCodeWidth>
- <#local qrData = individual.qrData() >
+ <#local qrData = individual.qrData()>
<#local core = "http://vivoweb.org/ontology/core#">
<#local foaf = "http://xmlns.com/foaf/0.1/">
@@ -63,21 +64,20 @@
<#local url = qrData.externalUrl! >
<#local photo = individual.thumbUrl! >
<#local rev = "" >
-
- <#local qrCodeUrl = "">
+
<#if firstName != "" && lastName != "">
<#local vCard><#t>
BEGIN:VCARD<#lt>
VERSION:3.0<#lt>
N:${lastName};${firstName}<#lt>
FN:${firstName} ${lastName}<#lt>
- <#if org != ""> ORG:${org}#if><#lt>
- <#if title != "">TITLE:${title}#if><#lt>
- <#if phoneNumber != "">TEL;TYPE=WORK,VOICE:${phoneNumber}#if><#lt>
- <#if email != "">EMAIL;TYPE=PREF,INTERNET:${email}#if><#lt>
- <#if url != "">URL:${url}#if><#lt>
- <#if photo != "">PHOTO;VALUE=URL;TYPE=JPG:${photo}#if><#lt>
- <#if rev != "">REV:${rev}#if><#lt>
+ <#if org?has_content> ORG:${org}#if><#lt>
+ <#if title?has_content>TITLE:${title}#if><#lt>
+ <#if phoneNumber?has_content>TEL;TYPE=WORK,VOICE:${phoneNumber}#if><#lt>
+ <#if email?has_content>EMAIL;TYPE=PREF,INTERNET:${email}#if><#lt>
+ <#if url?has_content>URL:${url}#if><#lt>
+ <#if photo?has_content>PHOTO;VALUE=URL;TYPE=JPG:${photo}#if><#lt>
+ <#if rev?has_content>REV:${rev}#if><#lt>
END:VCARD<#t>
#local><#t>
@@ -93,7 +93,7 @@
<#function getQrCodeUrlForLink qrCodeWidth>
- <#local qrData = individual.qrData() >
+ <#local qrData = individual.qrData()>
<#local url = qrData.externalUrl! >
@@ -129,7 +129,7 @@
<#function hasValidVCard>
- <#local qrData = individual.qrData() >
+ <#local qrData = individual.qrData()>
<#local firstName = qrData.firstName! >
<#local lastName = qrData.lastName! >