improved title consistency

- changed - into dots to save space

rhodecode/templates/admin/admin.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Admin journal')} - ${c.rhodecode_name}
+    ${_('Admin journal')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/defaults/defaults.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Repositories defaults')} - ${c.rhodecode_name}
+    ${_('Repositories defaults')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/ldap/ldap.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('LDAP administration')} - ${c.rhodecode_name}
+    ${_('LDAP administration')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/notifications/notifications.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('My Notifications')} ${c.rhodecode_user.username} - ${c.rhodecode_name}
+    ${_('My Notifications')} ${c.rhodecode_user.username} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/notifications/show_notification.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Show notification')} ${c.rhodecode_user.username} - ${c.rhodecode_name}
+    ${_('Show notification')} ${c.rhodecode_user.username} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/permissions/permissions.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Permissions administration')} - ${c.rhodecode_name}
+    ${_('Permissions administration')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/repos/repo_add.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Add repository')} - ${c.rhodecode_name}
+    ${_('Add repository')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/repos/repo_edit.html

@@ -2,7 +2,7 b''
 <%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} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/repos/repos.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Repositories administration')} - ${c.rhodecode_name}
+    ${_('Repositories administration')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/repos_groups/repos_groups.html

@@ -1,7 +1,7 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
-    ${_('Repository group')} - ${c.rhodecode_name}
+    ${_('Repository group')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs()">

rhodecode/templates/admin/repos_groups/repos_groups_add.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Add repos group')} - ${c.rhodecode_name}
+    ${_('Add repos group')} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}

rhodecode/templates/admin/repos_groups/repos_groups_edit.html

@@ -2,7 +2,7 b''
 <%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} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}

rhodecode/templates/admin/repos_groups/repos_groups_show.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Repository groups administration')} - ${c.rhodecode_name}
+    ${_('Repository groups administration')} &middot; ${c.rhodecode_name}
 </%def>
 
 

rhodecode/templates/admin/settings/hooks.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Settings administration')} - ${c.rhodecode_name}
+    ${_('Settings administration')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/settings/settings.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Settings administration')} - ${c.rhodecode_name}
+    ${_('Settings administration')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/users/user_add.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Add user')} - ${c.rhodecode_name}
+    ${_('Add user')} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}

rhodecode/templates/admin/users/user_edit.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Edit user')} ${c.user.username} - ${c.rhodecode_name}
+    ${_('Edit user')} ${c.user.username} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/users/user_edit_my_account.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('My account')} ${c.rhodecode_user.username} - ${c.rhodecode_name}
+    ${_('My account')} ${c.rhodecode_user.username} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/users/users.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Users administration')} - ${c.rhodecode_name}
+    ${_('Users administration')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/users_groups/users_group_add.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('Add user group')} - ${c.rhodecode_name}
+    ${_('Add user group')} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}

rhodecode/templates/admin/users_groups/users_group_edit.html

@@ -2,7 +2,7 b''
 <%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} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/admin/users_groups/users_groups.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('User groups administration')} - ${c.rhodecode_name}
+    ${_('User groups administration')} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/bookmarks/bookmarks.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('%s Bookmarks') % c.repo_name} - ${c.rhodecode_name}
+    ${_('%s Bookmarks') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 

rhodecode/templates/branches/branches.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('%s Branches') % c.repo_name} - ${c.rhodecode_name}
+    ${_('%s Branches') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/changelog/changelog.html

@@ -3,7 +3,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-${_('%s Changelog') % c.repo_name} - ${c.rhodecode_name}
+${_('%s Changelog') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/changeset/changeset.html

@@ -3,7 +3,7 b''
 <%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)} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/changeset/changeset_range.html

