From ce9310b346e38c671e1edb3261c5ea953366d41f Mon Sep 17 00:00:00 2001
From: Graham Triggs <gtriggs@duraspace.org>
Date: Fri, 29 Sep 2017 12:42:30 +0100
Subject: [PATCH] Improve verbose layout

---
 .../body/partials/individual/individual-researchAreas.ftl      | 3 ++-
 .../body/partials/individual/individual-positions.ftl          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl
index 8c8f30b5..2ce102b8 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-researchAreas.ftl
@@ -8,8 +8,9 @@
     <h2 id="${localName}" class="mainPropGroup" title="${researchAreas.publicDescription!}">
         ${researchAreas.name?capitalize} 
         <img id="researchAreaIcon" src="${urls.images}/individual/research-group-icon.png" alt="${i18n().research_areas}" />
-        <@p.addLink researchAreas editable /> <@p.verboseDisplay researchAreas />
+        <@p.addLink researchAreas editable />
     </h2>
+    <@p.verboseDisplay researchAreas />
     <ul id="individual-${localName}" role="list" >
         <@p.objectProperty researchAreas editable />
     </ul> 
diff --git a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-positions.ftl b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-positions.ftl
index 823c0bd5..1caad5ae 100644
--- a/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-positions.ftl
+++ b/webapp/src/main/webapp/themes/tenderfoot/templates/body/partials/individual/individual-positions.ftl
@@ -4,7 +4,8 @@
 <#assign positions = propertyGroups.pullProperty("${core}relatedBy", "${core}Position")!>
 <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
     <#assign localName = positions.localName>
-    <h2 id="${localName}" class="mainPropGroup" title="${positions.publicDescription!}">${positions.name?capitalize} <@p.addLink positions editable /> <@p.verboseDisplay positions /></h2>
+    <h2 id="${localName}" class="mainPropGroup" title="${positions.publicDescription!}">${positions.name?capitalize} <@p.addLink positions editable /></h2>
+    <@p.verboseDisplay positions />
     <ul id="individual-personInPosition" role="list">
         <@positionsList positions editable />
     </ul>