From 50eab74e48fd6927699e6a599fa0bf4b96f90a85 Mon Sep 17 00:00:00 2001 From: mb863 Date: Tue, 15 Mar 2011 14:37:30 +0000 Subject: [PATCH] NIHVIVO-2163: Added markup and styles for verbose property display for individual page. The verbose display in property groups needs some tuning. --- webapp/web/css/individual/individual.css | 6 ++++++ .../body/partials/individual/lib-properties.ftl | 13 ++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/webapp/web/css/individual/individual.css b/webapp/web/css/individual/individual.css index f070a09f4..5f5bba2f5 100644 --- a/webapp/web/css/individual/individual.css +++ b/webapp/web/css/individual/individual.css @@ -368,3 +368,9 @@ a.edit-mainImage img.edit-individual { font-size: 0.8em; background: #f4f4f4; } +/* VERBOSE DISPLAY------> */ +section.verbosePropertyListing { + display: inline-block; + background-color: #eaebec; + padding: 10px; +} \ No newline at end of file diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl index 6699380df..77ebf4bf8 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl @@ -152,17 +152,16 @@ name will be used as the label. --> <#macro verboseDisplay property> <#local verboseDisplay = property.verboseDisplay!> <#if verboseDisplay?has_content> - +
${verboseDisplay.localName} - (${property.type?lower_case} property); - display tier: ${verboseDisplay.displayTier}; - display level: ${verboseDisplay.displayLevel}; - update level: ${verboseDisplay.updateLevel} - + (${property.type?lower_case} property); + order in group: ${verboseDisplay.displayTier}; + display level: ${verboseDisplay.displayLevel}; + update level: ${verboseDisplay.updateLevel} +
- <#----------------------------------------------------------------------------- Macros for specific properties ------------------------------------------------------------------------------>