diff --git a/rhodecode/templates/admin/admin.html b/rhodecode/templates/admin/admin.html --- a/rhodecode/templates/admin/admin.html +++ b/rhodecode/templates/admin/admin.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Admin journal')} - ${c.rhodecode_name} + ${_('Admin journal')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/defaults/defaults.html b/rhodecode/templates/admin/defaults/defaults.html --- a/rhodecode/templates/admin/defaults/defaults.html +++ b/rhodecode/templates/admin/defaults/defaults.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repositories defaults')} - ${c.rhodecode_name} + ${_('Repositories defaults')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/ldap/ldap.html b/rhodecode/templates/admin/ldap/ldap.html --- a/rhodecode/templates/admin/ldap/ldap.html +++ b/rhodecode/templates/admin/ldap/ldap.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('LDAP administration')} - ${c.rhodecode_name} + ${_('LDAP administration')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/notifications/notifications.html b/rhodecode/templates/admin/notifications/notifications.html --- a/rhodecode/templates/admin/notifications/notifications.html +++ b/rhodecode/templates/admin/notifications/notifications.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('My Notifications')} ${c.rhodecode_user.username} - ${c.rhodecode_name} + ${_('My Notifications')} ${c.rhodecode_user.username} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/notifications/show_notification.html b/rhodecode/templates/admin/notifications/show_notification.html --- a/rhodecode/templates/admin/notifications/show_notification.html +++ b/rhodecode/templates/admin/notifications/show_notification.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Show notification')} ${c.rhodecode_user.username} - ${c.rhodecode_name} + ${_('Show notification')} ${c.rhodecode_user.username} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/permissions/permissions.html b/rhodecode/templates/admin/permissions/permissions.html --- a/rhodecode/templates/admin/permissions/permissions.html +++ b/rhodecode/templates/admin/permissions/permissions.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Permissions administration')} - ${c.rhodecode_name} + ${_('Permissions administration')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/repos/repo_add.html b/rhodecode/templates/admin/repos/repo_add.html --- a/rhodecode/templates/admin/repos/repo_add.html +++ b/rhodecode/templates/admin/repos/repo_add.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Add repository')} - ${c.rhodecode_name} + ${_('Add repository')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/repos/repo_edit.html b/rhodecode/templates/admin/repos/repo_edit.html --- a/rhodecode/templates/admin/repos/repo_edit.html +++ b/rhodecode/templates/admin/repos/repo_edit.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Edit repository')} ${c.repo_info.repo_name} - ${c.rhodecode_name} + ${_('Edit repository')} ${c.repo_info.repo_name} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/repos/repos.html b/rhodecode/templates/admin/repos/repos.html --- a/rhodecode/templates/admin/repos/repos.html +++ b/rhodecode/templates/admin/repos/repos.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repositories administration')} - ${c.rhodecode_name} + ${_('Repositories administration')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/repos_groups/repos_groups.html b/rhodecode/templates/admin/repos_groups/repos_groups.html --- a/rhodecode/templates/admin/repos_groups/repos_groups.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups.html @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repository group')} - ${c.rhodecode_name} + ${_('Repository group')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs()"> diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_add.html b/rhodecode/templates/admin/repos_groups/repos_groups_add.html --- a/rhodecode/templates/admin/repos_groups/repos_groups_add.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups_add.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Add repos group')} - ${c.rhodecode_name} + ${_('Add repos group')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html --- a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Edit repos group')} ${c.repos_group.name} - ${c.rhodecode_name} + ${_('Edit repos group')} ${c.repos_group.name} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_show.html b/rhodecode/templates/admin/repos_groups/repos_groups_show.html --- a/rhodecode/templates/admin/repos_groups/repos_groups_show.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups_show.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Repository groups administration')} - ${c.rhodecode_name} + ${_('Repository groups administration')} · ${c.rhodecode_name} %def> diff --git a/rhodecode/templates/admin/settings/hooks.html b/rhodecode/templates/admin/settings/hooks.html --- a/rhodecode/templates/admin/settings/hooks.html +++ b/rhodecode/templates/admin/settings/hooks.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Settings administration')} - ${c.rhodecode_name} + ${_('Settings administration')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/settings/settings.html b/rhodecode/templates/admin/settings/settings.html --- a/rhodecode/templates/admin/settings/settings.html +++ b/rhodecode/templates/admin/settings/settings.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Settings administration')} - ${c.rhodecode_name} + ${_('Settings administration')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/users/user_add.html b/rhodecode/templates/admin/users/user_add.html --- a/rhodecode/templates/admin/users/user_add.html +++ b/rhodecode/templates/admin/users/user_add.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Add user')} - ${c.rhodecode_name} + ${_('Add user')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} diff --git a/rhodecode/templates/admin/users/user_edit.html b/rhodecode/templates/admin/users/user_edit.html --- a/rhodecode/templates/admin/users/user_edit.html +++ b/rhodecode/templates/admin/users/user_edit.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Edit user')} ${c.user.username} - ${c.rhodecode_name} + ${_('Edit user')} ${c.user.username} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('My account')} ${c.rhodecode_user.username} - ${c.rhodecode_name} + ${_('My account')} ${c.rhodecode_user.username} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/users/users.html b/rhodecode/templates/admin/users/users.html --- a/rhodecode/templates/admin/users/users.html +++ b/rhodecode/templates/admin/users/users.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Users administration')} - ${c.rhodecode_name} + ${_('Users administration')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/users_groups/users_group_add.html b/rhodecode/templates/admin/users_groups/users_group_add.html --- a/rhodecode/templates/admin/users_groups/users_group_add.html +++ b/rhodecode/templates/admin/users_groups/users_group_add.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Add user group')} - ${c.rhodecode_name} + ${_('Add user group')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> ${h.link_to(_('Admin'),h.url('admin_home'))} diff --git a/rhodecode/templates/admin/users_groups/users_group_edit.html b/rhodecode/templates/admin/users_groups/users_group_edit.html --- a/rhodecode/templates/admin/users_groups/users_group_edit.html +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Edit user group')} ${c.users_group.users_group_name} - ${c.rhodecode_name} + ${_('Edit user group')} ${c.users_group.users_group_name} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/admin/users_groups/users_groups.html b/rhodecode/templates/admin/users_groups/users_groups.html --- a/rhodecode/templates/admin/users_groups/users_groups.html +++ b/rhodecode/templates/admin/users_groups/users_groups.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('User groups administration')} - ${c.rhodecode_name} + ${_('User groups administration')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/bookmarks/bookmarks.html b/rhodecode/templates/bookmarks/bookmarks.html --- a/rhodecode/templates/bookmarks/bookmarks.html +++ b/rhodecode/templates/bookmarks/bookmarks.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Bookmarks') % c.repo_name} - ${c.rhodecode_name} + ${_('%s Bookmarks') % c.repo_name} · ${c.rhodecode_name} %def> diff --git a/rhodecode/templates/branches/branches.html b/rhodecode/templates/branches/branches.html --- a/rhodecode/templates/branches/branches.html +++ b/rhodecode/templates/branches/branches.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Branches') % c.repo_name} - ${c.rhodecode_name} + ${_('%s Branches') % c.repo_name} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -3,7 +3,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> -${_('%s Changelog') % c.repo_name} - ${c.rhodecode_name} +${_('%s Changelog') % c.repo_name} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -3,7 +3,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Changeset') % c.repo_name} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${c.rhodecode_name} + ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html --- a/rhodecode/templates/changeset/changeset_range.html +++ b/rhodecode/templates/changeset/changeset_range.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} - ${c.rhodecode_name} + ${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/compare/compare_diff.html b/rhodecode/templates/compare/compare_diff.html --- a/rhodecode/templates/compare/compare_diff.html +++ b/rhodecode/templates/compare/compare_diff.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${c.repo_name} ${_('Compare')} ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} + ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/files/file_diff.html b/rhodecode/templates/files/file_diff.html --- a/rhodecode/templates/files/file_diff.html +++ b/rhodecode/templates/files/file_diff.html @@ -1,7 +1,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s File diff') % c.repo_name} - ${c.rhodecode_name} + ${_('%s File Diff') % c.repo_name} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/files/files.html b/rhodecode/templates/files/files.html --- a/rhodecode/templates/files/files.html +++ b/rhodecode/templates/files/files.html @@ -1,13 +1,17 @@ <%inherit file="/base/base.html"/> -<%def name="title()"> - ${_('%s files') % c.repo_name} - ${c.rhodecode_name} +<%def name="title(*args)"> + ${_('%s Files') % c.repo_name} + %if hasattr(c,'file'): + · ${c.file.path or '\\'} + %endif + · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> ${_('Files')} %if c.file: - @ r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} + @ ${h.show_id(c.changeset)} %endif %def> @@ -65,10 +69,11 @@ var ypjax_links = function(){ } var parts2 = parts[1].split('/'); - var rev = parts2.shift(); // pop the first element which is the revision - var f_path = parts2.join('/'); + var rev = parts2.shift(); // pop the first element which is the revision + var f_path = parts2.join('/'); - var title = "${_('%s files') % c.repo_name}" + " - " + f_path; + //page title make this consistent with title() mako function on top + var title = "${_('%s Files') % c.repo_name}" + " · " + (f_path || '\\') + " · " + "${c.rhodecode_name}"; var _node_list_url = node_list_url.replace('__REV__',rev).replace('__FPATH__', f_path); var _url_base = url_base.replace('__REV__',rev); diff --git a/rhodecode/templates/files/files_add.html b/rhodecode/templates/files/files_add.html --- a/rhodecode/templates/files/files_add.html +++ b/rhodecode/templates/files/files_add.html @@ -1,7 +1,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Edit file') % c.repo_name} - ${c.rhodecode_name} + ${_('%s Files Add') % c.repo_name} · ${c.rhodecode_name} %def> <%def name="js_extra()"> diff --git a/rhodecode/templates/files/files_edit.html b/rhodecode/templates/files/files_edit.html --- a/rhodecode/templates/files/files_edit.html +++ b/rhodecode/templates/files/files_edit.html @@ -1,7 +1,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Edit file') % c.repo_name} - ${c.rhodecode_name} + ${_('%s Files Edit') % c.repo_name} · ${c.rhodecode_name} %def> <%def name="js_extra()"> diff --git a/rhodecode/templates/followers/followers.html b/rhodecode/templates/followers/followers.html --- a/rhodecode/templates/followers/followers.html +++ b/rhodecode/templates/followers/followers.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Followers') % c.repo_name} - ${c.rhodecode_name} + ${_('%s Followers') % c.repo_name} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/forks/fork.html b/rhodecode/templates/forks/fork.html --- a/rhodecode/templates/forks/fork.html +++ b/rhodecode/templates/forks/fork.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Fork') % c.repo_name} - ${c.rhodecode_name} + ${_('%s Fork') % c.repo_name} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/forks/forks.html b/rhodecode/templates/forks/forks.html --- a/rhodecode/templates/forks/forks.html +++ b/rhodecode/templates/forks/forks.html @@ -2,7 +2,7 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('%s Forks') % c.repo_name} - ${c.rhodecode_name} + ${_('%s Forks') % c.repo_name} · ${c.rhodecode_name} %def> <%def name="breadcrumbs_links()"> diff --git a/rhodecode/templates/index.html b/rhodecode/templates/index.html --- a/rhodecode/templates/index.html +++ b/rhodecode/templates/index.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <%inherit file="base/base.html"/> -<%def name="title()">${_('Dashboard')} - ${c.rhodecode_name}%def> +<%def name="title()">${_('Dashboard')} · ${c.rhodecode_name}%def> <%def name="breadcrumbs()">%def> <%def name="page_nav()">${self.menu('home')}%def> <%def name="main()"> diff --git a/rhodecode/templates/journal/journal.html b/rhodecode/templates/journal/journal.html --- a/rhodecode/templates/journal/journal.html +++ b/rhodecode/templates/journal/journal.html @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Journal')} - ${c.rhodecode_name} + ${_('Journal')} · ${c.rhodecode_name} %def> <%def name="breadcrumbs()">