diff --git a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl index ca13b8c7..f80dd206 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl @@ -32,7 +32,7 @@ END:VCARD <#local title = qrData.preferredTitle! > <#local phoneNumber = qrData.phoneNumber! > <#local email = qrData.email! > - <#local url = urls.currentPage! > + <#local url = urls.requestedUrl! > <#local photo = individual.thumbUrl! > <#local rev = "" > @@ -55,11 +55,28 @@ END:VCARD <#local vCard = (removeBlankLines(vCard))?url> <#local qrCodeUrl = "https://chart.googleapis.com/chart?cht=qr&chs=${qrCodeWidth}x${qrCodeWidth}&chl=${vCard}&choe=UTF-8" > + + + + + + + +<#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" > + + + <#function removeBlankLines input> <#local test = "\n\n">