From 99185e213abb7296c7023047902620b4c963b1e6 Mon Sep 17 00:00:00 2001
From: "Rob G. Healey" <robhealey1@gmail.com>
Date: Mon, 19 Mar 2012 06:36:27 +0000
Subject: [PATCH] Bug#0002738: NarrativeWeb: strange behaviour with alphabet
 navigation when used with narrow browser window --> has now been fixed.

svn: r19088
---
 src/plugins/webreport/NarrativeWeb.py          | 7 ++-----
 src/plugins/webstuff/css/Web_Basic-Cypress.css | 4 +---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
index 44cf19c07..35241053c 100644
--- a/src/plugins/webreport/NarrativeWeb.py
+++ b/src/plugins/webreport/NarrativeWeb.py
@@ -8317,7 +8317,7 @@ def alphabet_navigation(menu_set):
         return None, []
 
     num_ltrs = len(sorted_alpha_index)
-    num_of_cols = 32
+    num_of_cols = 26
     num_of_rows = ((num_ltrs // num_of_cols) + 1)
 
     # begin alphabet navigation division
@@ -8326,7 +8326,6 @@ def alphabet_navigation(menu_set):
         index = 0
         for row in xrange(num_of_rows):
             unordered = Html("ul") 
-            alphabetnavigation += unordered
 
             cols = 0
             while (cols <= num_of_cols and index < num_ltrs):
@@ -8341,13 +8340,11 @@ def alphabet_navigation(menu_set):
                 unordered.extend(
                     Html("li", hyper, inline = True)
                 )
-
-                # increase letter/ word in sorted_alpha_index
                 index += 1
                 cols += 1
             num_of_rows -= 1
 
-    # return alphabet navigation, and menu_set to its callers
+            alphabetnavigation += unordered
     # EventListPage will reuse sorted_alpha_index
     return alphabetnavigation, sorted_alpha_index
 
diff --git a/src/plugins/webstuff/css/Web_Basic-Cypress.css b/src/plugins/webstuff/css/Web_Basic-Cypress.css
index 8c6948c2d..3b0281d69 100644
--- a/src/plugins/webstuff/css/Web_Basic-Cypress.css
+++ b/src/plugins/webstuff/css/Web_Basic-Cypress.css
@@ -128,15 +128,13 @@ a[href]:hover, a[href]:active {
 div#nav, #subnavigation {
     border: solid 1px #454; /* needed by IE7 */
 }
-#subnavigation ul {
-    overflow: hidden;
-}
 div#nav ul, #subnavigation ul {
     list-style: none;
     margin: 0px;
     padding-left: 15px;
 }
 #subnavigation ul {
+    overflow: hidden;
     border-bottom: solid 1px #7C8F7C;
 }
 div#nav ul li, #subnavigation ul li {