[Python-checkins] r61552 - in doctools/trunk: doc/.templates/layout.html sphinx/templates/layout.html sphinx/templates/macros.html
georg.brandl
python-checkins at python.org
Tue Mar 18 20:44:50 CET 2008
Author: georg.brandl
Date: Tue Mar 18 20:44:50 2008
New Revision: 61552
Modified:
doctools/trunk/doc/.templates/layout.html
doctools/trunk/sphinx/templates/layout.html
doctools/trunk/sphinx/templates/macros.html
Log:
Move macro containing blocks to correct file.
Modified: doctools/trunk/doc/.templates/layout.html
==============================================================================
--- doctools/trunk/doc/.templates/layout.html (original)
+++ doctools/trunk/doc/.templates/layout.html Tue Mar 18 20:44:50 2008
@@ -13,4 +13,4 @@
{# put the sidebar before the body #}
{% block sidebar1 %}{{ sidebar() }}{% endblock %}
-{% block sidebar2 %}{% endblock %}
\ No newline at end of file
+{% block sidebar2 %}{% endblock %}
Modified: doctools/trunk/sphinx/templates/layout.html
==============================================================================
--- doctools/trunk/sphinx/templates/layout.html (original)
+++ doctools/trunk/sphinx/templates/layout.html Tue Mar 18 20:44:50 2008
@@ -3,6 +3,33 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
{%- endblock %}
+{%- macro relbar %}
+{# this macro needs to stay in layout.html due to it containing blocks #}
+ <div class="related">
+ <h3>Navigation</h3>
+ <ul>
+ <li class="right" style="margin-right: 10px"><a href="{{ pathto('genindex') }}" title="General Index" accesskey="I">index</a></li>
+ <li class="right"><a href="{{ pathto('modindex') }}" title="Global Module Index" accesskey="M">modules</a> |</li>
+ {%- if next %}
+ <li class="right"><a href="{{ next.link|e }}" title="{{ next.title|striptags }}" accesskey="N">next</a> |</li>
+ {%- endif %}
+ {%- if prev %}
+ <li class="right"><a href="{{ prev.link|e }}" title="{{ prev.title|striptags }}" accesskey="P">previous</a> |</li>
+ {%- endif %}
+ {%- if builder == 'web' %}
+ <li class="right"><a href="{{ pathto('settings') }}"
+ title="Customize your viewing settings" accesskey="S">settings</a> |</li>
+ {%- endif %}
+ {%- block rootrellink %}
+ <li><a href="{{ pathto('index') }}">{{ project }} v{{ release }} documentation</a> »</li>
+ {%- endblock %}
+ {%- for parent in parents %}
+ <li><a href="{{ parent.link|e }}" accesskey="U">{{ parent.title }}</a> »</li>
+ {%- endfor %}
+ {%- block relbaritems %}{% endblock %}
+ </ul>
+ </div>
+{%- endmacro %}
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Modified: doctools/trunk/sphinx/templates/macros.html
==============================================================================
--- doctools/trunk/sphinx/templates/macros.html (original)
+++ doctools/trunk/sphinx/templates/macros.html Tue Mar 18 20:44:50 2008
@@ -45,29 +45,4 @@
</div>
{%- endif %}
{%- endmacro %}
-{%- macro relbar %}
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px"><a href="{{ pathto('genindex') }}" title="General Index" accesskey="I">index</a></li>
- <li class="right"><a href="{{ pathto('modindex') }}" title="Global Module Index" accesskey="M">modules</a> |</li>
- {%- if next %}
- <li class="right"><a href="{{ next.link|e }}" title="{{ next.title|striptags }}" accesskey="N">next</a> |</li>
- {%- endif %}
- {%- if prev %}
- <li class="right"><a href="{{ prev.link|e }}" title="{{ prev.title|striptags }}" accesskey="P">previous</a> |</li>
- {%- endif %}
- {%- if builder == 'web' %}
- <li class="right"><a href="{{ pathto('settings') }}"
- title="Customize your viewing settings" accesskey="S">settings</a> |</li>
- {%- endif %}
- {%- block rootrellink %}
- <li><a href="{{ pathto('index') }}">{{ project }} v{{ release }} documentation</a> »</li>
- {%- endblock %}
- {%- for parent in parents %}
- <li><a href="{{ parent.link|e }}" accesskey="U">{{ parent.title }}</a> »</li>
- {%- endfor %}
- {%- block relbaritems %}{% endblock %}
- </ul>
- </div>
-{%- endmacro %}
+
More information about the Python-checkins
mailing list