Move a few things around on the page layout.

* Move the search box to the sidebar
 * Move the next/prev/etc. in the topbar to the first row, and remove the 2nd row in the topbar
 * Adjust the margins of the sidebar and doc body up to the new size of the topbar
 * Remove the Next/Prev items from the sidebar
 * Move the "show page source" to the bottom of the sidebar and reduce the font

docs/sphinx/_static/css/phoenix.css

@@ -88,8 +88,8 @@ div.body h4 {
  */
 
 body { 
-  background-color: rgb(230,230,230);
-  font-size: 0.95em;
+    background-color: rgb(230,230,230);
+    font-size: 0.95em;
 }
 
 div.headerimage {
@@ -105,7 +105,7 @@ div.document {
   position: relative;
   margin-left: 240px;
   z-index: 0;
-  top: 50px;
+  top: 30px;
 }
 
 div.sphinxsidebar {
@@ -119,8 +119,19 @@ div.sphinxsidebar {
     height: auto;
     z-index: 1;
     left: 0;
-    top: 50px;
-    bottom: 0;  
+    top: 30px;
+    bottom: 0;    
+}
+
+div#searchbox {
+    margin-top: 30px;
+}
+
+div#sourcelink {
+    position: absolute; 
+    bottom: 0;
+    font-style: italic;
+    font-size: small;
 }
 
 div.related {
@@ -161,7 +172,6 @@ div.related ul li.right {
     font-size: small;
     float: right;
     margin-right: 5px;
-    margin-top: 0;
 }
 
 div.related ul li#searchbox.right {

docs/sphinx/_templates/layout.html

@@ -1,4 +1,4 @@
-{% extends "!layout.html" %}
+{% extends "basic/layout.html" %}
 
 {%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool)
     and (sidebars != []) and (pagename != 'index') %}
@@ -35,34 +35,19 @@
         <li><a href="main.html" style="color: rgb(238, 152, 22); hover: rgb(53, 95, 124);">API Docs</a> &raquo; </li>
 
         {%- for parent in parents %}
-          <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
+          <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>
+              {{ parent.title }}</a>{{ reldelim1 }}</li>
         {%- endfor %}
         <li class="reltitle"> {{ title }}</li>
 
-        {%- if pagename != 'search' %}
-        <li id="searchbox" style="display: none;" class="right">
-          <form class="search" action="{{ pathto('search') }}" method="get">
-            <span>{{ _('Search:') }}</span>
-            <input type="text" name="q" size="18" />
-            <input type="submit" value="{{ _('Go') }}" />
-            <input type="hidden" name="check_keywords" value="yes" />
-            <input type="hidden" name="area" value="default" />
-          </form>
-        </li>
-        <script type="text/javascript">$('#searchbox').show(0);</script>
-        {%- endif %}
-
-        </ul>
-        <ul class="row2">
-
         {%- for rellink in rellinks %}
         <li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}>
           <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
              {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
           {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
         {%- endfor %}
-        
-      </ul>
+
+        </ul>
     </div>
 {%- endmacro %}
 

docs/sphinx/_templates/searchbox.html

@@ -0,0 +1,21 @@
+{#
+    basic/searchbox.html
+    ~~~~~~~~~~~~~~~~~~~~
+
+    Sphinx sidebar template: quick search box.
+
+    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{%- if pagename != "search" and builder != "singlehtml" %}
+<div id="searchbox" style="display: none" role="search">
+  <h4>{{ _('Search') }}</h4>
+    <form class="search" action="{{ pathto('search') }}" method="get">
+      <input type="text" name="q" />
+      <input type="submit" value="{{ _('Go') }}" />
+      <input type="hidden" name="check_keywords" value="yes" />
+      <input type="hidden" name="area" value="default" />
+    </form>
+</div>
+<script type="text/javascript">$('#searchbox').show(0);</script>
+{%- endif %}

docs/sphinx/_templates/sourcelink.html

@@ -0,0 +1,15 @@
+{#
+    basic/sourcelink.html
+    ~~~~~~~~~~~~~~~~~~~~~
+
+    Sphinx sidebar template: "show source" link.
+
+    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{%- if show_source and has_source and sourcename %}
+    <div id="sourcelink" role="note" aria-label="source link">
+        <a href="{{ pathto('_sources/' + sourcename, true)|e }}"
+           rel="nofollow">{{ _('Show page source') }}</a>
+    </div>
+{%- endif %}

docs/sphinx/conf.py

@@ -3,7 +3,8 @@
 # Phoenix documentation build configuration file, created by
 # sphinx-quickstart on Mon Jun 22 09:32:57 2009.
 #
-# This file is execfile()d with the current directory set to its containing dir.
+# This file is execfile()d with the current directory set to its
+# containing dir.
 #
 # Note that not all possible configuration values are present in this
 # autogenerated file.
@@ -24,15 +25,17 @@ sys.path.append(os.path.abspath('..'))
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.todo', 'sphinx.ext.autodoc',
-              'sphinx.ext.autosummary', 'sphinx.ext.coverage',
+extensions = ['sphinx.ext.todo',
+              'sphinx.ext.autodoc',
+              'sphinx.ext.autosummary',
+              'sphinx.ext.coverage',
               'availability']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
-# The suffix of source filenames.
-source_suffix = '.txt'
+# The suffix(es) of source filenames.
+source_suffix = ['.txt']
 
 todo_include_todos = True
 todo_all_todos = True
@@ -100,6 +103,8 @@ pygments_style = 'sphinx'
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
 
 # -- Options for HTML output ---------------------------------------------------
 
@@ -147,7 +152,15 @@ html_style = 'css/phoenix.css'
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-html_sidebars = {'index': 'indexsidebar.html'}
+html_sidebars = {
+    'index': ['indexsidebar.html'], # TODO: index page doesn't have a sidebar??
+    'main':  ['searchbox.html'],
+    '**':    ['localtoc.html',
+             #'relations.html',  # Next/Prev in the sidebar, disabled for now
+              'searchbox.html',
+              'sourcelink.html',
+             ],
+}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.

docs/sphinx/rest_substitutions/overviews/index.rst

@@ -1,4 +1,4 @@
-.. wxPython Phoenix documentation master file,
+.. wxPython Phoenix documentation
    Created:   9-Dec-2011
    Copyright: (c) 2011-2016 by Total Control Software
    License:   wxWindows License