css stuff
diff --git a/doc/build/templates/base.html b/doc/build/templates/base.html index 9758956..fc85470 100644 --- a/doc/build/templates/base.html +++ b/doc/build/templates/base.html
@@ -27,6 +27,8 @@ <div id="topanchor"><a name="top"></a> </div> +<div id="pagecontrol"><a href="index.${extension}">Multiple Pages</a> | <a href="documentation.${extension}">One Page</a></div> + <h1>${toc.root.doctitle}</h1> <div class="versionheader">Version: ${version} Last Updated: ${time.strftime('%x %X', time.localtime(last_updated))}</div>
diff --git a/doc/build/templates/content_layout.html b/doc/build/templates/content_layout.html index b5e5ed4..7fa68c0 100644 --- a/doc/build/templates/content_layout.html +++ b/doc/build/templates/content_layout.html
@@ -2,6 +2,7 @@ <%inherit file="base.html"/> <%namespace file="nav.html" import="topnav"/> + <% current = toc.get_by_file(self.template.module.filename) %>
diff --git a/doc/build/templates/formatting.html b/doc/build/templates/formatting.html index 2f7c64e..77774c6 100644 --- a/doc/build/templates/formatting.html +++ b/doc/build/templates/formatting.html
@@ -14,32 +14,22 @@ <%namespace name="nav" file="nav.html"/> <%def name="section(toc, path, description=None)"> - FORMATTING SECTION ${path} # Main section formatting element. <% - import sys, traceback - try: - item = toc.get_by_path(path) - except: - context.write("EXCEPTION GETTING ITEM") - context.write(repr(sys.exc_info()[1].args)) - context.write(repr(traceback.extract_tb(sys.exc_info()[2]))) + item = toc.get_by_path(path) + subsection = item.depth > 1 %> - CHECK1 ITEM ${item} <A name="${item.path}"></a> - <div class="section" style="margin-left:${repr(item.depth * 10)}px;"> + <div class="${subsection and 'subsection' or 'section'}"> <% content = capture(caller.body) re2 = re.compile(r"'''PYESC(.+?)PYESC'''", re.S) content = re2.sub(lambda m: m.group(1), content) %> - CHECK2 - % if item.depth > 1: - <h3>${description or item.description}</h3> - % endif - CHECK3 + <h3>${description or item.description}</h3> + ${content} % if item.depth > 1: @@ -50,7 +40,6 @@ <a href="#${ item.get_page_root().path }">back to section top</a> ${nav.pagenav(item=item)} % endif - CHECK4 </div> </%def>
diff --git a/doc/build/templates/nav.html b/doc/build/templates/nav.html index c4888b8..c1e36e5 100644 --- a/doc/build/templates/nav.html +++ b/doc/build/templates/nav.html
@@ -28,7 +28,7 @@ </%def> <%def name="topnav(item, extension='html')"> - <a href="index.${ extension }">Table of Contents</a> + <div class="topnav"> <div class="prevnext"> % if item.previous is not None: @@ -42,10 +42,14 @@ % if item.next is not None: Next: ${itemlink(item=item.next, anchor=False)} % endif - </div> - ${ item.description } + + <h3 class="tableofcontents"><a href="index.${ extension }">Table of Contents</a></h3> + + <h3>${ item.description }</h3> + ${tocns.printtoc(root=item, current=None, full=True, anchor_toplevel=True)} + </div> </%def> <%def name="pagenav(item)">
diff --git a/doc/build/templates/toc.html b/doc/build/templates/toc.html index 5f3d16a..9853b40 100644 --- a/doc/build/templates/toc.html +++ b/doc/build/templates/toc.html
@@ -4,62 +4,28 @@ <div class="maintoc"> <a name="table_of_contents"></a> - <h2>Table of Contents</h2> - - <a href="#full_index">(view full table)</a> - <br/><br/> + <h2>Table of Contents <a class="smalllink" href="#full_index">(view full)</a></h2> - <div style="margin-left:50px;"> ${printtoc(root=toc,current=None,full=False,children=False,anchor_toplevel=False)} - </div> - </div> - - <div class="maintoc"> <a name="full_index"></a> - <h2>Table of Contents: Full</h2> - - <a href="#table_of_contents">(view brief table)</a> - <br/><br/> - - <div style="margin-left:50px;"> + <h2>Table of Contents <a class="smalllink" href="#table_of_contents">(view brief)</a></h2> + ${printtoc(root=toc,current=None,full=True,children=True,anchor_toplevel=False)} - </div> </div> </%def> -<%def name="printtoc(root,current=None,full=False,children=True,anchor_toplevel=False)"> - <ul class="toc_list"> - % for i in root.children: - ${printtocelement(item=i, bold = (i == current), full = full, children=children, anchor_toplevel=anchor_toplevel)} +<%def name="printtoc(root,current=None,full=False,children=True,anchor_toplevel=False,extension='html')"> + <ul> + % for item in root.children: + <li><A style="${item is current and "font-weight:bold;" or "" }" href="${item.get_link(extension=extension,anchor=anchor_toplevel) }">${item.description}</a></li> + + % if children: + ${printtoc(item, current=current, full=full,children=True,anchor_toplevel=anchor_toplevel)} + % endif % endfor </ul> </%def> -<%def name="printtocelement(item, anchor_toplevel, bold=False, full=False, children=True, extension='html')"> - # prints a TOCElement as a table of contents item and prints its immediate child items - <li><A style="${bold and "font-weight:bold;" or "" }" href="${item.get_link(extension=extension, anchor=anchor_toplevel) }">${item.description}</a></li> - - % if children: - <ul class="small_toc_list"> - % for i in item.children: - ${printsmtocelem(item=i, children=full)} - % endfor - </ul> - % endif -</%def> - -<%def name="printsmtocelem(item, children=False, extension='html')"> - <li><A href="${item.get_link(extension=extension)}">${item.description}</a></li> - - % if children: - <ul class="small_toc_list"> - % for i in item.children: - ${printsmtocelem(item=i)} - % endfor - </ul> - % endif - -</%def>
diff --git a/doc/docs.css b/doc/docs.css index 2157d39..7d67785 100644 --- a/doc/docs.css +++ b/doc/docs.css
@@ -1 +1,91 @@ -#topanchor {position:absolute;left:0px;top:0px;width:0px;height:0px;} \ No newline at end of file +#topanchor {position:absolute;left:0px;top:0px;width:0px;height:0px;} +#pagecontrol {float:right;} + +body { + font-family: Tahoma, Geneva, sans-serif; + font-size:.90em; + line-height:1.4em; +} + +a { text-decoration: none; color:#2929ff;} +a:visited { color: #2929ff;} +a:hover { color: #600060;} + +h1 { + font-size:1.6em; + font-weight:bold; +} + +h2 { + font-size:1.1em; + font-weight:bold; + margin:10px 0px 10px 0px; +} + +h3.tableofcontents { + font-weight:normal; + margin:0px 0px 0px 0px; +} + +.prevnext { + float:right; +} +.section { + +} +.subsection { + margin:0px 0px 0px 20px; +} + +.maintoc { + background-color: #eee; + border: 1px solid #ccc; +} + +.maintoc li { + font-size:.9em; + list-style-type:none; +} +.maintoc li li { + font-size:.8em; +} +.maintoc ul { + padding:0px 0px 0px 20px; + margin:0px 0px 0px 0px; +} + +.topnav { + background-color: #eee; + border: 1px solid #ccc; + padding:10px 10px 0px 10px; + margin:0px 0px 10px 0px; +} + +.smalllink { + font-size:.80em; +} +.code { + font-family:monospace; +} +p { + margin:5px 20px 5px 10px; +} + +li { + margin:1px 0px 1px 0px; +} +td { + font-size:small; +} + +pre { + margin: 1.5em; + padding: .5em; + font-size: .95em; + line-height:1em; + background-color: #eee; + border: 1px solid #ccc; + width:450px; + overflow:auto; +} +