From f2f601a395e4e2ddd76148ccf9034d619806d494 Mon Sep 17 00:00:00 2001 From: tworrall Date: Tue, 19 Jun 2012 20:23:53 +0000 Subject: [PATCH] modified formatting in advisorIn list view --- .../body/partials/individual/propStatement-advisorIn.ftl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl index b2324fc5..120ff493 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl @@ -15,10 +15,14 @@ an rdfs:label. So check to see if there's an advisee first. If not, just display the label. --> <#local linkedIndividual> <#if statement.advisee??> - ${statement.adviseeLabel!}, + <#if statement.degreeLabel?? || statement.dateTimeStart?? || statement.dateTimeEnd?? > + ${statement.adviseeLabel!}, + <#else> + ${statement.adviseeLabel!} + <#if statement.degreeLabel??> ${statement.degreeAbbr!statement.degreeLabel!} - <#if statement.dateTimeStart??> candidate,<#else> candidate + <#if statement.dateTimeStart?? || statement.dateTimeEnd?? > candidate,<#else> candidate <#elseif statement.advisoryLabel??> ${statement.advisoryLabel!statement.localName}