From 3ee4fa10ce6e5bc553b592fbae790b05369df423 Mon Sep 17 00:00:00 2001
From: mbarbier <mbarbier@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 5 Apr 2011 18:46:10 +0000
Subject: [PATCH] individual-qrCodeFoafPerson.ftl: use correct url, add
 hyperlink QR code macro

---
 .../individual-qrCodeFoafPerson.ftl           | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

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&amp;chs=${qrCodeWidth}x${qrCodeWidth}&amp;chl=${vCard}&amp;choe=UTF-8" >
+
+		<img src="${qrCodeUrl}" />
+	</#if>
+</#macro>
+
+
+
+<#macro qrCodeLink qrCodeWidth>
+
+	<#local url = urls.requestedUrl! >
+	<#local qrCodeContent = url?url> 
+	
+	<#if url != "">
+		<#local qrCodeUrl = "https://chart.googleapis.com/chart?cht=qr&amp;chs=${qrCodeWidth}x${qrCodeWidth}&amp;chl=${qrCodeContent}&amp;choe=UTF-8" >
 	
 		<img src="${qrCodeUrl}" />
 	</#if>
 </#macro>
 
+
+
+
 <#function removeBlankLines input>
 
 	<#local test = "\n\n">