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

NIHVIVO-1332 Display property title on untitled properties like phone, email if there is an add link to display. Changed a Java class name.

Browse source
This commit is contained in:
rjy7 2011-01-11 20:54:15 +00:00
parent bf10a0fadd
commit 83d0056263
1 changed files with 39 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
View file

@ -30,13 +30,9 @@
<#-- Email --> <#-- Email -->
<#assign email = propertyGroups.getPropertyAndRemoveFromList("${core}email")!> <#assign email = propertyGroups.getPropertyAndRemoveFromList("${core}email")!>
<#if email?has_content> <#if email?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#-- Show property label if we can add one <@p.showLabelAndAddLink email showEditingLinks />
<#assign addUrl = email.addUrl> <#if email.statements?has_content> <#-- if there are any statements -->
<#if addUrl??>
<h3>email.name</h3> <@addLink >
</#if>-->
<ul id="individual-email" role="list"> <ul id="individual-email" role="list">
<#list email.statements as statement> <#list email.statements as statement>
<li role="listitem"> <li role="listitem">
@ -46,10 +42,13 @@
</#list> </#list>
</ul> </ul>
</#if> </#if>
</#if>
<#-- Phone --> <#-- Phone -->
<#assign phone = propertyGroups.getPropertyAndRemoveFromList("${core}phoneNumber")!> <#assign phone = propertyGroups.getPropertyAndRemoveFromList("${core}phoneNumber")!>
<#if phone?has_content> <#if phone?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<@p.showLabelAndAddLink phone showEditingLinks />
<#if phone.statements?has_content> <#-- if there are any statements -->
<ul id="individual-phone" role="list"> <ul id="individual-phone" role="list">
<#list phone.statements as statement> <#list phone.statements as statement>
<li role="listitem"> <li role="listitem">
@ -59,6 +58,7 @@
</#list> </#list>
</ul> </ul>
</#if> </#if>
</#if>
<#-- Links --> <#-- Links -->
<nav role="navigation"> <nav role="navigation">
@ -90,16 +90,19 @@
<#-- Positions --> <#-- Positions -->
<#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!> <#assign positions = propertyGroups.getPropertyAndRemoveFromList("${core}personInPosition")!>
<#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if positions?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<h2>Positions</h2> <h2>Positions <@p.addLink positions showEditingLinks /></h2>
<#if positions.statements?has_content> <#-- if there are any statements -->
<ul id ="individual-positions" role="list"> <ul id ="individual-positions" role="list">
<@p.objectPropertyList positions.statements positions.template showEditingLinks /> <@p.objectPropertyList positions.statements positions.template showEditingLinks />
</ul> </ul>
</#if> </#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 not populated (when editing) --> <#if overview?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<@p.showLabelAndAddLink overview showEditingLinks />
<#list overview.statements as statement> <#list overview.statements as statement>
<p class="individual-overview"> <p class="individual-overview">
<@p.editingLinks statement showEditingLinks /> <@p.editingLinks statement showEditingLinks />
@ -111,11 +114,14 @@
<#-- 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 not populated (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 <@p.addLink researchAreas showEditingLinks /></h2> -->
<@p.showLabelAndAddLink researchAreas showEditingLinks />
<#if researchAreas.statements?has_content> <#-- if there are any statements -->
<ul id="individual-areas" role="list"> <ul id="individual-areas" role="list">
<@p.simpleObjectPropertyList researchAreas showEditingLinks/> <@p.simpleObjectPropertyList researchAreas showEditingLinks/>
</ul> </ul>
</#if> </#if>
</#if>
</section> </section>
</section> </section>