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

NIHVIVO-1332 Modifications to controller, template models, and templates for editing controls

Browse source
This commit is contained in:
rjy7 2011-01-11 17:03:52 +00:00
parent e13564c983
commit 3451bb4786
14 changed files with 103 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,13 +30,13 @@
<ul class="property-list" role="list">
<#-- data property -->
<#if property.type == "data">
<@p.dataPropertyList property.statements />
<@p.dataPropertyList property.statements showEditingLinks />
<#-- object property -->
<#elseif property.collatedBySubclass> <#-- collated -->
<@p.collatedObjectPropertyList property />
<@p.collatedObjectPropertyList property showEditingLinks />
<#else> <#-- uncollated -->
<@p.objectPropertyList property.statements property.template />
<@p.objectPropertyList property.statements property.template showEditingLinks />
</#if>
</ul>
</article> <!-- end property -->

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

@ -4,56 +4,58 @@
Macros for generating property lists
------------------------------------------------------------------------------>
<#macro dataPropertyList statements>
<#macro dataPropertyList statements showEditingLinks>
<#list statements as statement>
<@propertyListItem statement>${statement.value}</@propertyListItem>
<@propertyListItem statement showEditingLinks>${statement.value}</@propertyListItem>
</#list>
</#macro>
<#macro collatedObjectPropertyList property>
<#macro collatedObjectPropertyList property showEditingLinks>
<#assign subclasses = property.subclasses>
<#list subclasses?keys as subclass>
<li class="subclass">
<h3>${subclass?lower_case}</h3>
<ul class="subclass-property-list">
<@objectPropertyList subclasses[subclass] property.template />
<@objectPropertyList subclasses[subclass] property.template showEditingLinks />
</ul>
</li>
</#list>
</#macro>
<#macro simpleObjectPropertyList property>
<@objectPropertyList property.statements "propStatement-simple.ftl" />
<#macro simpleObjectPropertyList property showEditingLinks>
<@objectPropertyList property.statements "propStatement-simple.ftl" showEditingLinks />
</#macro>
<#macro objectPropertyList statements template>
<#macro objectPropertyList statements template showEditingLinks>
<#list statements as statement>
<@propertyListItem statement><#include "${template}"></@propertyListItem>
<@propertyListItem statement showEditingLinks><#include "${template}"></@propertyListItem>
</#list>
</#macro>
<#macro propertyListItem statement>
<#macro propertyListItem statement showEditingLinks>
<li role="listitem">
<@editLink statement />
<@deleteLink statement />
<@editingLinks statement showEditingLinks />
<#nested>
</li>
</#macro>
<#macro editLink statement>
<#if editStatus.showEditingLinks>
<#local url = statement.editUrl>
<#if url?has_content>
<a href="${url}">edit</a>
</#if>
<#macro editingLinks statement showEditingLinks>
<#if showEditingLinks>
<@editLink statement />
<@deleteLink statement />
</#if>
</#macro>
<#macro deleteLink statement>
<#if editStatus.showEditingLinks>
<#local url = statement.deleteUrl>
<#if url?has_content>
<a href="${url}">delete</a>
</#if>
<#macro editLink statement>
<#local url = statement.editUrl>
<#if url?has_content>
<a href="${url}">edit</a>
</#if>
</#macro>
<#macro deleteLink statement>
<#local url = statement.deleteUrl>
<#if url?has_content>
<a href="${url}">delete</a>
</#if>
</#macro>