merge with 3.2

birkenfeld · birkenfeld · commit 288b9bf1ea3e · 2012-03-25T20:32:35.000+02:00
diff --git a/Doc/conf.py b/Doc/conf.py
@@ -65,9 +65,12 @@
 # Options for HTML output
 # -----------------------
 
-html_theme = 'default'
+html_theme = 'pydoctheme'
+html_theme_path = ['tools/sphinxext']
 html_theme_options = {'collapsiblesidebar': True}
 
+html_short_title = '%s Documentation' % release
+
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
 html_last_updated_fmt = '%b %d, %Y'
diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html
@@ -2,6 +2,7 @@
 {% block rootrellink %}
         <li><img src="{{ pathto('_static/py.png', 1) }}" alt=""
                  style="vertical-align: middle; margin-top: -1px"/></li>
+        <li><a href="http://www.python.org/">Python</a>{{ reldelim1 }}</li>
         <li><a href="{{ pathto('index') }}">{{ shorttitle }}</a>{{ reldelim1 }}</li>
 {% endblock %}
 {% block extrahead %}
diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
@@ -27,10 +27,10 @@ def new_visit_versionmodified(self, node):
     self.body.append(self.starttag(node, 'p', CLASS=node['type']))
     text = versionlabels[node['type']] % node['version']
     if len(node):
-        text += ': '
+        text += ':'
     else:
         text += '.'
-    self.body.append('<span class="versionmodified">%s</span>' % text)
+    self.body.append('<span class="versionmodified">%s</span> ' % text)
 
 from sphinx.writers.html import HTMLTranslator
 from sphinx.locale import versionlabels
diff --git a/Doc/tools/sphinxext/static/copybutton.js b/Doc/tools/sphinxext/static/copybutton.js
@@ -17,7 +17,8 @@ $(document).ready(function() {
         'cursor':'pointer', 'position': 'absolute', 'top': '0', 'right': '0',
         'border-color': border_color, 'border-style': border_style,
         'border-width': border_width, 'color': border_color, 'text-size': '75%',
-        'font-family': 'monospace', 'padding-left': '0.2em', 'padding-right': '0.2em'
+        'font-family': 'monospace', 'padding-left': '0.2em', 'padding-right': '0.2em',
+        'border-radius': '0 3px 0 0'
     }
 
     // create and add the button to all the code blocks that contain >>>

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ $(document).ready(function() {`
`17`	`17`	`'cursor':'pointer', 'position': 'absolute', 'top': '0', 'right': '0',`
`18`	`18`	`'border-color': border_color, 'border-style': border_style,`
`19`	`19`	`'border-width': border_width, 'color': border_color, 'text-size': '75%',`
`20`		`- 'font-family': 'monospace', 'padding-left': '0.2em', 'padding-right': '0.2em'`
	`20`	`+ 'font-family': 'monospace', 'padding-left': '0.2em', 'padding-right': '0.2em',`
	`21`	`+ 'border-radius': '0 3px 0 0'`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`// create and add the button to all the code blocks that contain >>>`