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

NIHVIVO-1863 Fix collated view of core:personInPosition and core:hasResearchArea

Browse source
This commit is contained in:
rjy7 2011-01-21 21:54:17 +00:00
parent f475953013
commit 04d5d32568
1 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,12 +82,10 @@
<#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 id="${positions.localName}">${positions.name?capitalize} <@p.addLink positions editable /></h2> <h2 id="${positions.localName}">${positions.name?capitalize} <@p.addLink positions editable /></h2>
<#if positions.statements?has_content> <#-- if there are any statements --> <ul class="individual-positions" role="list">
<ul id ="individual-positions" role="list"> <@p.objectProperty positions editable />
<@p.objectPropertyList positions positions.statements positions.template editable />
</ul> </ul>
</#if> </#if>
</#if>
</header> </header>
<#-- Overview --> <#-- Overview -->
@ -97,12 +95,10 @@
<#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 id="${researchAreas.localName}">${researchAreas.name?capitalize} <@p.addLink researchAreas editable /></h2> <h2 id="${researchAreas.localName}">${researchAreas.name?capitalize} <@p.addLink researchAreas editable /></h2>
<#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 editable/> <@p.objectProperty researchAreas editable "propStatement-simple.ftl" />
</ul> </ul>
</#if> </#if>
</#if>
</section> </section>
</section> </section>
@ -120,12 +116,8 @@
</header> </header>
<ul role="list"> <ul role="list">
<li role="listitem"><a href="#"><img class="co-author" src="${urls.images}/individual/Bacall.jpg" /></a></li> <li role="listitem"><a href="#"><img class="co-author" src="" /></a></li>
<li role="listitem"><a href="#"><img class="co-author" src="${urls.images}/individual/Bogart.jpg" /></a></li> <li role="listitem"><a href="#"><img class="co-author" src="" /></a></li>
<li role="listitem"><a href="#"><img class="co-author" src="${urls.images}/individual/Gable.jpg" /></a></li>
<li role="listitem"><a href="#"><img class="co-author" src="${urls.images}/individual/Grant.jpg" /></a></li>
<li role="listitem"><a href="#"><img class="co-author" src="${urls.images}/individual/Leigh.jpg" /></a></li>
<li role="listitem"><a href="#"><img class="co-author" src="${urls.images}/individual/Welles.jpg" /></a></li>
</ul> </ul>
<p class="view-all-coauthors"><a class="view-all-style" href="#">View All <img src="${urls.images}/arrowIcon.gif" alt="arrow icon" /></a></p> <p class="view-all-coauthors"><a class="view-all-style" href="#">View All <img src="${urls.images}/arrowIcon.gif" alt="arrow icon" /></a></p>