Changeset - 3a3ec35466e7
[Not reviewed]
default
0 57 0
Thomas De Schampheleire - 11 years ago 2015-02-23 22:11:38
thomas.de_schampheleire@alcatel-lucent.com
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.
57 files changed with 8 insertions and 165 deletions:
0 comments (0 inline, 0 general)
kallithea/templates/about.html
Show inline comments
 
@@ -2,9 +2,6 @@
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -9,9 +9,6 @@
 
    %else:
 
        ${_('Public Gists')}
 
    %endif
 
    %if c.site_name:
 
        &middot; ${c.site_name}
 
    %endif
 
</%block>
 

	
 
<%def name="breadcrumbs_links()">
kallithea/templates/admin/gists/new.html
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -2,9 +2,6 @@
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -7,9 +7,6 @@
 

	
 
<%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
Show inline comments
 
@@ -6,9 +6,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%block name="title">
 
    ${_('Users Administration')}
 
    %if c.site_name:
 
        &middot; ${c.site_name}
 
    %endif
 
</%block>
 

	
 
<%def name="breadcrumbs_links()">
kallithea/templates/base/base.html
Show inline comments
 
@@ -38,6 +38,12 @@
 

	
 
### 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
Show inline comments
 
@@ -2,7 +2,7 @@
 
<!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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -7,9 +7,6 @@
 
    %if c.changelog_for_path:
 
      /${c.changelog_for_path}
 
    %endif
 
    %if c.site_name:
 
        &middot; ${c.site_name}
 
    %endif
 
</%block>
 

	
 
<%def name="breadcrumbs_links()">
kallithea/templates/changeset/changeset.html
Show inline comments
 
@@ -6,9 +6,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -7,9 +7,6 @@
 
    %else:
 
        ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.a_repo.repo_name, c.a_ref_name)} &gt; ${'%s@%s' % (c.cs_repo.repo_name, c.cs_ref_name)}
 
    %endif
 
    %if c.site_name:
 
        &middot; ${c.site_name}
 
    %endif
 
</%block>
 

	
 
<%def name="breadcrumbs_links()">
kallithea/templates/files/diff_2way.html
Show inline comments
 
@@ -13,9 +13,6 @@
 

	
 
<%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
Show inline comments
 
@@ -2,9 +2,6 @@
 

	
 
<%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
Show inline comments
 
@@ -5,10 +5,6 @@
 
    %if hasattr(c,'file'):
 
        &middot; ${h.safe_unicode(c.file.path) or '/'}
 
    %endif
 

	
 
    %if c.site_name:
 
        &middot; ${c.site_name}
 
    %endif
 
</%block>
 

	
 
<%def name="breadcrumbs_links()">
kallithea/templates/files/files_add.html
Show inline comments
 
@@ -2,9 +2,6 @@
 

	
 
<%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
Show inline comments
 
@@ -2,9 +2,6 @@
 

	
 
<%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
Show inline comments
 
@@ -2,9 +2,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%block name="title">
 
    ${_('Dashboard')}
 
    %if c.site_name:
 
        &middot; ${c.site_name}
 
    %endif
 
</%block>
 

	
 
<%def name="breadcrumbs()">
kallithea/templates/journal/journal.html
Show inline comments
 
@@ -2,9 +2,6 @@
 
<%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
Show inline comments
 
@@ -2,9 +2,6 @@
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%block name="title">
 
    ${_('Log In')}
 
    %if c.site_name:
 
        &middot; ${c.site_name}
 
    %endif
 
</%block>
 

	
 
<div id="login">
kallithea/templates/password_reset.html
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%block name="title">
 
    ${_('Password Reset')}
 
    %if c.site_name:
 
        &middot; ${c.site_name}
 
    %endif
 
</%block>
 

	
 
<div id="register">
kallithea/templates/pullrequests/pullrequest_show.html
Show inline comments
 
@@ -4,9 +4,6 @@
 

	
 
<%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
Show inline comments
 
@@ -2,9 +2,6 @@
 

	
 
<%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
Show inline comments
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%block name="title">
 
    ${_('Sign Up')}
 
    %if c.site_name:
 
        &middot; ${c.site_name}
 
    %endif
 
</%block>
 

	
 
<div id="register">
kallithea/templates/search/search.html
Show inline comments
 
@@ -7,9 +7,6 @@
 
    %else:
 
        ${_('Search in All Repositories')}
 
    %endif
 
    %if c.site_name:
 
        &middot; ${c.site_name}
 
    %endif
 
</%block>
 

	
 
<%def name="breadcrumbs_links()">
kallithea/templates/summary/statistics.html
Show inline comments
 
@@ -2,9 +2,6 @@
 

	
 
<%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
Show inline comments
 
@@ -2,9 +2,6 @@
 

	
 
<%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
Show inline comments
 
@@ -3,9 +3,6 @@
 

	
 
<%block name="title">
 
    ${_('%s Tags') % c.repo_name}
 
    %if c.site_name:
 
        &middot; ${c.site_name}
 
    %endif
 
</%block>
 

	
 
<%def name="breadcrumbs_links()">
0 comments (0 inline, 0 general)