From f5fb93df93175be41f9a9fc42acf2aad21fa7dc3 Mon Sep 17 00:00:00 2001 From: nac26 Date: Tue, 18 Jan 2011 11:51:52 +0000 Subject: [PATCH] NIHVIVO-1071 Attempting to restore function where we jump back to the property in when returning from an edit form. Still needs work (have to run a couple questions by Rebecca) --- .../individual/individual-properties.ftl | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl index 9ba6b66a1..575574121 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl @@ -3,9 +3,9 @@ <#-- Template for property listing on individual profile page --> <#import "lib-properties.ftl" as p> +<#import "lib-dump.ftl" as dumper> <#list propertyGroups.all as group> - <#assign groupname = group.name(nameForOtherGroup)>
@@ -14,32 +14,31 @@ scroll to property group menus - + <#-- Display the group heading --> <#if groupname?has_content>

${groupname?capitalize}

- - <#-- List the properties in the group --> + + <#-- List the properties in the group --> <#list group.properties as property> + <#assign propertyNameCamel = property.name?capitalize?replace(" ", "")?uncap_first />
<#-- Property display name --> -

${property.name} <@p.addLink property editing />

- <#-- List the statements for each property --> -
    - <#-- data property --> - <#if property.type == "data"> +

    ${property.name} <@p.addLink property editing />

    + <#-- List the statements for each property --> +
      + <#-- data property --> + <#if property.type == "data"> <@p.dataPropertyList property.statements editing /> - - <#-- object property --> - <#elseif property.collatedBySubclass> <#-- collated --> + <#-- object property --> + <#elseif property.collatedBySubclass> <#-- collated --> <@p.collatedObjectPropertyList property editing /> <#else> <#-- uncollated --> <@p.objectPropertyList property.statements property.template editing /> - -
    -
- + + + +
- - + \ No newline at end of file