[Python-checkins] r65579 - in doctools/trunk/sphinx: builder.py static/default.css static/sphinxdoc.css templates/layout.html

[georg.brandl]

Author: georg.brandl
Date: Thu Aug  7 20:46:07 2008
New Revision: 65579

Log:
Link to master doc in TOC heading and logo.


Modified:
   doctools/trunk/sphinx/builder.py
   doctools/trunk/sphinx/static/default.css
   doctools/trunk/sphinx/static/sphinxdoc.css
   doctools/trunk/sphinx/templates/layout.html

Modified: doctools/trunk/sphinx/builder.py
==============================================================================
--- doctools/trunk/sphinx/builder.py	(original)
+++ doctools/trunk/sphinx/builder.py	Thu Aug  7 20:46:07 2008
@@ -383,6 +383,7 @@
             version = self.config.version,
             last_updated = self.last_updated,
             copyright = self.config.copyright,
+            master_doc = self.config.master_doc,
             style = self.config.html_style,
             use_opensearch = self.config.html_use_opensearch,
             docstitle = self.config.html_title,

Modified: doctools/trunk/sphinx/static/default.css
==============================================================================
--- doctools/trunk/sphinx/static/default.css	(original)
+++ doctools/trunk/sphinx/static/default.css	Thu Aug  7 20:46:07 2008
@@ -101,6 +101,10 @@
     padding: 0;
 }
 
+div.sphinxsidebar h3 a {
+    color: white;
+}
+
 div.sphinxsidebar h4 {
     font-family: 'Trebuchet MS', sans-serif;
     color: white;

Modified: doctools/trunk/sphinx/static/sphinxdoc.css
==============================================================================
--- doctools/trunk/sphinx/static/sphinxdoc.css	(original)
+++ doctools/trunk/sphinx/static/sphinxdoc.css	Thu Aug  7 20:46:07 2008
@@ -238,6 +238,10 @@
     background-color: #AFC1C4;
 }
 
+div.sphinxsidebar h3 a {
+    color: white;
+}
+
 div.sphinxsidebar ul {
     padding-left: 1.5em;
     margin-top: 7px;
@@ -277,7 +281,7 @@
     font-size: 1.2em;
 }
 
-h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {
+div.body h1 a, div.body h2 a, div.body h3 a, div.body h4 a, div.body h5 a, div.body h6 a {
     color: black!important;
 }
 

Modified: doctools/trunk/sphinx/templates/layout.html
==============================================================================
--- doctools/trunk/sphinx/templates/layout.html	(original)
+++ doctools/trunk/sphinx/templates/layout.html	Thu Aug  7 20:46:07 2008
@@ -30,12 +30,14 @@
         <div class="sphinxsidebarwrapper">
           {%- block sidebarlogo %}
           {%- if logo %}
-            <p class="logo"><img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/></p>
+            <p class="logo"><a href="{{ pathto(master_doc) }}">
+              <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
+            </a></p>
           {%- endif %}
           {%- endblock %}
           {%- block sidebartoc %}
           {%- if display_toc %}
-            <h3>Table Of Contents</h3>
+            <h3><a href="{{ pathto(master_doc) }}">Table Of Contents</a></h3>
             {{ toc }}
           {%- endif %}
           {%- endblock %}