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

NIHVIVO-2483 Restored h3 level headings for selected class on class group menu pages

Browse source
This commit is contained in:
cappadona 2011-06-24 09:16:49 +00:00
parent 5368eac494
commit fcf06544cc
3 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/web/css/menupage/menupage.css
View file

@ -193,9 +193,7 @@ ul#browse-classes a {
ul#alpha-browse-individuals { ul#alpha-browse-individuals {
float: left; float: left;
width: 619px; width: 619px;
/* padding-left: 10px; */
list-style: none; list-style: none;
/* margin-left: 1px; */
} }
ul#alpha-browse-individuals li { ul#alpha-browse-individuals li {
float: left; float: left;
@ -212,11 +210,6 @@ ul#alpha-browse-individuals a {
padding-left: 8px; padding-left: 8px;
width: 10px; width: 10px;
} }
h4#selectedClassHeading {
margin-left:4px;
margin-top:-5px;
margin-bottom:-10px;
}
/* BROWSE INDIVIDUALS------> */ /* BROWSE INDIVIDUALS------> */
#individuals-in-class { #individuals-in-class {
float: right; float: right;
@ -227,7 +220,6 @@ h4#selectedClassHeading {
min-height: 170px; min-height: 170px;
} }
h3.selected-class { h3.selected-class {
margin: 0 0 0 1em;
padding: .8em 0 0 0; padding: .8em 0 0 0;
} }
#individuals-in-class ul { #individuals-in-class ul {

7
webapp/web/js/menupage/browseByVClass.js
View file

@ -140,9 +140,7 @@ var browseByVClass = {
browseByVClass.pagination(pages, page); browseByVClass.pagination(pages, page);
} }
// selectedClassHeading = '<h3 class="selected-class">'+ results.vclass.name +'</h3>'; NIHVIVO-2483 tlw72 $('h3.selected-class').text(results.vclass.name);
// browseByVClass.individualsContainer.prepend(selectedClassHeading);
$('h4#selectedClassHeading').text(results.vclass.name); // NIHVIVO-2483 tlw72
// Set selected class, alpha and page // Set selected class, alpha and page
browseByVClass.selectedVClass(results.vclass.URI); browseByVClass.selectedVClass(results.vclass.URI);
@ -219,9 +217,8 @@ var browseByVClass = {
$('#alpha-browse-individuals li a[data-alpha="'+ alpha +'"]').addClass('selected'); $('#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() { wipeSlate: function() {
$('h3.selected-class').remove();
browseByVClass.individualsInVClass.empty(); browseByVClass.individualsInVClass.empty();
$('p.no-individuals').remove(); $('p.no-individuals').remove();
$('.pagination').remove(); $('.pagination').remove();

2
webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl
View file

@ -21,7 +21,7 @@
</#list> </#list>
</ul> </ul>
<nav id="alpha-browse-container" role="navigation"> <nav id="alpha-browse-container" role="navigation">
<h4 id="selectedClassHeading"></h4> <h3 class="selected-class"></h3>
<#assign alphabet = ["A", "B", "C", "D", "E", "F", "G" "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] /> <#assign alphabet = ["A", "B", "C", "D", "E", "F", "G" "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] />
<ul id="alpha-browse-individuals"> <ul id="alpha-browse-individuals">
<li><a href="#" class="selected" data-alpha="all">All</a></li> <li><a href="#" class="selected" data-alpha="all">All</a></li>