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

NIHVIVO-1510 Temporarily display collated properties as uncollated, until collated view is implemented.

Browse source
This commit is contained in:
rjy7 2010-12-13 20:03:06 +00:00
parent efc48a3054
commit 91f96a2304
8 changed files with 95 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,10 @@
<#-- Template for property listing on individual profile page -->
<#-- RY Just a temporary fix to prevent classgroup heading from being pushed to the right edge of the page.
Feel free to redo/remove. -->
<div style="clear: both;" />
<#list propertyGroups as group>
<#-- Get the group name -->
@ -40,10 +44,10 @@
</#list>
<#else> <#-- object property -->
<#if ! property.collatedBySubclass>
<#include "${property.template}">
<#else>
<#if property.collatedBySubclass>
<#include "objectPropertyList-collated.ftl">
<#else>
<#include "${property.template}">
</#if>
</#if>
</div> <!-- end property -->

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

@ -135,4 +135,4 @@ ${headScripts.add("/js/jquery_plugins/getUrlParam.js",
"http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D",
"/js/toggle.js")}
${scripts.add("/js/imageUpload/imageUploadUtils.js")}
${scripts.add("/js/imageUpload/imageUploadUtils.js")}