From 0e64d6a0e3180601240717c70db4be7ceca11cc7 Mon Sep 17 00:00:00 2001 From: mb863 Date: Fri, 17 Dec 2010 20:00:57 +0000 Subject: [PATCH] NIHVIVO-1316: Adding navigational control for accessing property groups menu from property groups. When users click on the arrow located at the top right part of a property group, this will scroll up to the property groups menu. --- webapp/web/css/individual/individual.css | 9 ++++++++- .../body/partials/individual/individual-properties.ftl | 1 + .../partials/individual/individual-propertyGroupMenu.ftl | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/webapp/web/css/individual/individual.css b/webapp/web/css/individual/individual.css index c8af38d29..dff082810 100644 --- a/webapp/web/css/individual/individual.css +++ b/webapp/web/css/individual/individual.css @@ -294,6 +294,7 @@ p.view-all-coauthors{ } /* PROPERTY GROUP------> */ .property-group{ + position: relative; clear: both; width: 920px; border: 1px solid #dfebe5; @@ -301,7 +302,13 @@ p.view-all-coauthors{ margin-bottom: 10px; background: #fff; margin-bottom: 20px; - overflow: hidden; +} +.scroll-up{ + position: absolute; + width: 21px; + height: 30px; + top: 0; + right: -21px; } section.property-group h2{ padding: 20px 25px 12px 35px; 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 9ca1ca98e..9437d1c4a 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl @@ -7,6 +7,7 @@ <#assign groupname = group.name(nameForOtherGroup)>
+ <#-- Display the group heading --> <#if groupname?has_content> diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl index 86184cbfe..341eac55b 100644 --- a/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl +++ b/webapp/web/templates/freemarker/body/partials/individual/individual-propertyGroupMenu.ftl @@ -3,6 +3,7 @@ <#-- Template for property group menu on individual profile page --> <#assign nameForOtherGroup = nameForOtherGroup!"other"> +