diff --git a/kallithea/templates/about.html b/kallithea/templates/about.html --- a/kallithea/templates/about.html +++ b/kallithea/templates/about.html @@ -2,9 +2,6 @@ <%inherit file="/base/base.html"/> <%block name="title"> ${_('About')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs()"> ${c.site_name} diff --git a/kallithea/templates/admin/admin.html b/kallithea/templates/admin/admin.html --- a/kallithea/templates/admin/admin.html +++ b/kallithea/templates/admin/admin.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Admin Journal')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/auth/auth_settings.html b/kallithea/templates/admin/auth/auth_settings.html --- a/kallithea/templates/admin/auth/auth_settings.html +++ b/kallithea/templates/admin/auth/auth_settings.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Authentication Settings')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/defaults/defaults.html b/kallithea/templates/admin/defaults/defaults.html --- a/kallithea/templates/admin/defaults/defaults.html +++ b/kallithea/templates/admin/defaults/defaults.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Repository Defaults')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> 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 @@ -3,9 +3,6 @@ <%block name="title"> ${_('Edit Gist')} · ${c.gist.gist_access_id} - %if c.site_name: - · ${c.site_name} - %endif <%block name="js_extra"> diff --git a/kallithea/templates/admin/gists/index.html b/kallithea/templates/admin/gists/index.html --- a/kallithea/templates/admin/gists/index.html +++ b/kallithea/templates/admin/gists/index.html @@ -9,9 +9,6 @@ %else: ${_('Public Gists')} %endif - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> 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 @@ -3,9 +3,6 @@ <%block name="title"> ${_('New Gist')} - %if c.site_name: - · ${c.site_name} - %endif <%block name="js_extra"> diff --git a/kallithea/templates/admin/gists/show.html b/kallithea/templates/admin/gists/show.html --- a/kallithea/templates/admin/gists/show.html +++ b/kallithea/templates/admin/gists/show.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Gist')} · ${c.gist.gist_access_id} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/my_account/my_account.html b/kallithea/templates/admin/my_account/my_account.html --- a/kallithea/templates/admin/my_account/my_account.html +++ b/kallithea/templates/admin/my_account/my_account.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('My Account')} ${c.authuser.username} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/notifications/notifications.html b/kallithea/templates/admin/notifications/notifications.html --- a/kallithea/templates/admin/notifications/notifications.html +++ b/kallithea/templates/admin/notifications/notifications.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('My Notifications')} ${c.authuser.username} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/notifications/show_notification.html b/kallithea/templates/admin/notifications/show_notification.html --- a/kallithea/templates/admin/notifications/show_notification.html +++ b/kallithea/templates/admin/notifications/show_notification.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Show Notification')} ${c.authuser.username} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/permissions/permissions.html b/kallithea/templates/admin/permissions/permissions.html --- a/kallithea/templates/admin/permissions/permissions.html +++ b/kallithea/templates/admin/permissions/permissions.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Permissions Administration')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/repo_groups/repo_group_add.html b/kallithea/templates/admin/repo_groups/repo_group_add.html --- a/kallithea/templates/admin/repo_groups/repo_group_add.html +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Add Repository Group')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit.html b/kallithea/templates/admin/repo_groups/repo_group_edit.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit.html +++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('%s Repository Group Settings') % c.repo_group.name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/repo_groups/repo_group_show.html b/kallithea/templates/admin/repo_groups/repo_group_show.html --- a/kallithea/templates/admin/repo_groups/repo_group_show.html +++ b/kallithea/templates/admin/repo_groups/repo_group_show.html @@ -2,9 +2,6 @@ <%inherit file="/base/base.html"/> <%block name="title"> ${_('%s Repository group dashboard') % c.group.group_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs()"> diff --git a/kallithea/templates/admin/repo_groups/repo_groups.html b/kallithea/templates/admin/repo_groups/repo_groups.html --- a/kallithea/templates/admin/repo_groups/repo_groups.html +++ b/kallithea/templates/admin/repo_groups/repo_groups.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Repository Groups Administration')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/repos/repo_add.html b/kallithea/templates/admin/repos/repo_add.html --- a/kallithea/templates/admin/repos/repo_add.html +++ b/kallithea/templates/admin/repos/repo_add.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Add Repository')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/repos/repo_creating.html b/kallithea/templates/admin/repos/repo_creating.html --- a/kallithea/templates/admin/repos/repo_creating.html +++ b/kallithea/templates/admin/repos/repo_creating.html @@ -7,9 +7,6 @@ <%block name="title"> ${_('%s Creating Repository') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/repos/repo_edit.html b/kallithea/templates/admin/repos/repo_edit.html --- a/kallithea/templates/admin/repos/repo_edit.html +++ b/kallithea/templates/admin/repos/repo_edit.html @@ -6,9 +6,6 @@ <%block name="title"> ${_('%s Repository Settings') % c.repo_info.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/repos/repos.html b/kallithea/templates/admin/repos/repos.html --- a/kallithea/templates/admin/repos/repos.html +++ b/kallithea/templates/admin/repos/repos.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Repositories Administration')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/settings/settings.html b/kallithea/templates/admin/settings/settings.html --- a/kallithea/templates/admin/settings/settings.html +++ b/kallithea/templates/admin/settings/settings.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Settings Administration')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/user_groups/user_group_add.html b/kallithea/templates/admin/user_groups/user_group_add.html --- a/kallithea/templates/admin/user_groups/user_group_add.html +++ b/kallithea/templates/admin/user_groups/user_group_add.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Add user group')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} diff --git a/kallithea/templates/admin/user_groups/user_group_edit.html b/kallithea/templates/admin/user_groups/user_group_edit.html --- a/kallithea/templates/admin/user_groups/user_group_edit.html +++ b/kallithea/templates/admin/user_groups/user_group_edit.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('%s user group settings') % c.user_group.users_group_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/user_groups/user_groups.html b/kallithea/templates/admin/user_groups/user_groups.html --- a/kallithea/templates/admin/user_groups/user_groups.html +++ b/kallithea/templates/admin/user_groups/user_groups.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('User Groups Administration')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/users/user_add.html b/kallithea/templates/admin/users/user_add.html --- a/kallithea/templates/admin/users/user_add.html +++ b/kallithea/templates/admin/users/user_add.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Add user')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} diff --git a/kallithea/templates/admin/users/user_edit.html b/kallithea/templates/admin/users/user_edit.html --- a/kallithea/templates/admin/users/user_edit.html +++ b/kallithea/templates/admin/users/user_edit.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('%s user settings') % c.user.username} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/admin/users/users.html b/kallithea/templates/admin/users/users.html --- a/kallithea/templates/admin/users/users.html +++ b/kallithea/templates/admin/users/users.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Users Administration')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html --- a/kallithea/templates/base/base.html +++ b/kallithea/templates/base/base.html @@ -38,6 +38,12 @@ ### MAKO DEFS ### +<%block name="branding_title"> + %if c.site_name: + · ${c.site_name} + %endif + + <%def name="flash_msg()"> <%include file="/base/flash_msg.html"/> 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 @@ -2,7 +2,7 @@ - <%block name="title"/> + <%block name="title"/><%block name="branding_title"/> diff --git a/kallithea/templates/bookmarks/bookmarks.html b/kallithea/templates/bookmarks/bookmarks.html --- a/kallithea/templates/bookmarks/bookmarks.html +++ b/kallithea/templates/bookmarks/bookmarks.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('%s Bookmarks') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/branches/branches.html b/kallithea/templates/branches/branches.html --- a/kallithea/templates/branches/branches.html +++ b/kallithea/templates/branches/branches.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('%s Branches') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html --- a/kallithea/templates/changelog/changelog.html +++ b/kallithea/templates/changelog/changelog.html @@ -7,9 +7,6 @@ %if c.changelog_for_path: /${c.changelog_for_path} %endif - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html --- a/kallithea/templates/changeset/changeset.html +++ b/kallithea/templates/changeset/changeset.html @@ -6,9 +6,6 @@ <%block name="title"> ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html --- a/kallithea/templates/changeset/changeset_range.html +++ b/kallithea/templates/changeset/changeset_range.html @@ -3,9 +3,6 @@ <%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 name="breadcrumbs_links()"> diff --git a/kallithea/templates/compare/compare_diff.html b/kallithea/templates/compare/compare_diff.html --- a/kallithea/templates/compare/compare_diff.html +++ b/kallithea/templates/compare/compare_diff.html @@ -7,9 +7,6 @@ %else: ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.a_repo.repo_name, c.a_ref_name)} > ${'%s@%s' % (c.cs_repo.repo_name, c.cs_ref_name)} %endif - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> 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 @@ -13,9 +13,6 @@ <%block name="title"> ${_('%s File side-by-side diff') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/files/file_diff.html b/kallithea/templates/files/file_diff.html --- a/kallithea/templates/files/file_diff.html +++ b/kallithea/templates/files/file_diff.html @@ -2,9 +2,6 @@ <%block name="title"> ${_('%s File Diff') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/files/files.html b/kallithea/templates/files/files.html --- a/kallithea/templates/files/files.html +++ b/kallithea/templates/files/files.html @@ -5,10 +5,6 @@ %if hasattr(c,'file'): · ${h.safe_unicode(c.file.path) or '/'} %endif - - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> 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 @@ -2,9 +2,6 @@ <%block name="title"> ${_('%s Files Add') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%block name="js_extra"> diff --git a/kallithea/templates/files/files_delete.html b/kallithea/templates/files/files_delete.html --- a/kallithea/templates/files/files_delete.html +++ b/kallithea/templates/files/files_delete.html @@ -2,9 +2,6 @@ <%block name="title"> ${_('%s Files Delete') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%block name="header_menu"> 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 @@ -2,9 +2,6 @@ <%block name="title"> ${_('%s File Edit') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%block name="js_extra"> diff --git a/kallithea/templates/followers/followers.html b/kallithea/templates/followers/followers.html --- a/kallithea/templates/followers/followers.html +++ b/kallithea/templates/followers/followers.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('%s Followers') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/forks/fork.html b/kallithea/templates/forks/fork.html --- a/kallithea/templates/forks/fork.html +++ b/kallithea/templates/forks/fork.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Fork repository %s') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/forks/forks.html b/kallithea/templates/forks/forks.html --- a/kallithea/templates/forks/forks.html +++ b/kallithea/templates/forks/forks.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('%s Forks') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/index.html b/kallithea/templates/index.html --- a/kallithea/templates/index.html +++ b/kallithea/templates/index.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Dashboard')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs()"> 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 @@ -2,9 +2,6 @@ <%inherit file="/base/base.html"/> <%block name="title"> ${_('Journal')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs()">
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 @@ -2,9 +2,6 @@ <%inherit file="/base/base.html"/> <%block name="title"> ${_('Public Journal')} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs()"> ${c.site_name} diff --git a/kallithea/templates/login.html b/kallithea/templates/login.html --- a/kallithea/templates/login.html +++ b/kallithea/templates/login.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Log In')} - %if c.site_name: - · ${c.site_name} - %endif
diff --git a/kallithea/templates/password_reset.html b/kallithea/templates/password_reset.html --- a/kallithea/templates/password_reset.html +++ b/kallithea/templates/password_reset.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Password Reset')} - %if c.site_name: - · ${c.site_name} - %endif
diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -4,9 +4,6 @@ <%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 name="breadcrumbs_links()"> diff --git a/kallithea/templates/pullrequests/pullrequest_show_all.html b/kallithea/templates/pullrequests/pullrequest_show_all.html --- a/kallithea/templates/pullrequests/pullrequest_show_all.html +++ b/kallithea/templates/pullrequests/pullrequest_show_all.html @@ -2,9 +2,6 @@ <%block name="title"> ${_('%s Pull Requests') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/pullrequests/pullrequest_show_my.html b/kallithea/templates/pullrequests/pullrequest_show_my.html --- a/kallithea/templates/pullrequests/pullrequest_show_my.html +++ b/kallithea/templates/pullrequests/pullrequest_show_my.html @@ -1,7 +1,7 @@ <%inherit file="/base/base.html"/> <%block name="title"> - ${_('My Pull Requests')} · ${c.site_name} + ${_('My Pull Requests')} <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/register.html b/kallithea/templates/register.html --- a/kallithea/templates/register.html +++ b/kallithea/templates/register.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('Sign Up')} - %if c.site_name: - · ${c.site_name} - %endif
diff --git a/kallithea/templates/search/search.html b/kallithea/templates/search/search.html --- a/kallithea/templates/search/search.html +++ b/kallithea/templates/search/search.html @@ -7,9 +7,6 @@ %else: ${_('Search in All Repositories')} %endif - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> 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 @@ -2,9 +2,6 @@ <%block name="title"> ${_('%s Statistics') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> 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 @@ -2,9 +2,6 @@ <%block name="title"> ${_('%s Summary') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()"> diff --git a/kallithea/templates/tags/tags.html b/kallithea/templates/tags/tags.html --- a/kallithea/templates/tags/tags.html +++ b/kallithea/templates/tags/tags.html @@ -3,9 +3,6 @@ <%block name="title"> ${_('%s Tags') % c.repo_name} - %if c.site_name: - · ${c.site_name} - %endif <%def name="breadcrumbs_links()">