- pull in the whole top into the fixed part, reduce the size, clean it up

5 files changed, 40 insertions, 64 deletions

diff --git a/doc/build/conf.py b/doc/build/conf.py
index ff7f70661..b714fc579 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -206,9 +206,11 @@ html_domain_indices = False
 
 # If true, the reST sources are included in the HTML build as _sources/<name>.
 #html_copy_source = True
+html_copy_source = False
 
 # If true, links to the reST sources are added to the pages.
 #html_show_sourcelink = True
+html_show_sourcelink = False
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
 #html_show_sphinx = True
diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css
index 54ae768d0..d3131bfc7 100644
--- a/doc/build/static/docs.css
+++ b/doc/build/static/docs.css
@@ -2,7 +2,7 @@
 
 body {
   background-color: #FDFBFC;
-  margin:38px;
+  margin:0 38px;
   color:#333333;
 }
 
@@ -61,6 +61,7 @@ a.headerlink:hover {
 
 #docs-container {
   max-width:1000px;
+  margin: 0 auto;
 }
 
 
@@ -77,7 +78,7 @@ a.headerlink:hover {
   font-family:Verdana,sans-serif;
 
   font-size:.9em;
-
+  position: relative;
 }
 
 #docs-top-navigation,
@@ -92,8 +93,14 @@ a.headerlink:hover {
 #docs-top-navigation {
   margin:10px 0px;
   line-height:1.2em;
+  position: relative;
 }
 
+#docs-version-header {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+}
 
 .docs-navigation-links {
   font-family:Verdana,sans-serif;
@@ -121,13 +128,10 @@ a.headerlink:hover {
     font-size:1.6em;
 }
 
-#docs-search {
-    float:right;
-}
-
 #docs-top-page-control {
-  float:right;
-  width:350px;
+  position: absolute;
+  right: 20px;
+  bottom: 14px;
 }
 
 #docs-top-page-control ul {
diff --git a/doc/build/static/init.js b/doc/build/static/init.js
index c7de23a9a..23a4d9733 100644
--- a/doc/build/static/init.js
+++ b/doc/build/static/init.js
@@ -17,28 +17,27 @@ function initFloatyThings() {
         $("#docs-top-navigation-container").css("width", $("#docs-container").width());
     }
 
-    $(window).scroll(function() {
+    function setScroll() {
         var scrolltop = $(window).scrollTop();
         if (scrolltop >= automatedBreakpoint - 10) {
             setNavSize();
             $("#docs-top-navigation-container").addClass("automated");
             $("#docs-sidebar").addClass("automated");
             $("#docs-sidebar").css("top", $("#docs-top-navigation-container").height());
-            $("#docs-top-navigation").addClass("automated");
-            $("#docs-body").css("padding-top", "100px");
+            $("#docs-body").css("margin-top", $("#docs-top-navigation-container").height());
         }
         else {
             $("#docs-top-navigation-container.automated").css("width", "");
             $("#docs-sidebar.automated").scrollTop(0);
             $("#docs-top-navigation-container").removeClass("automated");
             $("#docs-sidebar").removeClass("automated");
-            $("#docs-top-navigation").removeClass("automated");
-            $("#docs-body").css("padding-top", "");
+            $("#docs-body").css("margin-top", "");
         }
-
-    })
+    }
+    $(window).scroll(setScroll)
 
     $(window).resize(setNavSize());
+    setScroll();
 }
 
 
diff --git a/doc/build/templates/layout.mako b/doc/build/templates/layout.mako
index 192780eff..e7de6e2db 100644
--- a/doc/build/templates/layout.mako
+++ b/doc/build/templates/layout.mako
@@ -89,52 +89,41 @@ withsidebar = bool(toc) and current_page_name != 'index'
 
 </%block>
 
-<div id="docs-header">
-    <h1>${docstitle|h}</h1>
-
-    <div id="docs-search">
-    Search:
-    <form class="search" action="${pathto('search')}" method="get">
-      <input type="text" name="q" size="18" /> <input type="submit" value="${_('Search')}" />
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-    </div>
 
+<div id="docs-top-navigation-container">
+<div id="docs-header">
     <div id="docs-version-header">
         Release: <span class="version-num">${release}</span> | Release Date: ${release_date}
 
-        % if pdf_url:
-        | <a href="${pdf_url}">Download PDF</a>
-        % endif
 
     </div>
 
-</div>
+    <h1>${docstitle|h}</h1>
 
-<div id="docs-top-navigation-container">
+
+
+</div>
 <div id="docs-top-navigation">
     <div id="docs-top-page-control" class="docs-navigation-links">
-        <ul>
         % if prevtopic:
-            <li>Prev:
-            <a href="${prevtopic['link']|h}" title="${_('previous chapter')}">${prevtopic['title']}</a>
-            </li>
+            <a href="${prevtopic['link']|h}" title="${prevtopic['title']}">Prev</a> |
         % endif
         % if nexttopic:
-            <li>Next:
-            <a href="${nexttopic['link']|h}" title="${_('next chapter')}">${nexttopic['title']}</a>
-            </li>
+            <a href="${nexttopic['link']|h}" title="${nexttopic['title']}">Next</a> |
+        % endif
+
+        <a href="${pathto('index')}">Contents</a> |
+        <a href="${pathto('genindex')}">Index</a>
+        % if pdf_url:
+        | <a href="${pdf_url}">PDF</a>
         % endif
 
-        <li>
-            <a href="${pathto('contents')}">Table of Contents</a> |
-            <a href="${pathto('genindex')}">Index</a>
-            % if sourcename:
-            | <a href="${pathto('_sources/' + sourcename, True)|h}">${_('view source')}
-            % endif
-        </li>
-        </ul>
+        | <form class="search" action="${pathto('search')}" method="get">
+          <input type="text" name="q" size="12" /> <input type="submit" value="${_('Search')}" />
+          <input type="hidden" name="check_keywords" value="yes" />
+          <input type="hidden" name="area" value="default" />
+        </form>
+
     </div>
 
     <div id="docs-navigation-banner">
@@ -163,15 +152,6 @@ withsidebar = bool(toc) and current_page_name != 'index'
 % if withsidebar:
     <div id="docs-sidebar">
 
-    <h4>Quick Search</h4>
-    <p>
-    <form class="search" action="${pathto('search')}" method="get">
-      <input type="text" name="q" size="18" /> <input type="submit" value="${_('Search')}" />
-      <input type="hidden" name="check_keywords" value="yes" />
-      <input type="hidden" name="area" value="default" />
-    </form>
-    </p>
-
     <h3><a href="${pathto('index')}">Table of Contents</a></h3>
     ${toc}
 
diff --git a/doc/build/templates/search.mako b/doc/build/templates/search.mako
index 83a3fcd84..d0aa3d825 100644
--- a/doc/build/templates/search.mako
+++ b/doc/build/templates/search.mako
@@ -14,15 +14,6 @@
     </script>
 </%block>
 
-<div id="searchform">
-<h3>Enter Search Terms:</h3>
-<form class="search" action="${pathto('search')}" method="get">
-  <input type="text" name="q" size="18" /> <input type="submit" value="${_('Search')}" />
-  <input type="hidden" name="check_keywords" value="yes" />
-  <input type="hidden" name="area" value="default" />
-</form>
-</div>
-
 <div id="search-results"></div>
 
 <%block name="footer">