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

NIHVIVO-1335, NIHVIVO-1510 Working on authorship list view and collated object properties: some reorganization to handle collated properties, but not displaying as collated yet.

Browse source
This commit is contained in:
rjy7 2010-12-22 22:17:07 +00:00
parent 1f0140dd2a
commit 6d06c76e05
8 changed files with 118 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/config/listViewConfig-default.xml
View file

@ -15,6 +15,8 @@
?subject and ?property named as such. The object can be given any name, but it must be
included in the SELECT terms retrieved by the query. This is the statement that will be edited
from the edit links.
- Each assertion or set of optional assertions must reference a different graph variable, so that
we do not impose a requirement about which assertions are in the same graph.
-->
<list-view-config>

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

@ -37,13 +37,11 @@
<#-- Links -->
<nav role="navigation">
<ul id ="individual-urls-people" role="list">
<#if individual.links?has_content>
<@l.firstLastList>
<#list individual.links as link>
<li role="listitem"><a href="${link.url}">${link.anchor}</a></li>
</#list>
</@l.firstLastList>
</#if>
<@l.firstLastList>
<#list individual.links as link>
<li role="listitem"><a href="${link.url}">${link.anchor}</a></li>
</#list>
</@l.firstLastList>
</ul>
</nav>
</section>

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

@ -7,7 +7,11 @@
<#assign groupname = group.name(nameForOtherGroup)>
<section class="property-group" role="region">
<nav class="scroll-up" role="navigation"><a href="#property-nav"><img src="${urls.images}/individual/scroll-up.png" alt="scroll to property group menus" /></a></nav>
<nav class="scroll-up" role="navigation">
<a href="#property-nav">
<img src="${urls.images}/individual/scroll-up.png" alt="scroll to property group menus" />
</a>
</nav>
<#-- Display the group heading -->
<#if groupname?has_content>
@ -24,16 +28,41 @@
<ul class="property-list" role="list">
<#-- data property -->
<#if property.type == "data">
<#include "dataPropertyList-statements.ftl">
<@dataPropertyList property.statements />
<#-- object property -->
<#elseif property.collatedBySubclass>
<#include "objectPropertyList-collated.ftl">
<@objectPropertySubclassList property />
<#else>
<#include "objectPropertyList-statements.ftl">
<@objectPropertyList property.statements property.template />
</#if>
</ul>
</article> <!-- end property -->
</#list>
</section> <!-- end property-group -->
</#list>
<#-----------------------------------------------------------------------------
Macros for generating property lists
------------------------------------------------------------------------------>
<#macro dataPropertyList statements>
<#list statements as statement>
<li role="listitem">${statement.value}</li>
</#list>
</#macro>
<#macro objectPropertySubclassList property>
<#list property.subclasses as subclass>
<h3>${subclass}</h3>
<@objectPropertyList subclass.statements property.template />
</#list>
</#macro>
<#macro objectPropertyList statements template>
<#list statements as statement>
<li role="listitem">
<#include "${template}">
</li>
</#list>
</#macro>

7
webapp/web/templates/freemarker/body/partials/individual/objectPropertyList-collated.ftl
View file

@ -2,4 +2,9 @@
<#-- Template for collated object property statement list -->
<p>Display of collated object property statements is in progress.</p>
<p>Display of collated object property statements is in progress.</p>
<#list property.subclasses as subclass>
<h3>${subclass}</h3>
<@listStatements subclass.statements />
</#list>

2
webapp/web/templates/freemarker/body/partials/individual/objectPropertyList-statements.ftl
View file

@ -2,7 +2,7 @@
<#-- Template to list statements for an object property -->
<#list property.statements as statement>
<#list statements as statement>
<li role="listitem">
<#include "${property.template}">
</li>

6
webapp/web/templates/freemarker/body/partials/individual/objectPropertyList-uncollated.ftl Normal file
View file

@ -0,0 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Template for uncollated object property statement list -->
<#assign statements = property.statements>
<#include "objectPropertyList-statements.ftl">