From fceaaf8aa32c9bf85be1ee0806d7514852e8fcfa Mon Sep 17 00:00:00 2001
From: cappadona <cappadona@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 24 Jun 2011 18:30:17 +0000
Subject: [PATCH] Further refinements  and refactoring of QR code display based
 on feedback from Rebecca

---
 .../individual/individual--foaf-person.ftl    |  4 +--
 .../individual-qrCodeFoafPerson.ftl           | 27 -------------------
 .../individual/individual-qrCodeGenerator.ftl | 24 +++++++++++++++++
 3 files changed, 26 insertions(+), 29 deletions(-)
 delete mode 100644 productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl

diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
index 62d45973..a18fefc9 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -3,7 +3,7 @@
 <#-- Individual profile page template for foaf:Person individuals -->
 
 <#include "individual-setup.ftl">
-<#include "individual-qrCodeFoafPerson.ftl">
+<#import "individual-qrCodeGenerator.ftl" as qr>
 
 <section id="individual-intro" class="vcard person" role="region">
 
@@ -34,7 +34,7 @@
                     <li role="listitem"><a title="View this individual in RDF format" class="icon-rdf" href="${rdfUrl}">RDF</a></li>
                 </#if>
                 
-                <@qrCode />
+                <@qr.renderCode />
             </ul>
         </nav>
             
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl
deleted file mode 100644
index 4319c52c..00000000
--- a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeFoafPerson.ftl
+++ /dev/null
@@ -1,27 +0,0 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#include "individual-qrCodeGenerator.ftl">
-
-<#-- This macro will display a vCard QR code (includes email, phone number, URI, etc)
-     * default display is a small icon that reveals the full QR code when clicked
-     * setting the display to "full" will render a full-size QR code (<@qrCode display="full" />)
-     * the size can be set using the width parameter (default is 125px)
- -->
-<#macro qrCode display="icon" width="125">
-    <#if hasValidVCard()>
-        <#assign qrCodeLinkedImage><a title="Export QR codes" href="${individual.doQrData().exportQrCodeUrl}"><@qrCodeVCard qrCodeWidth=width /></a></#assign>
-        
-        <#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.doQrData().exportQrCodeUrl}"><img class="middle" src="${urls.images}/individual/qr_icon.png" alt="qr icon" /></a>
-                <span id="qrCodeImage" class="hide">${qrCodeLinkedImage} <a class="qrCloseLink" href="#">Close</a></span>
-            </li>
-        <#else>
-            <p class="notice">You have passed an invalid value for the qrCode display parameter.</p>
-        </#if>
-        
-    </#if>
-</#macro>
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
index 094830b9..e800c2a1 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
@@ -20,6 +20,30 @@
     </#if>
 </#macro>
 
+<#-- This macro will display a vCard QR code (includes email, phone number, URI, etc)
+     * default display is a small icon that reveals the full QR code when clicked
+     * setting the display to "full" will render a full-size QR code (<@renderCode display="full" />)
+     * the size can be set using the width parameter (default is 125px)
+ -->
+<#macro renderCode display="icon" width="125">
+    <#if hasValidVCard()>
+        <#assign qrCodeLinkedImage><a title="Export QR codes" href="${individual.doQrData().exportQrCodeUrl}"><@qrCodeVCard qrCodeWidth=width /></a></#assign>
+        
+        <#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.doQrData().exportQrCodeUrl}"><img class="middle" src="${urls.images}/individual/qr_icon.png" alt="qr icon" /></a>
+                <span id="qrCodeImage" class="hide">${qrCodeLinkedImage} <a class="qrCloseLink" href="#">Close</a></span>
+            </li>
+        <#else>
+            <p class="notice">You have passed an invalid value for the qrCode display parameter.</p>
+        </#if>
+        
+    </#if>
+</#macro>
+
 
 
 <#function getQrCodeUrlForVCard qrCodeWidth>