individual-qrCodeFoafPerson.ftl: use correct url, add hyperlink QR code macro
This commit is contained in:
parent
3766dc25bd
commit
3ee4fa10ce
1 changed files with 18 additions and 1 deletions
|
@ -32,7 +32,7 @@ END:VCARD
|
||||||
<#local title = qrData.preferredTitle! >
|
<#local title = qrData.preferredTitle! >
|
||||||
<#local phoneNumber = qrData.phoneNumber! >
|
<#local phoneNumber = qrData.phoneNumber! >
|
||||||
<#local email = qrData.email! >
|
<#local email = qrData.email! >
|
||||||
<#local url = urls.currentPage! >
|
<#local url = urls.requestedUrl! >
|
||||||
<#local photo = individual.thumbUrl! >
|
<#local photo = individual.thumbUrl! >
|
||||||
<#local rev = "" >
|
<#local rev = "" >
|
||||||
|
|
||||||
|
@ -60,6 +60,23 @@ END:VCARD
|
||||||
</#if>
|
</#if>
|
||||||
</#macro>
|
</#macro>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<#macro qrCodeLink qrCodeWidth>
|
||||||
|
|
||||||
|
<#local url = urls.requestedUrl! >
|
||||||
|
<#local qrCodeContent = url?url>
|
||||||
|
|
||||||
|
<#if url != "">
|
||||||
|
<#local qrCodeUrl = "https://chart.googleapis.com/chart?cht=qr&chs=${qrCodeWidth}x${qrCodeWidth}&chl=${qrCodeContent}&choe=UTF-8" >
|
||||||
|
|
||||||
|
<img src="${qrCodeUrl}" />
|
||||||
|
</#if>
|
||||||
|
</#macro>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<#function removeBlankLines input>
|
<#function removeBlankLines input>
|
||||||
|
|
||||||
<#local test = "\n\n">
|
<#local test = "\n\n">
|
||||||
|
|
Loading…
Add table
Reference in a new issue