From ae09a7f73b248c68ca25da59232d33721d4dba04 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 18 Mar 2008 19:44:50 +0000 Subject: [PATCH] Move macro containing blocks to correct file. --- doc/.templates/layout.html | 2 +- sphinx/templates/layout.html | 27 +++++++++++++++++++++++++++ sphinx/templates/macros.html | 27 +-------------------------- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/doc/.templates/layout.html b/doc/.templates/layout.html index 4925d6d88..3a819dce2 100644 --- a/doc/.templates/layout.html +++ b/doc/.templates/layout.html @@ -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 %} diff --git a/sphinx/templates/layout.html b/sphinx/templates/layout.html index 2c6d126eb..c9757a01a 100644 --- a/sphinx/templates/layout.html +++ b/sphinx/templates/layout.html @@ -3,6 +3,33 @@ {%- endblock %} +{%- macro relbar %} +{# this macro needs to stay in layout.html due to it containing blocks #} +
+

Navigation

+ +
+{%- endmacro %} diff --git a/sphinx/templates/macros.html b/sphinx/templates/macros.html index ea6efbad2..13b013b5a 100644 --- a/sphinx/templates/macros.html +++ b/sphinx/templates/macros.html @@ -45,29 +45,4 @@ {%- endif %} {%- endmacro %} -{%- macro relbar %} -
-

Navigation

- -
-{%- endmacro %} +