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

A few more qr code updates relating to VIVO-17

Browse source
This commit is contained in:
Tim Worrall 2014-10-06 10:52:45 -04:00
parent 1c118fc044
commit 604a8d273f
6 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -109,7 +109,7 @@ $(document).ready(function(){
// only create the img the first time, so check if it already exists // only create the img the first time, so check if it already exists
if ( !$('img#codeImage').length ) { if ( !$('img#codeImage').length ) {
$.ajax({ $.ajax({
url: "/vivo/qrCodeAjax", url: baseUrl + "/qrCodeAjax",
dataType: "json", dataType: "json",
data: { data: {
action: "getQrCodeDetails", action: "getQrCodeDetails",
@ -156,12 +156,15 @@ $(document).ready(function(){
+ "</a>"; + "</a>";
$('#qrCodeImage').prepend(spanStr); $('#qrCodeImage').prepend(spanStr);
$('#qrCodeImage').toggleClass('hidden');
} }
} }
} }
}); });
} }
$('#qrCodeImage').toggleClass('hidden'); else {
$('#qrCodeImage').toggleClass('hidden');
}
}); });
// For pubs and grants on the foaf:person profile, and affiliated people // For pubs and grants on the foaf:person profile, and affiliated people

1
productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
View file

@ -163,6 +163,7 @@
var individualUri = '${individual.uri!}'; var individualUri = '${individual.uri!}';
var individualPhoto = '${individual.thumbNail!}'; var individualPhoto = '${individual.thumbNail!}';
var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}'; var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}';
var baseUrl = '${urls.base}';
var profileTypeData = { var profileTypeData = {
processingUrl: '${urls.base}/edit/primitiveRdfEdit', processingUrl: '${urls.base}/edit/primitiveRdfEdit',
individualUri: '${individual.uri!}', individualUri: '${individual.uri!}',

1
productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
View file

@ -213,6 +213,7 @@
var individualUri = '${individual.uri!}'; var individualUri = '${individual.uri!}';
var individualPhoto = '${individual.thumbNail!}'; var individualPhoto = '${individual.thumbNail!}';
var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}'; var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}';
var baseUrl = '${urls.base}';
var profileTypeData = { var profileTypeData = {
processingUrl: '${urls.base}/edit/primitiveRdfEdit', processingUrl: '${urls.base}/edit/primitiveRdfEdit',
individualUri: '${individual.uri!}', individualUri: '${individual.uri!}',

10
productMods/templates/freemarker/body/partials/individual/individual-iconControls.ftl
View file

@ -3,10 +3,12 @@
<#-- Icon controls displayed in upper-right corner --> <#-- Icon controls displayed in upper-right corner -->
<img id="uriIcon" title="${individual.uri}" src="${urls.images}/individual/share-uri-icon.png" alt="${i18n().share_the_uri}" /> <img id="uriIcon" title="${individual.uri}" src="${urls.images}/individual/share-uri-icon.png" alt="${i18n().share_the_uri}" />
<img id="qrIcon" src="${urls.images}/individual/qr_icon.png" alt="${i18n().qr_icon}" /> <#if checkNamesResult?has_content >
<span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!} <img id="qrIcon" src="${urls.images}/individual/qr-code-icon.png" alt="${i18n().qr_icon}" />
<a class="qrCloseLink" href="#" title="${i18n().qr_code}">${i18n().close_capitalized}</a> <span id="qrCodeImage" class="hidden">${qrCodeLinkedImage!}
</span> <a class="qrCloseLink" href="#" title="${i18n().qr_code}">${i18n().close_capitalized}</a>
</span>
</#if>
<#-- <#--

1
src/edu/cornell/mannlib/vitro/webapp/controller/ajax/QrCodeDetails.java
View file

@ -68,7 +68,6 @@ public class QrCodeDetails extends AbstractAjaxResponder {
@Override @Override
public String prepareResponse() throws IOException, JSONException { public String prepareResponse() throws IOException, JSONException {
try { try {
Individual individual = getIndividualFromRequest(vreq); Individual individual = getIndividualFromRequest(vreq);
String firstName = ""; String firstName = "";
String lastName = ""; String lastName = "";

1
themes/wilma/templates/individual--foaf-person.ftl
View file

@ -145,6 +145,7 @@
var individualUri = '${individual.uri!}'; var individualUri = '${individual.uri!}';
var individualPhoto = '${individual.thumbNail!}'; var individualPhoto = '${individual.thumbNail!}';
var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}'; var exportQrCodeUrl = '${urls.base}/qrcode?uri=${individual.uri!}';
var baseUrl = '${urls.base}';
var i18nStrings = { var i18nStrings = {
displayLess: '${i18n().display_less}', displayLess: '${i18n().display_less}',
displayMoreEllipsis: '${i18n().display_more_ellipsis}', displayMoreEllipsis: '${i18n().display_more_ellipsis}',