@@ -2,7 +2,7 b''
 <%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)} -&gt; 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)} -&gt; r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/compare/compare_diff.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${c.repo_name} ${_('Compare')} ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -&gt; ${'%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)} -&gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/files/file_diff.html

@@ -1,7 +1,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('%s File diff') % c.repo_name} - ${c.rhodecode_name}
+    ${_('%s File Diff') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/files/files.html

@@ -1,13 +1,17 b''
 <%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'):
+        &middot; ${c.file.path or '\\'}
+    %endif
+    &middot; ${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 b' 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}" + " &middot; " + (f_path || '\\') + " &middot; " + "${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);

rhodecode/templates/files/files_add.html

@@ -1,7 +1,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('%s Edit file') % c.repo_name} - ${c.rhodecode_name}
+    ${_('%s Files Add') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="js_extra()">

rhodecode/templates/files/files_edit.html

@@ -1,7 +1,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('%s Edit file') % c.repo_name} - ${c.rhodecode_name}
+    ${_('%s Files Edit') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="js_extra()">

rhodecode/templates/followers/followers.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('%s Followers') % c.repo_name} - ${c.rhodecode_name}
+    ${_('%s Followers') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/forks/fork.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('%s Fork') % c.repo_name} - ${c.rhodecode_name}
+    ${_('%s Fork') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/forks/forks.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('%s Forks') % c.repo_name} - ${c.rhodecode_name}
+    ${_('%s Forks') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/index.html

@@ -1,6 +1,6 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="base/base.html"/>
-<%def name="title()">${_('Dashboard')} - ${c.rhodecode_name}</%def>
+<%def name="title()">${_('Dashboard')} &middot; ${c.rhodecode_name}</%def>
 <%def name="breadcrumbs()"></%def>
 <%def name="page_nav()">${self.menu('home')}</%def>
 <%def name="main()">

rhodecode/templates/journal/journal.html

@@ -1,7 +1,7 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
-    ${_('Journal')} - ${c.rhodecode_name}
+    ${_('Journal')} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs()">
     <h5>

rhodecode/templates/journal/public_journal.html

@@ -1,7 +1,7 b''
 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
-    ${_('Journal')} - ${c.rhodecode_name}
+    ${_('Public Journal')} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs()">
     ${c.rhodecode_name}

rhodecode/templates/login.html

@@ -2,7 +2,7 b''
 <%inherit file="base/root.html"/>
 
 <%def name="title()">
-    ${_('Sign In')} - ${c.rhodecode_name}
+    ${_('Log In')} &middot; ${c.rhodecode_name}
 </%def>
 
 <div id="login">
@@ -18,7 +18,7 b''
 </div>
     <!-- login -->
     <div class="title top-left-rounded-corner top-right-rounded-corner">
-        <h5>${_('Sign In to %s') % c.rhodecode_name}</h5>
+        <h5>${_('Log In to %s') % c.rhodecode_name}</h5>
     </div>
     <div class="inner">
         ${h.form(h.url.current(came_from=c.came_from))}

rhodecode/templates/password_reset.html

@@ -2,7 +2,7 b''
 <%inherit file="base/root.html"/>
 
 <%def name="title()">
-    ${_('Reset your password')} - ${c.rhodecode_name}
+    ${_('Password Reset')} &middot; ${c.rhodecode_name}
 </%def>
 
 <div id="register">

rhodecode/templates/pullrequests/pullrequest_show.html

@@ -1,7 +1,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${c.repo_name} ${_('Pull request #%s') % c.pull_request.pull_request_id}
+    ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/pullrequests/pullrequest_show_all.html

@@ -1,7 +1,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${c.repo_name} ${_('all pull requests')}
+    ${_('%s Pull Requests') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/register.html

@@ -2,7 +2,7 b''
 <%inherit file="base/root.html"/>
 
 <%def name="title()">
-    ${_('Sign Up')} - ${c.rhodecode_name}
+    ${_('Sign Up')} &middot; ${c.rhodecode_name}
 </%def>
 
 <div id="register">

rhodecode/templates/search/search.html

@@ -3,7 +3,7 b''
 
 <%def name="title()">
   %if c.repo_name:
-    ${_('Search repository')} ${c.repo_name} - ${c.rhodecode_name}
+    ${_('Search repository')} ${c.repo_name} &middot; ${c.rhodecode_name}
   %else:
     ${_('Search in all repositories')}
   %endif

rhodecode/templates/settings/repo_settings.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('%s Settings') % c.repo_name} - ${c.rhodecode_name}
+    ${_('%s Settings') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/shortlog/shortlog.html

@@ -2,17 +2,17 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('%s Shortlog') % c.repo_name} - ${c.rhodecode_name}
+    ${_('%s Lightweight Changelog') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 
 <%def name="breadcrumbs_links()">
     %if c.file_history:
-        ${h.link_to(_('Shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}
+        ${h.link_to(_('Lightweight Changelog'),h.url('shortlog_home',repo_name=c.repo_name))}
         &raquo;
         ${c.file_history}
     %else:
-        ${_('Shortlog')}
+        ${_('Lightweight Changelog')}
     %endif
 </%def>
 

rhodecode/templates/summary/summary.html

@@ -1,7 +1,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('%s Summary') % c.repo_name} - ${c.rhodecode_name}
+    ${_('%s Summary') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
 <%def name="breadcrumbs_links()">

rhodecode/templates/tags/tags.html

@@ -2,7 +2,7 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
-    ${_('%s Tags') % c.repo_name} - ${c.rhodecode_name}
+    ${_('%s Tags') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>