diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-01-17 17:38:42 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-01-17 17:38:42 -0500 |
| commit | d64aacee330baad036622b55f64c0bba37400f0e (patch) | |
| tree | 7b3044f3f6d5634f0b77b39575c4cb97f811fdac /doc/build/templates | |
| parent | e30d492ac1aeb3d3545f7d49af20c8239b304b88 (diff) | |
| download | external_python_mako-rel_0_5.tar.gz external_python_mako-rel_0_5.tar.bz2 external_python_mako-rel_0_5.zip | |
merge 4be2ca3ed8be8e48795f351bb47ad51c9ca1a555 from head, docs updaterel_0_5
Diffstat (limited to 'doc/build/templates')
| -rw-r--r-- | doc/build/templates/base.mako (renamed from doc/build/templates/makoorg/root.mako) | 9 | ||||
| -rw-r--r-- | doc/build/templates/genindex.mako | 2 | ||||
| -rw-r--r-- | doc/build/templates/layout.mako | 12 | ||||
| -rw-r--r-- | doc/build/templates/page.mako | 2 | ||||
| -rw-r--r-- | doc/build/templates/pre_layout.mako | 2 | ||||
| -rw-r--r-- | doc/build/templates/search.mako | 2 | ||||
| -rw-r--r-- | doc/build/templates/site_base.mako | 26 |
7 files changed, 13 insertions, 42 deletions
diff --git a/doc/build/templates/makoorg/root.mako b/doc/build/templates/base.mako index 35240d8..89854a1 100644 --- a/doc/build/templates/makoorg/root.mako +++ b/doc/build/templates/base.mako @@ -1,15 +1,8 @@ -<% -in_docs = getattr(next.module, 'in_docs', False) -%> - <html> -<%def name="title()"> -Mako Templates for Python -</%def> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"> <head> -<title>${self.title()} </title> +<title><%block name="head_title">Mako Templates for Python</%block></title> <%block name="headers"> </%block> <link rel="stylesheet" href="${pathto('_static/site.css', 1)}"></link> diff --git a/doc/build/templates/genindex.mako b/doc/build/templates/genindex.mako index 4f535f4..fce20f2 100644 --- a/doc/build/templates/genindex.mako +++ b/doc/build/templates/genindex.mako @@ -1,4 +1,4 @@ -<%inherit file="pre_layout.mako"/> +<%inherit file="${context['layout']}"/> <%block name="show_title" filter="util.striptags"> ${_('Index')} diff --git a/doc/build/templates/layout.mako b/doc/build/templates/layout.mako index 5402ac1..a2a3020 100644 --- a/doc/build/templates/layout.mako +++ b/doc/build/templates/layout.mako @@ -21,12 +21,20 @@ docs-copyright </%doc> -<%inherit file="${context['mako_layout']}"/> +<%inherit file="base.mako"/> <% withsidebar = bool(toc) and current_page_name != 'index' %> +<%block name="head_title"> + % if current_page_name != 'index': + ${capture(self.show_title) | util.striptags} — + % endif + ${docstitle|h} +</%block> + + <div id="docs-container"> <%block name="headers"> @@ -120,9 +128,7 @@ withsidebar = bool(toc) and current_page_name != 'index' <h2> <%block name="show_title"> - % if title: ${title} - % endif </%block> </h2> </div> diff --git a/doc/build/templates/page.mako b/doc/build/templates/page.mako index e134ab4..61cf9a0 100644 --- a/doc/build/templates/page.mako +++ b/doc/build/templates/page.mako @@ -1,2 +1,2 @@ -<%inherit file="pre_layout.mako"/> +<%inherit file="${context['layout']}"/> ${body| util.strip_toplevel_anchors}
\ No newline at end of file diff --git a/doc/build/templates/pre_layout.mako b/doc/build/templates/pre_layout.mako deleted file mode 100644 index 5b1c508..0000000 --- a/doc/build/templates/pre_layout.mako +++ /dev/null @@ -1,2 +0,0 @@ -<%inherit file="${context['mako_pre_layout']}"/> -${next.body()}
\ No newline at end of file diff --git a/doc/build/templates/search.mako b/doc/build/templates/search.mako index ff03d5e..0eaa8f9 100644 --- a/doc/build/templates/search.mako +++ b/doc/build/templates/search.mako @@ -1,4 +1,4 @@ -<%inherit file="pre_layout.mako"/> +<%inherit file="${context['layout']}"/> <%! local_script_files = ['_static/searchtools.js'] diff --git a/doc/build/templates/site_base.mako b/doc/build/templates/site_base.mako deleted file mode 100644 index 30ace37..0000000 --- a/doc/build/templates/site_base.mako +++ /dev/null @@ -1,26 +0,0 @@ -<%text>#coding:utf-8 -<%inherit file="/root.mako"/> -<%page cache_type="file" cached="True"/> -<%! - in_docs=True -%> -</%text> - - -${'<%text>'} -${next.body()} -${'</%text>'} - -<%text><%def name="style()"></%text> - <%block name="headers"/> - - <%text>${parent.style()}</%text> - <link href="/css/site_docs.css" rel="stylesheet" type="text/css"></link> -<%text></%def></%text> - -<%text><%def name="title()"></%text>${self.show_title()} — ${docstitle|h}<%text></%def></%text> - - -<%! - local_script_files = [] -%> |