Mercurial > kallithea
changeset 4809:ec39e73be935
template: move header to root.html, use mako block for header menu
line wrap: on
line diff
--- a/kallithea/templates/about.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/about.html Wed Feb 11 02:40:28 2015 +0100 @@ -9,9 +9,9 @@ <%def name="breadcrumbs()"> ${c.site_name} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('about')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/admin.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/admin.html Wed Feb 11 02:40:28 2015 +0100 @@ -18,9 +18,9 @@ ${h.end_form()} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box"> <!-- box / title -->
--- a/kallithea/templates/admin/auth/auth_settings.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/auth/auth_settings.html Wed Feb 11 02:40:28 2015 +0100 @@ -14,9 +14,9 @@ ${_('Authentication')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/defaults/defaults.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/defaults/defaults.html Wed Feb 11 02:40:28 2015 +0100 @@ -14,9 +14,9 @@ ${_('Defaults')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/gists/edit.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/gists/edit.html Wed Feb 11 02:40:28 2015 +0100 @@ -21,9 +21,9 @@ ${_('Edit Gist')} · ${c.gist.gist_access_id} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('gists')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/gists/index.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/gists/index.html Wed Feb 11 02:40:28 2015 +0100 @@ -25,9 +25,9 @@ - ${c.gists_pager.item_count} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('gists')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/gists/new.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/gists/new.html Wed Feb 11 02:40:28 2015 +0100 @@ -21,9 +21,9 @@ ${_('New Gist')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('gists')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/gists/show.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/gists/show.html Wed Feb 11 02:40:28 2015 +0100 @@ -13,9 +13,9 @@ / ${_('URL')}: ${c.gist.gist_url()} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('gists')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/my_account/my_account.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/my_account/my_account.html Wed Feb 11 02:40:28 2015 +0100 @@ -12,9 +12,9 @@ ${_('My Account')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box" style="overflow:auto">
--- a/kallithea/templates/admin/notifications/notifications.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/notifications/notifications.html Wed Feb 11 02:40:28 2015 +0100 @@ -12,9 +12,9 @@ ${_('My Notifications')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/notifications/show_notification.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/notifications/show_notification.html Wed Feb 11 02:40:28 2015 +0100 @@ -14,9 +14,9 @@ ${_('Show Notification')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/permissions/permissions.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/permissions/permissions.html Wed Feb 11 02:40:28 2015 +0100 @@ -14,9 +14,9 @@ ${_('Permissions')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()">
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Wed Feb 11 02:40:28 2015 +0100 @@ -16,9 +16,9 @@ ${_('Add Repository Group')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/repo_groups/repo_group_edit.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html Wed Feb 11 02:40:28 2015 +0100 @@ -26,9 +26,9 @@ </ul> </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box" style="overflow:auto">
--- a/kallithea/templates/admin/repo_groups/repo_group_show.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_show.html Wed Feb 11 02:40:28 2015 +0100 @@ -17,9 +17,9 @@ </span> </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> <%include file="/index_base.html" args="parent=self,group_name=c.group.group_name"/>
--- a/kallithea/templates/admin/repo_groups/repo_groups.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_groups.html Wed Feb 11 02:40:28 2015 +0100 @@ -14,9 +14,9 @@ </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/repos/repo_add.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/repos/repo_add.html Wed Feb 11 02:40:28 2015 +0100 @@ -22,9 +22,9 @@ ${_('Add Repository')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/repos/repo_creating.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/repos/repo_creating.html Wed Feb 11 02:40:28 2015 +0100 @@ -16,9 +16,9 @@ ${_('Creating repository')} ${c.repo} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> <div class="box"> <!-- box / title -->
--- a/kallithea/templates/admin/repos/repo_edit.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/repos/repo_edit.html Wed Feb 11 02:40:28 2015 +0100 @@ -15,9 +15,9 @@ ${_('Settings')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('options')}
--- a/kallithea/templates/admin/repos/repos.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/repos/repos.html Wed Feb 11 02:40:28 2015 +0100 @@ -11,9 +11,9 @@ <%def name="breadcrumbs_links()"> <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/> ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="repo_count">0</span> ${_('Repositories')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/settings/settings.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/settings/settings.html Wed Feb 11 02:40:28 2015 +0100 @@ -14,9 +14,9 @@ ${_('Settings')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box" style="overflow:auto">
--- a/kallithea/templates/admin/user_groups/user_group_add.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/user_groups/user_group_add.html Wed Feb 11 02:40:28 2015 +0100 @@ -15,9 +15,9 @@ ${_('Add User Group')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/user_groups/user_group_edit.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/user_groups/user_group_edit.html Wed Feb 11 02:40:28 2015 +0100 @@ -16,9 +16,9 @@ ${c.user_group.users_group_name} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box" style="overflow:auto">
--- a/kallithea/templates/admin/user_groups/user_groups.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/user_groups/user_groups.html Wed Feb 11 02:40:28 2015 +0100 @@ -13,9 +13,9 @@ ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="user_group_count">0</span> ${_('user groups')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/users/user_add.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/users/user_add.html Wed Feb 11 02:40:28 2015 +0100 @@ -15,9 +15,9 @@ ${_('Add User')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/admin/users/user_edit.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/users/user_edit.html Wed Feb 11 02:40:28 2015 +0100 @@ -16,9 +16,9 @@ ${c.user.username} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box" style="overflow:auto">
--- a/kallithea/templates/admin/users/users.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/admin/users/users.html Wed Feb 11 02:40:28 2015 +0100 @@ -13,9 +13,9 @@ ${h.link_to(_('Admin'),h.url('admin_home'))} » <span id="user_count">0</span> ${_('Users')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('admin')} -</%def> +</%block> <%def name="main()"> <div class="box">
--- a/kallithea/templates/base/base.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/base/base.html Wed Feb 11 02:40:28 2015 +0100 @@ -1,27 +1,6 @@ ## -*- coding: utf-8 -*- <%inherit file="root.html"/> -<!-- HEADER --> -<div id="header"> - <div id="header-inner" class="title"> - <div id="logo"> - <a href="${h.url('home')}" style="display: block;"> - <div class="header"> - <img src="${h.url('/images/kallithea-logo.svg')}" onerror="this.onerror='';this.src='${h.url('/images/kallithea-logo.png')}'" alt="Kallithea"/> - </div> - %if c.site_name: - <div class="branding">${c.site_name}</div> - %endif - </a> - </div> - <!-- MENU --> - ${self.page_nav()} - <!-- END MENU --> - ${self.body()} - </div> -</div> -<!-- END HEADER --> - <!-- CONTENT --> <div id="content"> ${self.flash_msg()}
--- a/kallithea/templates/base/root.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/base/root.html Wed Feb 11 02:40:28 2015 +0100 @@ -122,6 +122,22 @@ <script>$(document.body).addClass('ie9')</script> <![endif]--> + <div id="header"> + <div id="header-inner" class="title"> + <div id="logo"> + <a href="${h.url('home')}" style="display: block;"> + <div class="header"> + <img src="${h.url('/images/kallithea-logo.svg')}" onerror="this.onerror='';this.src='${h.url('/images/kallithea-logo.png')}'" alt="Kallithea"/> + </div> + %if c.site_name: + <div class="branding">${c.site_name}</div> + %endif + </a> + </div> + <%block name="header_menu"/> + </div> + </div> + ${next.body()} %if c.ga_code:
--- a/kallithea/templates/bookmarks/bookmarks.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/bookmarks/bookmarks.html Wed Feb 11 02:40:28 2015 +0100 @@ -13,9 +13,9 @@ ${_('Bookmarks')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('switch-to')}
--- a/kallithea/templates/branches/branches.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/branches/branches.html Wed Feb 11 02:40:28 2015 +0100 @@ -13,9 +13,9 @@ ${_('Branches')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('switch-to')}
--- a/kallithea/templates/changelog/changelog.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/changelog/changelog.html Wed Feb 11 02:40:28 2015 +0100 @@ -24,9 +24,9 @@ - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('changelog', c.first_revision.raw_id if c.first_revision else None)}
--- a/kallithea/templates/changeset/changeset.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/changeset/changeset.html Wed Feb 11 02:40:28 2015 +0100 @@ -13,9 +13,9 @@ ${_('Changeset')} - <span class='hash'>${h.show_id(c.changeset)}</span> </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('changelog', c.changeset.raw_id)}
--- a/kallithea/templates/changeset/changeset_range.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/changeset/changeset_range.html Wed Feb 11 02:40:28 2015 +0100 @@ -15,9 +15,9 @@ ${h.link_to(h.show_id(c.cs_ranges[-1]),h.url('changeset_home',repo_name=c.repo_name,revision=c.cs_ranges[-1]))}</td> </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('changelog')}
--- a/kallithea/templates/compare/compare_diff.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/compare/compare_diff.html Wed Feb 11 02:40:28 2015 +0100 @@ -16,9 +16,9 @@ ${_('Compare Revisions')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('changelog')}
--- a/kallithea/templates/files/diff_2way.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/files/diff_2way.html Wed Feb 11 02:40:28 2015 +0100 @@ -22,9 +22,9 @@ ${_('File diff')} ${h.show_id(c.changeset_1)} → ${h.show_id(c.changeset_2)} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('changelog')}
--- a/kallithea/templates/files/file_diff.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/files/file_diff.html Wed Feb 11 02:40:28 2015 +0100 @@ -11,9 +11,9 @@ ${_('File diff')} ${h.show_id(c.changeset_1)} → ${h.show_id(c.changeset_2)} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('changelog')}
--- a/kallithea/templates/files/files.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/files/files.html Wed Feb 11 02:40:28 2015 +0100 @@ -18,9 +18,9 @@ %endif </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('files', c.revision)}
--- a/kallithea/templates/files/files_add.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/files/files_add.html Wed Feb 11 02:40:28 2015 +0100 @@ -16,9 +16,9 @@ <link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/> </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Add New File')} @ ${h.show_id(c.cs)}
--- a/kallithea/templates/files/files_delete.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/files/files_delete.html Wed Feb 11 02:40:28 2015 +0100 @@ -7,9 +7,9 @@ %endif </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Delete file')} @ ${h.show_id(c.cs)}
--- a/kallithea/templates/files/files_edit.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/files/files_edit.html Wed Feb 11 02:40:28 2015 +0100 @@ -16,9 +16,9 @@ <link rel="stylesheet" type="text/css" href="${h.url('/codemirror/lib/codemirror.css')}"/> </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Edit file')} @ ${h.show_id(c.cs)}
--- a/kallithea/templates/followers/followers.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/followers/followers.html Wed Feb 11 02:40:28 2015 +0100 @@ -12,9 +12,9 @@ ${_('Followers')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('followers')} <div class="box">
--- a/kallithea/templates/forks/fork.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/forks/fork.html Wed Feb 11 02:40:28 2015 +0100 @@ -12,9 +12,9 @@ ${_('Fork')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('createfork')}
--- a/kallithea/templates/forks/forks.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/forks/forks.html Wed Feb 11 02:40:28 2015 +0100 @@ -12,9 +12,9 @@ ${_('Forks')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('showforks')}
--- a/kallithea/templates/index.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/index.html Wed Feb 11 02:40:28 2015 +0100 @@ -11,9 +11,9 @@ <%def name="breadcrumbs()"> </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> <%include file="index_base.html" args="parent=self"/>
--- a/kallithea/templates/journal/journal.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/journal/journal.html Wed Feb 11 02:40:28 2015 +0100 @@ -17,9 +17,9 @@ ${h.end_form()} </h5> </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('journal')} -</%def> +</%block> <%def name="head_extra()"> <link href="${h.url('journal_atom', api_key=c.authuser.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" /> <link href="${h.url('journal_rss', api_key=c.authuser.api_key)}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />
--- a/kallithea/templates/journal/public_journal.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/journal/public_journal.html Wed Feb 11 02:40:28 2015 +0100 @@ -9,9 +9,9 @@ <%def name="breadcrumbs()"> ${c.site_name} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('journal')} -</%def> +</%block> <%def name="head_extra()"> <link href="${h.url('public_journal_atom')}" rel="alternate" title="${_('ATOM public journal feed')}" type="application/atom+xml" /> <link href="${h.url('public_journal_rss')}" rel="alternate" title="${_('RSS public journal feed')}" type="application/rss+xml" />
--- a/kallithea/templates/login.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/login.html Wed Feb 11 02:40:28 2015 +0100 @@ -8,22 +8,6 @@ %endif </%def> - -<div id="header"> - <div id="header-inner" class="title"> - <div id="logo"> - <a href="${h.url('home')}" style="display: block;"> - <div class="header"> - <img src="${h.url('/images/kallithea-logo.svg')}" onerror="this.onerror='';this.src='${h.url('/images/kallithea-logo.png')}'" alt="Kallithea"/> - </div> - %if c.site_name: - <div class="branding">${c.site_name}</div> - %endif - </a> - </div> - </div> -</div> - <div id="login"> <%include file="/base/flash_msg.html"/> <!-- login -->
--- a/kallithea/templates/password_reset.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/password_reset.html Wed Feb 11 02:40:28 2015 +0100 @@ -8,22 +8,6 @@ %endif </%def> - -<div id="header"> - <div id="header-inner" class="title"> - <div id="logo"> - <a href="${h.url('home')}" style="display: block;"> - <div class="header"> - <img src="${h.url('/images/kallithea-logo.svg')}" onerror="this.onerror='';this.src='${h.url('/images/kallithea-logo.png')}'" alt="Kallithea"/> - </div> - %if c.site_name: - <div class="branding">${c.site_name}</div> - %endif - </a> - </div> - </div> -</div> - <div id="register"> <%include file="/base/flash_msg.html"/> <div class="title withlogo">
--- a/kallithea/templates/pullrequests/pullrequest.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/pullrequests/pullrequest.html Wed Feb 11 02:40:28 2015 +0100 @@ -8,9 +8,9 @@ ${_('New Pull Request')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('showpullrequest')}
--- a/kallithea/templates/pullrequests/pullrequest_show.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Wed Feb 11 02:40:28 2015 +0100 @@ -11,9 +11,9 @@ ${_('Pull request #%s from %s#%s') % (c.pull_request.pull_request_id, c.pull_request.org_repo.repo_name, c.cs_branch_name)} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> <% editable = not c.pull_request.is_closed() and (h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or c.pull_request.author.user_id == c.authuser.user_id) %>
--- a/kallithea/templates/pullrequests/pullrequest_show_all.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show_all.html Wed Feb 11 02:40:28 2015 +0100 @@ -15,9 +15,9 @@ %endif </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('showpullrequest')}
--- a/kallithea/templates/pullrequests/pullrequest_show_my.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show_my.html Wed Feb 11 02:40:28 2015 +0100 @@ -8,9 +8,9 @@ ${_('My Pull Requests')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('my_pullrequests')} -</%def> +</%block> <%def name="main()">
--- a/kallithea/templates/register.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/register.html Wed Feb 11 02:40:28 2015 +0100 @@ -7,21 +7,6 @@ · ${c.site_name} %endif </%def> -<div id="header"> - <div id="header-inner" class="title"> - <div id="logo"> - <a href="${h.url('home')}" style="display: block;"> - <div class="header"> - <img src="${h.url('/images/kallithea-logo.svg')}" onerror="this.onerror='';this.src='${h.url('/images/kallithea-logo.png')}'" alt="Kallithea"/> - </div> - %if c.site_name: - <div class="branding">${c.site_name}</div> - %endif - </a> - </div> - </div> -</div> - <div id="register"> <%include file="/base/flash_msg.html"/>
--- a/kallithea/templates/search/search.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/search/search.html Wed Feb 11 02:40:28 2015 +0100 @@ -24,13 +24,13 @@ %endif </%def> -<%def name="page_nav()"> +<%block name="header_menu"> %if c.repo_name: ${self.menu('repositories')} %else: ${self.menu('search')} %endif -</%def> +</%block> <%def name="main()"> %if c.repo_name: ${self.repo_context_bar('options')}
--- a/kallithea/templates/summary/statistics.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/summary/statistics.html Wed Feb 11 02:40:28 2015 +0100 @@ -11,9 +11,9 @@ ${_('Statistics')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="head_extra()"> <link href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name,api_key=c.authuser.api_key)}" rel="alternate" title="${_('%s ATOM feed') % c.repo_name}" type="application/atom+xml" />
--- a/kallithea/templates/summary/summary.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/summary/summary.html Wed Feb 11 02:40:28 2015 +0100 @@ -34,9 +34,9 @@ %endif </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="head_extra()"> <link href="${h.url('atom_feed_home',repo_name=c.db_repo.repo_name,api_key=c.authuser.api_key)}" rel="alternate" title="${_('%s ATOM feed') % c.repo_name}" type="application/atom+xml" />
--- a/kallithea/templates/tags/tags.html Wed Feb 11 02:40:28 2015 +0100 +++ b/kallithea/templates/tags/tags.html Wed Feb 11 02:40:28 2015 +0100 @@ -13,9 +13,9 @@ ${_('Tags')} </%def> -<%def name="page_nav()"> +<%block name="header_menu"> ${self.menu('repositories')} -</%def> +</%block> <%def name="main()"> ${self.repo_context_bar('switch-to')}