Bug#0002738: NarrativeWeb: strange behaviour with alphabet navigation when used with narrow browser window --> has now been fixed.

svn: r19088
This commit is contained in:
Rob G. Healey 2012-03-19 06:36:27 +00:00
parent 65764aef8f
commit 99185e213a
2 changed files with 3 additions and 8 deletions

View File

@ -8317,7 +8317,7 @@ def alphabet_navigation(menu_set):
return None, [] return None, []
num_ltrs = len(sorted_alpha_index) num_ltrs = len(sorted_alpha_index)
num_of_cols = 32 num_of_cols = 26
num_of_rows = ((num_ltrs // num_of_cols) + 1) num_of_rows = ((num_ltrs // num_of_cols) + 1)
# begin alphabet navigation division # begin alphabet navigation division
@ -8326,7 +8326,6 @@ def alphabet_navigation(menu_set):
index = 0 index = 0
for row in xrange(num_of_rows): for row in xrange(num_of_rows):
unordered = Html("ul") unordered = Html("ul")
alphabetnavigation += unordered
cols = 0 cols = 0
while (cols <= num_of_cols and index < num_ltrs): while (cols <= num_of_cols and index < num_ltrs):
@ -8341,13 +8340,11 @@ def alphabet_navigation(menu_set):
unordered.extend( unordered.extend(
Html("li", hyper, inline = True) Html("li", hyper, inline = True)
) )
# increase letter/ word in sorted_alpha_index
index += 1 index += 1
cols += 1 cols += 1
num_of_rows -= 1 num_of_rows -= 1
# return alphabet navigation, and menu_set to its callers alphabetnavigation += unordered
# EventListPage will reuse sorted_alpha_index # EventListPage will reuse sorted_alpha_index
return alphabetnavigation, sorted_alpha_index return alphabetnavigation, sorted_alpha_index

View File

@ -128,15 +128,13 @@ a[href]:hover, a[href]:active {
div#nav, #subnavigation { div#nav, #subnavigation {
border: solid 1px #454; /* needed by IE7 */ border: solid 1px #454; /* needed by IE7 */
} }
#subnavigation ul {
overflow: hidden;
}
div#nav ul, #subnavigation ul { div#nav ul, #subnavigation ul {
list-style: none; list-style: none;
margin: 0px; margin: 0px;
padding-left: 15px; padding-left: 15px;
} }
#subnavigation ul { #subnavigation ul {
overflow: hidden;
border-bottom: solid 1px #7C8F7C; border-bottom: solid 1px #7C8F7C;
} }
div#nav ul li, #subnavigation ul li { div#nav ul li, #subnavigation ul li {