[Checkins] SVN: grok/trunk/ Bump Sphinx version to latest current 0.4 release, and adjust for changes in this newer release.

[Kevin Teague]

Log message for revision 87837:
  Bump Sphinx version to latest current 0.4 release, and adjust for changes in this newer release.

Changed:
  U   grok/trunk/doc/.static/grok.css
  U   grok/trunk/doc/conf.py
  U   grok/trunk/doc/docindex.template
  U   grok/trunk/grokdocs/setup.py

-=-
Modified: grok/trunk/doc/.static/grok.css
===================================================================
--- grok/trunk/doc/.static/grok.css	2008-06-28 06:25:19 UTC (rev 87836)
+++ grok/trunk/doc/.static/grok.css	2008-06-28 08:33:29 UTC (rev 87837)
@@ -99,7 +99,7 @@
     padding: 10px 5px 0 10px;
 }
 
-.document > div.sidebar {
+.sphinxsidebar {
     float: left;
     width: 250px;
     margin-left: -100%;
@@ -108,11 +108,11 @@
     padding: 8px;
 }
 
-.document > div.sidebar a {
+.sphinxsidebar a {
     color: #436976;
 }
 
-.document > div.sidebar h3 {
+.sphinxsidebar h3 {
     font-family: 'Trebuchet MS', sans-serif;
     font-size: 1.4em;
     font-weight: normal;
@@ -120,7 +120,7 @@
     padding: 0;
 }
 
-.document > div.sidebar h4 {
+.sphinxsidebar h4 {
     font-family: 'Trebuchet MS', sans-serif;
     font-size: 1.3em;
     font-weight: normal;
@@ -128,38 +128,38 @@
     padding: 0;
 }
 
-.document > div.sidebar p.topless {
+.sphinxsidebar p.topless {
     margin: 5px 10px 10px 10px;
 }
 
-.document > div.sidebar ul {
+.sphinxsidebar ul {
     margin: 10px;
     padding: 0;
     list-style: none;
     color: #c90;
 }
 
-.document > div.sidebar ul ul,
-.document > div.sidebar ul.want-points {
+.sphinxsidebar ul ul,
+.sphinxsidebar ul.want-points {
     margin-left: 20px;
     list-style: square;
     color: #436976;
 }
 
-.document > div.sidebar ul ul {
+.sphinxsidebar ul ul {
     margin-top: 0;
     margin-bottom: 0;
 }
 
-.document > div.sidebar ul li {
+.sphinxsidebar ul li {
     margin: 0.25em 0 0.5em 0;
 }
 
-.document > div.sidebar form {
+.sphinxsidebar form {
     margin-top: 10px;
 }
 
-.document > div.sidebar input {
+.sphinxsidebar input {
     border: 1px solid #555555;
     font-family: sans-serif;
     font-size: 1em;

Modified: grok/trunk/doc/conf.py
===================================================================
--- grok/trunk/doc/conf.py	2008-06-28 06:25:19 UTC (rev 87836)
+++ grok/trunk/doc/conf.py	2008-06-28 08:33:29 UTC (rev 87837)
@@ -39,7 +39,7 @@
 #extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
-#templates_path = []
+templates_path = ['.']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -87,16 +87,12 @@
 # typographically correct entities.
 html_use_smartypants = True
 
-# Content template for the index page, filename relative to this file.
-#html_index = ''
-html_index = path.join(path.abspath(curdir), 'docindex.template')
-
 # Custom sidebar templates, maps page names to filenames relative to this file.
 #html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # filenames relative to this file.
-#html_additional_pages = {}
+html_additional_pages = {'index':'docindex.template'}
 
 # If true, the reST sources are included in the HTML build as _sources/<name>.
 #html_copy_source = True

Modified: grok/trunk/doc/docindex.template
===================================================================
--- grok/trunk/doc/docindex.template	2008-06-28 06:25:19 UTC (rev 87836)
+++ grok/trunk/doc/docindex.template	2008-06-28 08:33:29 UTC (rev 87837)
@@ -1,3 +1,5 @@
+{% extends "defindex.html" %}
+{% block tables %}
 
   <p><strong>Sections</strong></p>
   <table class="contentstable" align="center"><tr>
@@ -67,3 +69,5 @@
 	contains deeper information on working with Grok, as well as using 
 	additional packages with Grok that are not part of the core framework.
   </p>
+
+{% endblock %}
\ No newline at end of file

Modified: grok/trunk/grokdocs/setup.py
===================================================================
--- grok/trunk/grokdocs/setup.py	2008-06-28 06:25:19 UTC (rev 87836)
+++ grok/trunk/grokdocs/setup.py	2008-06-28 08:33:29 UTC (rev 87837)
@@ -10,7 +10,7 @@
 Grokdocs: Build the Grok documentation in different formats!
 """,
     install_requires=['docutils==0.4',
-                      'Sphinx==0.1.61950',
+                      'Sphinx==0.4',
                       'Pygments',
                       ],
     package_dir = {'': 'src'},