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

NIHVIVO-1392 Verbose property display

Browse source
This commit is contained in:
rjy7 2011-02-24 22:15:34 +00:00
parent c82314cbdb
commit faac29e6ba
10 changed files with 94 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@
<#list group.properties as property>
<article class="property" role="article">
<#-- Property display name -->
<h3 id="${property.localName}">${property.name} <@p.addLink property editable /></h3>
<h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /></h3>
<#-- List the statements for each property -->
<ul class="property-list" role="list">
<#-- data property -->

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

@ -65,7 +65,7 @@
Assumes property is non-null. -->
<#macro objectPropertyListing property editable template=property.template>
<#local localName = property.localName>
<h2 id="${localName}">${property.name?capitalize} <@addLink property editable /></h2>
<h2 id="${localName}">${property.name?capitalize} <@addLink property editable /> <@verboseDisplay property /></h2>
<ul id="individual-${localName}" role="list">
<@p.objectProperty property editable />
</ul>
@ -83,7 +83,7 @@ name will be used as the label. -->
<#macro addLinkWithLabel property editable label="${property.name?capitalize}">
<#local addLink><@addLink property editable label /></#local>
<#if addLink?has_content>
<h2 id="${property.localName}">${label} ${addLink}</h2>
<h2 id="${property.localName}">${label} ${addLink} <@verboseDisplay property /></h2>
</#if>
</#macro>
@ -97,7 +97,7 @@ name will be used as the label. -->
</#macro>
<#macro propertyLabel property label="${property.name?capitalize}">
<h2 id="${property.localName}">${label}</h2>
<h2 id="${property.localName}">${label} <@verboseDisplay property /></h2>
</#macro>
<#macro propertyListItem property statement editable>
@ -128,6 +128,19 @@ name will be used as the label. -->
</#if>
</#macro>
<#macro verboseDisplay property>
<#local verboseDisplay = property.verboseDisplay!>
<#if verboseDisplay?has_content>
<span class="verbosePropertyListing">
<a class="propertyLink" href="${verboseDisplay.propertyEditUrl}">${verboseDisplay.localName}</a>
(${property.type?lower_case} property);
display tier: ${verboseDisplay.displayTier} within group;
display level: ${verboseDisplay.displayLevel};
update level: ${verboseDisplay.updateLevel}
</span>
</#if>
</#macro>
<#-----------------------------------------------------------------------------
Macros for specific properties

2
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-ontologyEditor.ftl
View file

@ -33,14 +33,12 @@
<li><a href="${ontologyEditor.urls.propertyGroups}">Property groups</a></li>
</ul>
<#-- NIHVIVO-1590 This feature temporarily disabled in v1.2 due to time constraints.
<#assign formId = "verbosePropertyForm">
<form id="${formId}" action="${ontologyEditor.verbosePropertyForm.action}#${formId}" method="get">
<input type="hidden" name="verbose" value="${ontologyEditor.verbosePropertyForm.verboseFieldValue}" />
<span>Verbose property display for this session is <b>${ontologyEditor.verbosePropertyForm.currentValue}</b>.</span>
<input type="submit" id="submit" value="Turn ${ontologyEditor.verbosePropertyForm.newValue}" />
</form>
-->
</div>
</#if>