templates: move site branding in page title to base template

Instead of repeating the same three lines in each and every template, move
it to the base template.

kallithea/templates/about.html

@@ -2,9 +2,6 b''
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('About')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 <%def name="breadcrumbs()">
     ${c.site_name}

kallithea/templates/admin/admin.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Admin Journal')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/auth/auth_settings.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Authentication Settings')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/defaults/defaults.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Repository Defaults')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/gists/edit.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Edit Gist')} &middot; ${c.gist.gist_access_id}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%block name="js_extra">

kallithea/templates/admin/gists/index.html

@@ -9,9 +9,6 b''
     %else:
         ${_('Public Gists')}
     %endif
-    %if c.site_name:
-        · ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/gists/new.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('New Gist')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%block name="js_extra">

kallithea/templates/admin/gists/show.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Gist')} &middot; ${c.gist.gist_access_id}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/my_account/my_account.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('My Account')} ${c.authuser.username}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/notifications/notifications.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('My Notifications')} ${c.authuser.username}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/notifications/show_notification.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Show Notification')} ${c.authuser.username}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/permissions/permissions.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Permissions Administration')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/repo_groups/repo_group_add.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Add Repository Group')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/repo_groups/repo_group_edit.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('%s Repository Group Settings') % c.repo_group.name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/repo_groups/repo_group_show.html

@@ -2,9 +2,6 b''
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('%s Repository group dashboard') % c.group.group_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs()">

kallithea/templates/admin/repo_groups/repo_groups.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Repository Groups Administration')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/repos/repo_add.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Add Repository')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/repos/repo_creating.html

@@ -7,9 +7,6 b''
 
 <%block name="title">
     ${_('%s Creating Repository') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/repos/repo_edit.html

@@ -6,9 +6,6 b''
 
 <%block name="title">
     ${_('%s Repository Settings') % c.repo_info.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/repos/repos.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Repositories Administration')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/settings/settings.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Settings Administration')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/user_groups/user_group_add.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Add user group')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}

kallithea/templates/admin/user_groups/user_group_edit.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('%s user group settings') % c.user_group.users_group_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/user_groups/user_groups.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('User Groups Administration')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/users/user_add.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Add user')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}

kallithea/templates/admin/users/user_edit.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('%s user settings') % c.user.username}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/admin/users/users.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Users Administration')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/base/base.html

@@ -38,6 +38,12 b''
 
 ### MAKO DEFS ###
 
+<%block name="branding_title">
+    %if c.site_name:
+    &middot; ${c.site_name}
+    %endif
+</%block>
+
 <%def name="flash_msg()">
     <%include file="/base/flash_msg.html"/>
 </%def>

kallithea/templates/base/root.html

@@ -2,7 +2,7 b''
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
-        <title><%block name="title"/></title>
+        <title><%block name="title"/><%block name="branding_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" />

kallithea/templates/bookmarks/bookmarks.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('%s Bookmarks') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/branches/branches.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('%s Branches') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/changelog/changelog.html

@@ -7,9 +7,6 b''
     %if c.changelog_for_path:
       /${c.changelog_for_path}
     %endif
-    %if c.site_name:
-        · ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/changeset/changeset.html

@@ -6,9 +6,6 b''
 
 <%block name="title">
     ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/changeset/changeset_range.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('%s Changesets') % c.repo_name} - ${h.show_id(c.cs_ranges[0])} &gt; ${h.show_id(c.cs_ranges[-1])}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/compare/compare_diff.html

@@ -7,9 +7,6 b''
     %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
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/files/diff_2way.html

@@ -13,9 +13,6 b''
 
 <%block name="title">
     ${_('%s File side-by-side diff') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/files/file_diff.html

@@ -2,9 +2,6 b''
 
 <%block name="title">
     ${_('%s File Diff') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/files/files.html

@@ -5,10 +5,6 b''
     %if hasattr(c,'file'):
         · ${h.safe_unicode(c.file.path) or '/'}
     %endif
-
-    %if c.site_name:
-        · ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/files/files_add.html

@@ -2,9 +2,6 b''
 
 <%block name="title">
     ${_('%s Files Add') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%block name="js_extra">

kallithea/templates/files/files_delete.html

@@ -2,9 +2,6 b''
 
 <%block name="title">
     ${_('%s Files Delete') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%block name="header_menu">

kallithea/templates/files/files_edit.html

@@ -2,9 +2,6 b''
 
 <%block name="title">
     ${_('%s File Edit') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%block name="js_extra">

kallithea/templates/followers/followers.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('%s Followers') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/forks/fork.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Fork repository %s') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/forks/forks.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('%s Forks') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/index.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Dashboard')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs()">

kallithea/templates/journal/journal.html

@@ -2,9 +2,6 b''
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('Journal')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 <%def name="breadcrumbs()">
     <h5>

kallithea/templates/journal/public_journal.html

@@ -2,9 +2,6 b''
 <%inherit file="/base/base.html"/>
 <%block name="title">
     ${_('Public Journal')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 <%def name="breadcrumbs()">
     ${c.site_name}

kallithea/templates/login.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Log In')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <div id="login">

kallithea/templates/password_reset.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Password Reset')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <div id="register">

kallithea/templates/pullrequests/pullrequest_show.html

@@ -4,9 +4,6 b''
 
 <%block name="title">
     ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/pullrequests/pullrequest_show_all.html

@@ -2,9 +2,6 b''
 
 <%block name="title">
     ${_('%s Pull Requests') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/pullrequests/pullrequest_show_my.html

@@ -1,7 +1,7 b''
 <%inherit file="/base/base.html"/>
 
 <%block name="title">
-    ${_('My Pull Requests')} &middot; ${c.site_name}
+    ${_('My Pull Requests')}
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/register.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('Sign Up')}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <div id="register">

kallithea/templates/search/search.html

@@ -7,9 +7,6 b''
     %else:
         ${_('Search in All Repositories')}
     %endif
-    %if c.site_name:
-        · ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/summary/statistics.html

@@ -2,9 +2,6 b''
 
 <%block name="title">
     ${_('%s Statistics') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/summary/summary.html

@@ -2,9 +2,6 b''
 
 <%block name="title">
     ${_('%s Summary') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">

kallithea/templates/tags/tags.html

@@ -3,9 +3,6 b''
 
 <%block name="title">
     ${_('%s Tags') % c.repo_name}
-    %if c.site_name:
-        &middot; ${c.site_name}
-    %endif
 </%block>
 
 <%def name="breadcrumbs_links()">