NIHVIVO-3114 Fix problems with dump of IndividualTemplateModel.qrData()
This commit is contained in:
ryounes
parent
188f53bf30
commit
1923e41be6
2 changed files with 70 additions and 14 deletions
56
doc/upgrade-1.4.html
Normal file
56
doc/upgrade-1.4.html
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
|
||||
<meta charset="utf-8">
|
||||
<title>VIVO Release 1 V1.4 Upgrade Guide</title>
|
||||
<link rel="stylesheet" href="./css/doc.css" media="screen">
|
||||
</head>
|
||||
<body>
|
||||
<div id="branding" role="banner">
|
||||
<h1 class="vivo-logo"><a href="/"><span class="displace">VIVO</span></a></h1>
|
||||
</div>
|
||||
<!-- Start of content -->
|
||||
<div id="wrapper-content" role="main">
|
||||
<h1>VIVO Release 1 V1.4 Upgrade Guide</h1>
|
||||
<small>
|
||||
Upgrading from Release 1 V1.3 to Release 1 V1.4
|
||||
</small>
|
||||
|
||||
|
||||
<h2>Template changes</h2>
|
||||
<ul>
|
||||
<li><code>${stylesheets.list}</code>, <code>${scripts.list}</code>, and <code>${headscripts.list}</code> have changed to
|
||||
<code>${stylesheets.list()}</code>, <code>${scripts.list()}</code>, and <code>${headscripts.list()}</code>, respectively.
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
|
||||
<!-- #wrapper-content -->
|
||||
<div id="footer" role="contentinfo">
|
||||
<p class="copyright">
|
||||
<small>
|
||||
©2011 All Rights Reserved
|
||||
</small>
|
||||
| Powered
|
||||
by <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank"><strong>VIVO</strong></a>
|
||||
</p>
|
||||
<div id="nav" role="navigation">
|
||||
<ul id="footer-nav" role="list">
|
||||
<li role="listitem">
|
||||
<a href="http://vivoweb.org/about">About</a>
|
||||
</li>
|
||||
<li role="listitem">
|
||||
<a href="http://vivoweb.org/contact">Contact Us</a>
|
||||
</li>
|
||||
<li role="listitem">
|
||||
<a href="http://www.vivoweb.org/support" target="blank">Support</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<!-- #footer -->
|
||||
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -27,14 +27,15 @@
|
|||
-->
|
||||
<#macro renderCode display="icon" width="125">
|
||||
<#if hasValidVCard()>
|
||||
<#assign qrCodeLinkedImage><a title="Export QR codes" href="${individual.qrData().exportQrCodeUrl}"><@qrCodeVCard qrCodeWidth=width /></a></#assign>
|
||||
<#local qrData = individual.qrData()>
|
||||
<#local qrCodeLinkedImage><a title="Export QR codes" href="${qrData.exportQrCodeUrl}"><@qrCodeVCard qrCodeWidth=width /></a></#local>
|
||||
|
||||
<#if (display == "full")>
|
||||
<h5 class="qrCode">vCard QR</h5>
|
||||
${qrCodeLinkedImage}
|
||||
<#elseif (display == "icon")>
|
||||
<li role="listitem">
|
||||
<a id="qrIcon" title="vCard QR Code" href="${individual.qrData().exportQrCodeUrl}"><img class="middle" src="${urls.images}/individual/qr_icon.png" alt="qr icon" /></a>
|
||||
<a id="qrIcon" title="vCard QR Code" href="${qrData.exportQrCodeUrl}"><img class="middle" src="${urls.images}/individual/qr_icon.png" alt="qr icon" /></a>
|
||||
<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage} <a class="qrCloseLink" href="#">Close</a></span>
|
||||
</li>
|
||||
<#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! >
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue