From 21c03c35f02995cb06f03fdae92e737900149b27 Mon Sep 17 00:00:00 2001
From: cappadona <cappadona@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 1 Jul 2011 22:15:12 +0000
Subject: [PATCH] Reverted change from r3147. The bug was in the JS, not in the
 markup. We want the exportQrCodeUrl as the href value for the link, this way
 we provide graceful degradation in the absence of JavaScript.

---
 productMods/js/individual/individualUtils.js                   | 3 +--
 .../body/partials/individual/individual-qrCodeGenerator.ftl    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/productMods/js/individual/individualUtils.js b/productMods/js/individual/individualUtils.js
index b39beaa2..7f98f5c2 100644
--- a/productMods/js/individual/individualUtils.js
+++ b/productMods/js/individual/individualUtils.js
@@ -8,7 +8,7 @@ $(document).ready(function(){
     // Change background color button when verbose mode is off
     $('a#verbosePropertySwitch:contains("Turn off")').addClass('verbose-off');
 
-    // This function creates and styles the "qTip" tooltip that displays the resource uri when the user clicks the uri icon.
+    This function creates and styles the "qTip" tooltip that displays the resource uri when the user clicks the uri icon.
     $('#uriIcon').each(function()
     {
        $(this).qtip(
@@ -44,7 +44,6 @@ $(document).ready(function(){
     // Reveal vCard QR code when QR icon is clicked
     $('#qrIcon, .qrCloseLink').click(function() {
         $('#qrCodeImage').toggleClass('hidden');
-        event.preventDefault();  //duplicates return false but necessary for IE
         return false;
     });
 });
\ 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 8455a22a..b470db70 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
@@ -34,7 +34,7 @@
             ${qrCodeLinkedImage}
         <#elseif (display == "icon")>
             <li role="listitem">
-                <a id="qrIcon" title="vCard QR Code" href="#"><img class="middle" src="${urls.images}/individual/qr_icon.png" alt="qr icon" /></a>
+                <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="hidden">${qrCodeLinkedImage} <a class="qrCloseLink" href="#">Close</a></span>
             </li>
         <#else>