[Lxml-checkins] r39546 - in lxml/trunk/doc: . html

[scoder at codespeak.net]

Author: scoder
Date: Tue Feb 27 20:13:36 2007
New Revision: 39546

Modified:
   lxml/trunk/doc/html/style.css
   lxml/trunk/doc/mkhtml.py
Log:
content and sidemenu alignment for Firefox, Opera, Konqueror

Modified: lxml/trunk/doc/html/style.css
==============================================================================
--- lxml/trunk/doc/html/style.css	(original)
+++ lxml/trunk/doc/html/style.css	Tue Feb 27 20:13:36 2007
@@ -3,13 +3,13 @@
      * document level */
     text-align: center;
     padding: 1em;
-    padding-left: 26em
 }
 
 div.document {
     width: 45em;
     font: 13px Arial, Verdana, Helvetica, sans-serif;
     margin: 1em auto 1em auto;
+    padding-left: 20em;
     background-color: white;
     color: #222;
     text-align: left;
@@ -44,16 +44,20 @@
     font-size: 130%;
 }
 
-div.sidemenu ul.submenu.current {
+div.sidemenu ul.menu.current > li > a {
+    background-color: yellow;
+}
+
+div.sidemenu ul.menu.current ul.submenu {
     display: block;
 }
 
-div.sidemenu ul.submenu.foreign li {
+div.sidemenu ul.menu.foreign ul.submenu li {
     padding-top: 2px;
     padding-bottom: 2px;
 }
 
-div.sidemenu li.menu:hover ul.submenu.foreign {
+div.sidemenu ul.menu.foreign li.menu:hover ul.submenu {
     display: block;
     position: absolute;
     border: solid red;

Modified: lxml/trunk/doc/mkhtml.py
==============================================================================
--- lxml/trunk/doc/mkhtml.py	(original)
+++ lxml/trunk/doc/mkhtml.py	Tue Feb 27 20:13:36 2007
@@ -19,8 +19,8 @@
                             {"h" : "http://www.w3.org/1999/xhtml"})
 find_headings = XPath("//h:h1[not(@class)]/h:a/text()",
                             {"h" : "http://www.w3.org/1999/xhtml"})
-find_submenu = XPath("//h:ul[@id=$name]//h:ul[starts-with(@class, 'submenu')]",
-                           {"h" : "http://www.w3.org/1999/xhtml"})
+find_menu = XPath("//h:ul[@id=$name]",
+                  {"h" : "http://www.w3.org/1999/xhtml"})
 
 replace_invalid = re.compile(r'[-_/.\s\\]').sub
 
@@ -40,13 +40,13 @@
         page_title = replace_invalid(' ', basename.capitalize())
     headings = find_headings(tree)
     if headings:
-        ul = SubElement(section_head, "ul", {"class":"menu", "id":basename})
+        ul = SubElement(section_head, "ul", {"class":"menu foreign", "id":basename})
 
         title = SubElement(ul, "li", {"class":"menu title"})
         a = SubElement(title, "a", href=basename+".html")
         a.text = page_title
 
-        subul = SubElement(title, "ul", {"class":"submenu foreign"})
+        subul = SubElement(title, "ul", {"class":"submenu"})
         for heading in headings:
             li = SubElement(subul, "li", {"class":"menu item"})
             ref = replace_invalid('-', heading.lower())
@@ -60,9 +60,9 @@
         tag = el.tag
         if tag[0] != '{':
             el.tag = "{http://www.w3.org/1999/xhtml}" + tag
-    current_submenu = find_submenu(menu_root, name=name)
-    if current_submenu:
-        for submenu in current_submenu:
+    current_menu = find_menu(menu_root, name=name)
+    if current_menu:
+        for submenu in current_menu:
             submenu.set("class", submenu.get("class", "").
                         replace("foreign", "current"))
     return tree