diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css b/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css index db9c40f2..d721fc31 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css +++ b/webapp/src/main/webapp/themes/tenderfoot/css/page-individual.css @@ -94,6 +94,10 @@ article.property li h3 { margin-left: 10px; } +ul#individual-hasResearchArea { + margin-left: 10px; +} + ul#individual-hasResearchArea li, ul#individual-facultyMemberships li { float: left; @@ -108,4 +112,17 @@ ul#individual-facultyMemberships li { #admin h3 { background-color: #398AAC; color: #fff; +} + +ul#individual-personInPosition { + list-style: none; + padding-left: 10px; +} + +ul#individual-personInPosition li { + line-height: 1.3em; +} + +ul#individual-personInPosition li:last-child { + padding-bottom: 5px; } \ No newline at end of file diff --git a/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css b/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css index e569ce8e..84b3c9c5 100644 --- a/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css +++ b/webapp/src/main/webapp/themes/tenderfoot/css/tenderfoot.css @@ -245,7 +245,7 @@ h1.vivo-logo a { position: absolute; } h2 { - padding: 5px 0 6px 0; + padding: 5px 0 3px 0; margin: 0; font-size: 1.375em; color: #064d68; 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 ca8b440f..823c0bd5 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 @@ -18,10 +18,6 @@ <#local rangeUri = "" /> <#if statement.dateTimeEnd??> -
  • - <#include "${template}"> - <@p.editingLinks "${property.localName}" "${property.name}" statement editable rangeUri/> -
  • <#else>
  • <#include "${template}"> @@ -29,4 +25,42 @@
  • + <#list statements as statement> + <#if property.rangeUri?? > + <#local rangeUri = property.rangeUri /> + <#else> + <#local rangeUri = "" /> + + <#if statement.dateTimeEnd??> +
  • + <#include "${template}"> + <@p.editingLinks "${property.localName}" "${property.name}" statement editable rangeUri/> +
  • + + + + \ No newline at end of file