diff --git a/kallithea/templates/admin/gists/edit.html b/kallithea/templates/admin/gists/edit.html --- a/kallithea/templates/admin/gists/edit.html +++ b/kallithea/templates/admin/gists/edit.html @@ -8,14 +8,14 @@ %endif -<%def name="js_extra()"> - - - - -<%def name="css_extra()"> - - +<%block name="js_extra"> + + + + +<%block name="css_extra"> + + <%def name="breadcrumbs_links()"> ${_('Edit Gist')} · ${c.gist.gist_access_id} diff --git a/kallithea/templates/admin/gists/new.html b/kallithea/templates/admin/gists/new.html --- a/kallithea/templates/admin/gists/new.html +++ b/kallithea/templates/admin/gists/new.html @@ -8,14 +8,14 @@ %endif -<%def name="js_extra()"> - - - - -<%def name="css_extra()"> - - +<%block name="js_extra"> + + + + +<%block name="css_extra"> + + <%def name="breadcrumbs_links()"> ${_('New Gist')} diff --git a/kallithea/templates/base/root.html b/kallithea/templates/base/root.html --- a/kallithea/templates/base/root.html +++ b/kallithea/templates/base/root.html @@ -13,8 +13,7 @@ - <%def name="css_extra()"> - ${self.css_extra()} + <%block name="css_extra"/> ## JAVASCRIPT ## ## EXTRA FOR JS - <%def name="js_extra()"> - ${self.js_extra()} + <%block name="js_extra"/> - <%def name="head_extra()"> - ${self.head_extra()} + <%block name="head_extra"/> ## IE hacks diff --git a/kallithea/templates/files/diff_2way.html b/kallithea/templates/files/diff_2way.html --- a/kallithea/templates/files/diff_2way.html +++ b/kallithea/templates/files/diff_2way.html @@ -2,14 +2,14 @@ <%inherit file="/base/base.html"/> -<%def name="js_extra()"> - - - -<%def name="css_extra()"> - - - +<%block name="js_extra"> + + + +<%block name="css_extra"> + + + <%def name="title()"> ${_('%s File side-by-side diff') % c.repo_name} diff --git a/kallithea/templates/files/files_add.html b/kallithea/templates/files/files_add.html --- a/kallithea/templates/files/files_add.html +++ b/kallithea/templates/files/files_add.html @@ -7,14 +7,14 @@ %endif -<%def name="js_extra()"> - - - - -<%def name="css_extra()"> - - +<%block name="js_extra"> + + + + +<%block name="css_extra"> + + <%block name="header_menu"> ${self.menu('repositories')} diff --git a/kallithea/templates/files/files_edit.html b/kallithea/templates/files/files_edit.html --- a/kallithea/templates/files/files_edit.html +++ b/kallithea/templates/files/files_edit.html @@ -7,14 +7,14 @@ %endif -<%def name="js_extra()"> - - - - -<%def name="css_extra()"> - - +<%block name="js_extra"> + + + + +<%block name="css_extra"> + + <%block name="header_menu"> ${self.menu('repositories')} diff --git a/kallithea/templates/journal/journal.html b/kallithea/templates/journal/journal.html --- a/kallithea/templates/journal/journal.html +++ b/kallithea/templates/journal/journal.html @@ -20,12 +20,12 @@ <%block name="header_menu"> ${self.menu('journal')} -<%def name="head_extra()"> - - - +<%block name="head_extra"> + + + + <%def name="main()"> -
diff --git a/kallithea/templates/journal/public_journal.html b/kallithea/templates/journal/public_journal.html --- a/kallithea/templates/journal/public_journal.html +++ b/kallithea/templates/journal/public_journal.html @@ -12,10 +12,10 @@ <%block name="header_menu"> ${self.menu('journal')} -<%def name="head_extra()"> - - - +<%block name="head_extra"> + + + <%def name="main()">
diff --git a/kallithea/templates/summary/statistics.html b/kallithea/templates/summary/statistics.html --- a/kallithea/templates/summary/statistics.html +++ b/kallithea/templates/summary/statistics.html @@ -15,10 +15,10 @@ ${self.menu('repositories')} -<%def name="head_extra()"> - - - +<%block name="head_extra"> + + + <%def name="main()"> ${self.repo_context_bar('summary')} diff --git a/kallithea/templates/summary/summary.html b/kallithea/templates/summary/summary.html --- a/kallithea/templates/summary/summary.html +++ b/kallithea/templates/summary/summary.html @@ -38,25 +38,24 @@ ${self.menu('repositories')} -<%def name="head_extra()"> - - - - - - + }; + + <%def name="main()"> ${self.repo_context_bar('summary')}