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

svn: r19089
This commit is contained in:
Rob G. Healey 2012-03-19 06:49:44 +00:00
parent 6bfd0b0e8d
commit 48205702d2

View File

@ -8384,7 +8384,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
@ -8393,7 +8393,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):
@ -8409,12 +8408,11 @@ def alphabet_navigation(menu_set):
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