litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1491 Display person's positions at top of page

Browse source
This commit is contained in:
rjy7 2011-01-04 15:02:11 +00:00
parent 734ca39d26
commit e65f567fce
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
webapp/web/templates/freemarker/body/individual/individual.ftl
View file

@ -84,20 +84,19 @@ annotaiton has been implemented. -->
</h1> </h1>
</#if> </#if>
<#-- Current positions --> <#-- Positions -->
<#assign positions = propertyGroups.getProperty("${core}personInPosition")!> <#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!>
<#if positions?has_content> <#-- true when the property is in the list, even if there are no statements (when editing) --> <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<h2>Current Positions</h2> <h2>Positions</h2>
<ul id ="individual-positions" role="list"> <ul id ="individual-positions" role="list">
<@p.objectProperty positions /> <@p.objectPropertyList positions.statements positions.template />
</ul> </ul>
</#if> </#if>
</header> </header>
<#-- Overview --> <#-- Overview -->
<#assign overview = propertyGroups.getPropertyAndRemoveFromList("${core}overview")!> <#assign overview = propertyGroups.getPropertyAndRemoveFromList("${core}overview")!>
<#if overview?has_content> <#-- true when the property is in the list, even if there are no statements (when editing) --> <#if overview?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#list overview.statements as statement> <#list overview.statements as statement>
<p class="individual-overview">${statement.value}</p> <p class="individual-overview">${statement.value}</p>
</#list> </#list>
@ -105,10 +104,10 @@ annotaiton has been implemented. -->
<#-- Research Areas --> <#-- Research Areas -->
<#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!> <#assign researchAreas = propertyGroups.getPropertyAndRemoveFromList("${core}hasResearchArea")!>
<#if researchAreas?has_content> <#-- true when the property is in the list, even if there are no statements (when editing) --> <#if researchAreas?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<h2>Research Areas</h2> <h2>Research Areas</h2>
<ul id="individual-areas" role="list"> <ul id="individual-areas" role="list">
<@p.objectProperty researchAreas /> <@p.simpleObjectPropertyList researchAreas />
</ul> </ul>
</#if> </#if>

2
webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
View file

@ -22,7 +22,7 @@
</#list> </#list>
</#macro> </#macro>
<#macro objectProperty property> <#macro simpleObjectPropertyList property>
<@objectPropertyList property.statements "propStatement-simple.ftl" /> <@objectPropertyList property.statements "propStatement-simple.ftl" />
</#macro> </#macro>