[Python-checkins] r66252 - in doctools/branches/0.4.x: CHANGES sphinx/templates/genindex-single.html sphinx/templates/genindex-split.html sphinx/templates/genindex.html sphinx/templates/modindex.html sphinx/templates/search.html

[georg.brandl]

Author: georg.brandl
Date: Sat Sep  6 18:38:19 2008
New Revision: 66252

Log:
Properly call ``super()`` in overridden blocks in builtin templates,
even if the blocks are empty in the builtin layout.html they may contain
something in an overridden one.


Modified:
   doctools/branches/0.4.x/CHANGES
   doctools/branches/0.4.x/sphinx/templates/genindex-single.html
   doctools/branches/0.4.x/sphinx/templates/genindex-split.html
   doctools/branches/0.4.x/sphinx/templates/genindex.html
   doctools/branches/0.4.x/sphinx/templates/modindex.html
   doctools/branches/0.4.x/sphinx/templates/search.html

Modified: doctools/branches/0.4.x/CHANGES
==============================================================================
--- doctools/branches/0.4.x/CHANGES	(original)
+++ doctools/branches/0.4.x/CHANGES	Sat Sep  6 18:38:19 2008
@@ -1,6 +1,8 @@
 Release 0.4.3 (in development)
 ==============================
 
+* Properly call ``super()`` in overridden blocks in templates.
+
 * Add a fix when using XeTeX.
 
 * Unify handling of LaTeX escaping.

Modified: doctools/branches/0.4.x/sphinx/templates/genindex-single.html
==============================================================================
--- doctools/branches/0.4.x/sphinx/templates/genindex-single.html	(original)
+++ doctools/branches/0.4.x/sphinx/templates/genindex-single.html	Sat Sep  6 18:38:19 2008
@@ -42,4 +42,5 @@
    {%- endfor %}</p>
 
    <p><a href="{{ pathto('genindex-all') }}"><strong>Full index on one page</strong></a></p>
+{{ super() }}
 {% endblock %}

Modified: doctools/branches/0.4.x/sphinx/templates/genindex-split.html
==============================================================================
--- doctools/branches/0.4.x/sphinx/templates/genindex-split.html	(original)
+++ doctools/branches/0.4.x/sphinx/templates/genindex-split.html	Sat Sep  6 18:38:19 2008
@@ -26,4 +26,5 @@
 
    <p><a href="{{ pathto('genindex-all') }}"><strong>Full index on one page</strong></a></p>
 {% endif %}
+   {{ super() }}
 {% endblock %}

Modified: doctools/branches/0.4.x/sphinx/templates/genindex.html
==============================================================================
--- doctools/branches/0.4.x/sphinx/templates/genindex.html	(original)
+++ doctools/branches/0.4.x/sphinx/templates/genindex.html	Sat Sep  6 18:38:19 2008
@@ -53,4 +53,5 @@
 
    <p><a href="{{ pathto('genindex-all') }}"><strong>Full index on one page</strong></a></p>
 {% endif %}
+   {{ super() }}
 {% endblock %}

Modified: doctools/branches/0.4.x/sphinx/templates/modindex.html
==============================================================================
--- doctools/branches/0.4.x/sphinx/templates/modindex.html	(original)
+++ doctools/branches/0.4.x/sphinx/templates/modindex.html	Sat Sep  6 18:38:19 2008
@@ -1,6 +1,7 @@
 {% extends "layout.html" %}
 {% set title = 'Global Module Index' %}
 {% block extrahead %}
+{{ super() }}
 {% if collapse_modindex %}
     <script type="text/javascript">
       DOCUMENTATION_OPTIONS.COLLAPSE_MODINDEX = true;

Modified: doctools/branches/0.4.x/sphinx/templates/search.html
==============================================================================
--- doctools/branches/0.4.x/sphinx/templates/search.html	(original)
+++ doctools/branches/0.4.x/sphinx/templates/search.html	Sat Sep  6 18:38:19 2008
@@ -1,6 +1,7 @@
 {% extends "layout.html" %}
 {% set title = 'Search' %}
 {% block extrahead %}
+{{ super() }}
     <script type="text/javascript" src="{{ pathto('_static/searchtools.js', 1) }}"></script>
 {% endblock %}
 {% block body %}