From 906b3f9863afe137cf78731fcae06882e3411041 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Thu, 13 Jan 2011 23:54:28 +0000 Subject: [PATCH] NIHVIVO-1332 Editing links for vitro link properties. Restore lines that were incorrectly commented out in previous commit. Move ftl for displaying links from an include to a macro, to parameterize the ul class value. --- .../freemarker/body/individual/individual--foaf-person.ftl | 5 ++--- .../templates/freemarker/body/individual/individual.ftl | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index 3d1e5937..50b5d8d6 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -63,9 +63,8 @@ - <#-- Links --> - <#assign linkListClass = "individual-urls-people"> - <#include "individual-links.ftl"> + <#-- Links --> + <@p.vitroLinks propertyGroups editing "individual-urls-people" />
diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/productMods/templates/freemarker/body/individual/individual.ftl index 8e5fc8e2..1ee163b5 100644 --- a/productMods/templates/freemarker/body/individual/individual.ftl +++ b/productMods/templates/freemarker/body/individual/individual.ftl @@ -54,7 +54,7 @@ <#-- Links --> - <#include "individual-links.ftl"> + <@p.vitroLinks propertyGroups editing />