From d3287a7493b6fa3a9a591dd4a56cd9b3bf905027 Mon Sep 17 00:00:00 2001 From: mbarbier Date: Wed, 6 Apr 2011 20:28:25 +0000 Subject: [PATCH] individual--foaf-person.ftl: updated commented-out QR code sample to add link to "about" page IndividualTemplateModel.java: add link to "about" page to QR data --- .../body/individual/individual--foaf-person.ftl | 9 ++++++++- .../individual/IndividualTemplateModel.java | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 70ecebc7..1c370931 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -70,7 +70,14 @@ <#-- Links --> <@p.vitroLinks propertyGroups namespaces editable "individual-urls-people" /> - <#-- <@qrCodeVCard qrCodeWidth="150" /> --> + <#-- +
+ vCard QR What is this? + + <@qrCodeVCard qrCodeWidth="150" /> + +
+ -->
diff --git a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java index 9e831ef7..75f112c4 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java +++ b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java @@ -115,6 +115,8 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel { String contextPath = vreq.getContextPath(); qrData.put("exportQrCodeUrl", contextPath + "/qrcode?uri=" + UrlBuilder.urlEncode(individualUri)); + qrData.put("aboutQrCodesUrl", contextPath + "/qrcode/about"); + return qrData; } }