From fcf06544cc22f11450a1925803529c21ba4544b5 Mon Sep 17 00:00:00 2001 From: cappadona Date: Fri, 24 Jun 2011 09:16:49 +0000 Subject: [PATCH] NIHVIVO-2483 Restored h3 level headings for selected class on class group menu pages --- webapp/web/css/menupage/menupage.css | 10 +--------- webapp/web/js/menupage/browseByVClass.js | 7 ++----- .../body/partials/menupage/menupage-browse.ftl | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/webapp/web/css/menupage/menupage.css b/webapp/web/css/menupage/menupage.css index cf61e2bab..975f9a5e3 100644 --- a/webapp/web/css/menupage/menupage.css +++ b/webapp/web/css/menupage/menupage.css @@ -193,9 +193,7 @@ ul#browse-classes a { ul#alpha-browse-individuals { float: left; width: 619px; - /* padding-left: 10px; */ - list-style: none; - /* margin-left: 1px; */ + list-style: none; } ul#alpha-browse-individuals li { float: left; @@ -212,11 +210,6 @@ ul#alpha-browse-individuals a { padding-left: 8px; width: 10px; } -h4#selectedClassHeading { - margin-left:4px; - margin-top:-5px; - margin-bottom:-10px; -} /* BROWSE INDIVIDUALS------> */ #individuals-in-class { float: right; @@ -227,7 +220,6 @@ h4#selectedClassHeading { min-height: 170px; } h3.selected-class { - margin: 0 0 0 1em; padding: .8em 0 0 0; } #individuals-in-class ul { diff --git a/webapp/web/js/menupage/browseByVClass.js b/webapp/web/js/menupage/browseByVClass.js index ef28d5f74..2ad26cfe2 100644 --- a/webapp/web/js/menupage/browseByVClass.js +++ b/webapp/web/js/menupage/browseByVClass.js @@ -140,9 +140,7 @@ var browseByVClass = { browseByVClass.pagination(pages, page); } - // selectedClassHeading = '

'+ results.vclass.name +'

'; NIHVIVO-2483 tlw72 - // browseByVClass.individualsContainer.prepend(selectedClassHeading); - $('h4#selectedClassHeading').text(results.vclass.name); // NIHVIVO-2483 tlw72 + $('h3.selected-class').text(results.vclass.name); // Set selected class, alpha and page browseByVClass.selectedVClass(results.vclass.URI); @@ -219,9 +217,8 @@ var browseByVClass = { $('#alpha-browse-individuals li a[data-alpha="'+ alpha +'"]').addClass('selected'); }, - // Wipe the currently displayed class heading, individuals, no-content message, and existing pagination + // Wipe the currently displayed individuals, no-content message, and existing pagination wipeSlate: function() { - $('h3.selected-class').remove(); browseByVClass.individualsInVClass.empty(); $('p.no-individuals').remove(); $('.pagination').remove(); diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl index afaf93e09..c90253b1b 100644 --- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl +++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl @@ -21,7 +21,7 @@