litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source
This commit is contained in:
cappadona 2011-07-01 22:15:12 +00:00
parent 50e15f9c0c
commit 21c03c35f0
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
productMods/js/individual/individualUtils.js
View file

@ -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;
});
});

2
productMods/templates/freemarker/body/partials/individual/individual-qrCodeGenerator.ftl
View file

@ -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>