[Python-checkins] r66253 - in doctools/trunk/sphinx/templates: genindex-single.html genindex-split.html genindex.html modindex.html

[georg.brandl]

Author: georg.brandl
Date: Sat Sep  6 18:38:37 2008
New Revision: 66253

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/trunk/sphinx/templates/genindex-single.html
   doctools/trunk/sphinx/templates/genindex-split.html
   doctools/trunk/sphinx/templates/genindex.html
   doctools/trunk/sphinx/templates/modindex.html

Modified: doctools/trunk/sphinx/templates/genindex-single.html
==============================================================================
--- doctools/trunk/sphinx/templates/genindex-single.html	(original)
+++ doctools/trunk/sphinx/templates/genindex-single.html	Sat Sep  6 18:38:37 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/trunk/sphinx/templates/genindex-split.html
==============================================================================
--- doctools/trunk/sphinx/templates/genindex-split.html	(original)
+++ doctools/trunk/sphinx/templates/genindex-split.html	Sat Sep  6 18:38:37 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/trunk/sphinx/templates/genindex.html
==============================================================================
--- doctools/trunk/sphinx/templates/genindex.html	(original)
+++ doctools/trunk/sphinx/templates/genindex.html	Sat Sep  6 18:38:37 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/trunk/sphinx/templates/modindex.html
==============================================================================
--- doctools/trunk/sphinx/templates/modindex.html	(original)
+++ doctools/trunk/sphinx/templates/modindex.html	Sat Sep  6 18:38:37 2008
@@ -1,6 +1,7 @@
 {% extends "layout.html" %}
 {% set title = _('Global Module Index') %}
 {% block extrahead %}
+{{ super() }}
 {% if builder != 'htmlhelp' and collapse_modindex %}
     <script type="text/javascript">
       DOCUMENTATION_OPTIONS.COLLAPSE_MODINDEX = true;