diff --git a/webapp/web/css/individual/individual.css b/webapp/web/css/individual/individual.css index 6e894a595..3c15950c8 100644 --- a/webapp/web/css/individual/individual.css +++ b/webapp/web/css/individual/individual.css @@ -187,26 +187,26 @@ h1.fn .preferred-title { #individual-info h2{ padding-bottom: 10px; } -ul#individual-positions{ +ul#individual-personInPosition{ list-style-type: circle; padding-left: 20px; } -ul#individual-positions li{ +ul#individual-personInPosition li{ line-height: 1em; } -ul#individual-positions li:last-child{ +ul#individual-personInPosition li:last-child{ padding-bottom: 15px; } -ul#individual-areas{ +ul#individual-hasResearchArea{ padding-bottom: 24px; } -ul#individual-areas li{ +ul#individual-hasResearchArea li{ float: left; padding-right: 10px; padding-left: 10px; border-right: 1px solid #5e6363; } -ul#individual-areas li:first-child{ +ul#individual-hasResearchArea li:first-child{ padding-left: 0; } #individual-info nav{ diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl index df2526247..72ead8469 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl @@ -33,6 +33,17 @@ +<#-- Full object property listing, including heading and ul wrapper element. --> +<#macro objectPropertyListing property editable template=property.template> + <#if property?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> + <#local localName = property.localName> +

${property.name?capitalize} <@addLink property editable />

+ + + + <#macro objectPropertyList property editable statements=property.statements template=property.template> <#list statements as statement> <@propertyListItem property statement editable><#include "${template}">