Mercurial > kallithea
changeset 4811:37354e1ab283
template: use block block for page title in root.html
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 @@ -1,11 +1,11 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('About')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs()"> ${c.site_name} </%def>
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Admin Journal')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> <form id="filter_form">
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Authentication Settings')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Repository Defaults')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Edit Gist')} · ${c.gist.gist_access_id} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%block name="js_extra"> <script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
--- 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 @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> %if c.show_private: ${_('Private Gists for User %s') % c.authuser.username} %elif c.show_public: @@ -12,7 +12,7 @@ %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> %if c.show_private:
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('New Gist')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%block name="js_extra"> <script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Gist')} · ${c.gist.gist_access_id} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Gist')} · ${c.gist.gist_access_id}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('My Account')} ${c.authuser.username} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('My Account')}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('My Notifications')} ${c.authuser.username} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('My Notifications')}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Show Notification')} ${c.authuser.username} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${h.link_to(_('Notifications'),h.url('notifications'))}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Permissions Administration')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Add Repository Group')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Repository Group Settings') % c.repo_group.name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))}
--- 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 @@ -1,11 +1,11 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Repository group dashboard') % c.group.group_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs()"> <span class="groups_breadcrumbs">
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Repository Groups Administration')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Add Repository')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> %if c.authuser.is_admin:
--- 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 @@ -5,12 +5,12 @@ <%def name="flash_msg()"> </%def> -<%def name="title()"> +<%block name="title"> ${_('%s Creating Repository') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Creating repository')} ${c.repo}
--- 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 @@ -4,12 +4,12 @@ ## <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Repository Settings') % c.repo_info.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Settings')}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Repositories Administration')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%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')}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Settings Administration')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Add user group')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} »
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s user group settings') % c.user_group.users_group_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('User Groups Administration')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Add user')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} »
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s user settings') % c.user.username} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Users Administration')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
--- 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 @@ -2,7 +2,7 @@ <!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>${self.title()}</title> + <title><%block name="title"/></title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta name="robots" content="index, nofollow"/> <link rel="icon" href="${h.url('/images/favicon.ico')}" type="image/png" />
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Bookmarks') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> <input class="q_filter_box" id="q_filter_bookmarks" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Branches') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> <input class="q_filter_box" id="q_filter_branches" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
--- 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 @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Changelog') % c.repo_name} %if c.changelog_for_path: /${c.changelog_for_path} @@ -10,7 +10,7 @@ %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> <% size = c.size if c.size <= c.total_cs else c.total_cs %>
--- 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 @@ -2,12 +2,12 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Changeset')} - <span class='hash'>${h.show_id(c.changeset)}</span>
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Changesets') % c.repo_name} - ${h.show_id(c.cs_ranges[0])} > ${h.show_id(c.cs_ranges[-1])} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Changesets')} -
--- 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 @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> %if c.compare_home: ${_('%s Compare') % c.repo_name} %else: @@ -10,7 +10,7 @@ %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Compare Revisions')}
--- 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 @@ -11,12 +11,12 @@ <link rel="stylesheet" type="text/css" href="${h.url('/css/mergely.css')}"/> </%block> -<%def name="title()"> +<%block name="title"> ${_('%s File side-by-side diff') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('File diff')} ${h.show_id(c.changeset_1)} → ${h.show_id(c.changeset_2)}
--- 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 @@ -1,11 +1,11 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s File Diff') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('File diff')} ${h.show_id(c.changeset_1)} → ${h.show_id(c.changeset_2)}
--- 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 @@ -1,6 +1,6 @@ <%inherit file="/base/base.html"/> -<%def name="title(*args)"> +<%block name="title"> ${_('%s Files') % c.repo_name} %if hasattr(c,'file'): · ${h.safe_unicode(c.file.path) or '/'} @@ -9,7 +9,7 @@ %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Files')} @@ -80,7 +80,7 @@ var rev = parts2.shift(); // pop the first element which is the revision var f_path = parts2.join('/'); - //page title make this consistent with title() mako function on top + //page title - make this consistent with title mako block above var title = "${_('%s Files') % c.repo_name}" + " \u00B7 " + (f_path || '/') + " \u00B7 " + "${c.site_name}"; var _node_list_url = node_list_url.replace('__REV__',rev).replace('__FPATH__', f_path); @@ -97,7 +97,7 @@ }); } -// callbacks needed to process the pjax filebrowser +// callbacks needed to process the ypjax filebrowser var callbacks = function(State){ ypjax_links(); tooltip_activate();
--- 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 @@ -1,11 +1,11 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Files Add') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%block name="js_extra"> <script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
--- 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 @@ -1,11 +1,11 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Files Delete') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%block name="header_menu"> ${self.menu('repositories')}
--- 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 @@ -1,11 +1,11 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s File Edit') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%block name="js_extra"> <script type="text/javascript" src="${h.url('/codemirror/lib/codemirror.js')}"></script>
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Followers') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Followers')}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Fork repository %s') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Fork')}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Forks') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Forks')}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Dashboard')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs()"> </%def>
--- 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 @@ -1,11 +1,11 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Journal')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs()"> <h5> <form id="filter_form">
--- 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 @@ -1,11 +1,11 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('Public Journal')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs()"> ${c.site_name} </%def>
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="base/root.html"/> -<%def name="title()"> +<%block name="title"> ${_('Log In')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <div id="login"> <%include file="/base/flash_msg.html"/>
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="base/root.html"/> -<%def name="title()"> +<%block name="title"> ${_('Password Reset')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <div id="register"> <%include file="/base/flash_msg.html"/>
--- 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 @@ -1,8 +1,8 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${c.repo_name} ${_('New Pull Request')} -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('New Pull Request')}
--- 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 @@ -1,11 +1,11 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Pull request #%s from %s#%s') % (c.pull_request.pull_request_id, c.pull_request.org_repo.repo_name, c.cs_branch_name)}
--- 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 @@ -1,11 +1,11 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Pull Requests') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> %if c.from_:
--- 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 @@ -1,8 +1,8 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('My Pull Requests')} · ${c.site_name} -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('My Pull Requests')}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="base/root.html"/> -<%def name="title()"> +<%block name="title"> ${_('Sign Up')} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <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 @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> %if c.repo_name: ${_('%s Search') % c.repo_name} %else: @@ -10,7 +10,7 @@ %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> %if c.repo_name:
--- 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 @@ -1,11 +1,11 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Statistics') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Statistics')}
--- 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 @@ -1,11 +1,11 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Summary') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> ${_('Summary')}
--- 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 @@ -1,12 +1,12 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> -<%def name="title()"> +<%block name="title"> ${_('%s Tags') % c.repo_name} %if c.site_name: · ${c.site_name} %endif -</%def> +</%block> <%def name="breadcrumbs_links()"> <input class="q_filter_box" id="q_filter_tags" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>