litvinovg/vitro
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:15 +00:00
parent 1f2edcc622
commit 1b2f34eadc
5 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,13 +30,8 @@
<#if property.type == "data">
<@p.dataPropertyList property editable />
<#-- object property -->
<#elseif property.collatedBySubclass> <#-- collated -->
<@p.collatedObjectPropertyList property editable />
<#else> <#-- uncollated -->
<#-- We pass property.statements and property.template even though we are also
passing property, because objecctPropertyList can get other values, and
doesn't necessarily use property.statements and property.template -->
<@p.objectPropertyList property property.statements property.template editable />
<#else>
<@p.objectProperty property editable />
</#if>
</ul>
</article> <!-- end property -->

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

@ -10,23 +10,30 @@
</#list>
</#macro>
<#macro collatedObjectPropertyList property editable>
<#macro objectProperty property editable template="${property.template}">
<#if property.collatedBySubclass> <#-- collated -->
<@p.collatedObjectPropertyList property editable template />
<#else> <#-- uncollated -->
<#-- We pass property.statements and property.template even though we are also
passing property, because objecctPropertyList can get other values, and
doesn't necessarily use property.statements and property.template -->
<@p.objectPropertyList property editable property.statements template />
</#if>
</#macro>
<#macro collatedObjectPropertyList property editable template="${property.template}">
<#assign subclasses = property.subclasses>
<#list subclasses?keys as subclass>
<li class="subclass">
<h3>${subclass?lower_case}</h3>
<ul class="subclass-property-list">
<@objectPropertyList property subclasses[subclass] property.template editable />
<@objectPropertyList property editable subclasses[subclass] template/>
</ul>
</li>
</#list>
</#macro>
<#macro simpleObjectPropertyList property editable>
<@objectPropertyList property property.statements "propStatement-simple.ftl" editable />
</#macro>
<#macro objectPropertyList property statements template editable>
<#macro objectPropertyList property editable statements="${property.statements}" template="${property.template}">
<#list statements as statement>
<@propertyListItem property statement editable><#include "${template}"></@propertyListItem>
</#list>
@ -97,13 +104,13 @@ name will be used as the label. -->
<@addLinkWithLabel primaryLink editable "Primary Web Page" />
<#if primaryLink.statements?has_content> <#-- if there are any statements -->
<ul class="${linkListClass}" id="links-primary" role="list">
<@objectPropertyList primaryLink primaryLink.statements primaryLink.template editable />
<@objectPropertyList primaryLink editable />
</ul>
</#if>
<@addLinkWithLabel additionalLinks editable "Additional Web Pages" />
<#if additionalLinks.statements?has_content> <#-- if there are any statements -->
<ul class="${linkListClass}" id="links-additional" role="list">
<@objectPropertyList additionalLinks additionalLinks.statements additionalLinks.template editable />
<@objectPropertyList additionalLinks editable />
</ul>
</#if>
</nav>