summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2013-01-17 23:29:59 -0500
committerTom Yu <tlyu@mit.edu>2013-01-31 15:10:21 -0500
commit044a831217e7d4fc95ecfe83b5bb9840bd13f363 (patch)
treecc5e52f6ea9b4c124fb3aa99dfc4e67cceb5a2f0
parent3e4bb2ebc22e947dfb5a6b3217fd35b3fb2dc82f (diff)
downloadkrb5-044a831217e7d4fc95ecfe83b5bb9840bd13f363.tar.gz
krb5-044a831217e7d4fc95ecfe83b5bb9840bd13f363.tar.xz
krb5-044a831217e7d4fc95ecfe83b5bb9840bd13f363.zip
Reduce copied code in layout.html
layout.html unneccesarily copied code from the parent agogo/layout.html content block just to alter the sidebar. Override various subblocks of the sidebar instead.
-rw-r--r--doc/_templates/layout.html50
1 files changed, 20 insertions, 30 deletions
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index fa0ddc816f..66396b5d29 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -60,33 +60,23 @@
</div>
{% endblock %}
-{%- block content %}
- <div class="content-wrapper">
- <div class="content">
- {%- block sidebar2 %} {%- endblock %}
- {%- block sidebar1 %}
- <div class="sidebar">
- <h2>{{ _('On this page') }} </h2>
- {{ toc }}
- <br/>
- <h2>{{ _('Table of contents') }}</h2>
- {{ toctree(collapse=true, maxdepth=3, titles_only=true, includehidden=false) }}
- <br/>
- <h4><a href="{{ pathto('index') }}">Full Table of Contents
- </a></h4>
- <h4>{{ _('Search') }}</h4>
- <form class="search" action="{{ pathto('search') }}" method="get">
- <input type="text" name="q" size="18" />
- <input type="submit" value="{{ _('Go') }}" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- </div>
- {%- endblock %}
- <div class="document">
- {%- block document %}{{ super() }}{%- endblock %}
- </div>
- <div class="clearer" ></div>
- </div>
- </div>
-{% endblock %}
+{%- block sidebartoc %}
+ <h2>{{ _('On this page') }}</h2>
+ {{ toc }}
+ <br/>
+ <h2>{{ _('Table of contents') }}</h2>
+ {{ toctree(collapse=true, maxdepth=3, titles_only=true,
+ includehidden=false) }}
+ <br/>
+ <h4><a href="{{ pathto('index') }}">Full Table of Contents</a></h4>
+{%- endblock %}
+
+{%- block sidebarsearch %}
+ <h4>{{ _('Search') }}</h4>
+ <form class="search" action="{{ pathto('search') }}" method="get">
+ <input type="text" name="q" size="18" />
+ <input type="submit" value="{{ _('Go') }}" />
+ <input type="hidden" name="check_keywords" value="yes" />
+ <input type="hidden" name="area" value="default" />
+ </form>
+{%- endblock %}