From 6829fc83d1fb1027e2dc684038b81a44538e6a2c Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Fri, 22 Nov 2013 14:47:42 -0500
Subject: [PATCH] tweaked a prop-statement list view template

---
 .../individual/propStatement-relatedRole.ftl    | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
index 21187494..5329107c 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
@@ -28,25 +28,16 @@
          so use the type label instead if not collated by subclass.
     -->
     <#local roleLabel>
-    <#-- 
-            Display, e.g., "Principal Investigator" for "Principal Investigator Role", "Editor" for "Editor Role".
-            This information is redundant if the property is collated, since it appears in the subclass label.
-    -->
        
         <#if statement.roleTypeLabel?has_content>
-            <#assign roleTypeLabel = statement.roleTypeLabel >
-        <#else>
-            <#assign roleTypeLabel = "" >
+            <#assign roleTypeLabel = statement.roleTypeLabel!"" >
         </#if>
-        <#if statement.roleLabel?has_content>
-            <#if statement.roleLabel?lower_case?replace(" role", "") != roleTypeLabel?lower_case?replace(" role", "")>
-                ${statement.roleLabel?replace(" Role", "")}
-            </#if>
-        <#elseif (! property.collatedBySubclass ) && roleTypeLabel?has_content>
+        <#if statement.roleLabel??>
+            ${statement.roleLabel?replace(" Role", "")?replace(" role","")}
+        <#elseif !property.collatedBySubclass >
             ${roleTypeLabel?replace(" Role", "")}
         </#if>
     </#local>
 
     ${linkedIndividual}&nbsp;${roleLabel!}&nbsp;<@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
-
 </#macro>