Mercurial > kallithea
changeset 4198:a540f7e69c82 kallithea-2.2.5-rebrand
Rename rhodecode_name to site_name - it is the configurable name of the site/instance
line wrap: on
line diff
--- a/kallithea/controllers/error.py Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/controllers/error.py Wed Jul 02 19:05:15 2014 -0400 @@ -53,7 +53,7 @@ def document(self): resp = request.environ.get('pylons.original_response') - c.rhodecode_name = config.get('rhodecode_title') + c.site_name = config.get('rhodecode_title') log.debug('### %s ###' % resp.status)
--- a/kallithea/controllers/feed.py Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/controllers/feed.py Wed Jul 02 19:05:15 2014 -0400 @@ -51,7 +51,7 @@ super(FeedController, self).__before__() #common values for feeds self.description = _('Changes on %s repository') - self.title = self.title = _('%s %s feed') % (c.rhodecode_name, '%s') + self.title = self.title = _('%s %s feed') % (c.site_name, '%s') self.language = 'en-us' self.ttl = "5" import kallithea
--- a/kallithea/controllers/journal.py Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/controllers/journal.py Wed Jul 02 19:05:15 2014 -0400 @@ -109,11 +109,11 @@ journal = self._get_journal_data(repos) if public: _link = url('public_journal_atom', qualified=True) - _desc = '%s %s %s' % (c.rhodecode_name, _('public journal'), + _desc = '%s %s %s' % (c.site_name, _('public journal'), 'atom feed') else: _link = url('journal_atom', qualified=True) - _desc = '%s %s %s' % (c.rhodecode_name, _('journal'), 'atom feed') + _desc = '%s %s %s' % (c.site_name, _('journal'), 'atom feed') feed = Atom1Feed(title=_desc, link=_link, @@ -152,11 +152,11 @@ journal = self._get_journal_data(repos) if public: _link = url('public_journal_atom', qualified=True) - _desc = '%s %s %s' % (c.rhodecode_name, _('public journal'), + _desc = '%s %s %s' % (c.site_name, _('public journal'), 'rss feed') else: _link = url('journal_atom', qualified=True) - _desc = '%s %s %s' % (c.rhodecode_name, _('journal'), 'rss feed') + _desc = '%s %s %s' % (c.site_name, _('journal'), 'rss feed') feed = Rss201rev2Feed(title=_desc, link=_link,
--- a/kallithea/lib/base.py Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/lib/base.py Wed Jul 02 19:05:15 2014 -0400 @@ -300,7 +300,7 @@ c.visual.gravatar_url = rc_config.get('rhodecode_gravatar_url') c.ga_code = rc_config.get('rhodecode_ga_code') - c.rhodecode_name = rc_config.get('rhodecode_title') + c.site_name = rc_config.get('rhodecode_title') c.clone_uri_tmpl = rc_config.get('rhodecode_clone_uri_tmpl') ## INI stored
--- a/kallithea/templates/admin/admin.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/admin.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Admin journal')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/auth/auth_settings.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/auth/auth_settings.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Authentication Settings')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/defaults/defaults.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/defaults/defaults.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Repositories defaults')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/gists/edit.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/gists/edit.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Edit Gist')} · ${c.gist.gist_access_id} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/gists/index.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/gists/index.html Wed Jul 02 19:05:15 2014 -0400 @@ -9,8 +9,8 @@ %else: ${_('Public Gists')} %endif - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/gists/new.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/gists/new.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('New Gist')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/gists/show.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/gists/show.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Gist')} · ${c.gist.gist_access_id} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/my_account/my_account.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/my_account/my_account.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('My account')} ${c.authuser.username} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/notifications/notifications.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/notifications/notifications.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('My Notifications')} ${c.authuser.username} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/notifications/show_notification.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/notifications/show_notification.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Show notification')} ${c.authuser.username} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/permissions/permissions.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/permissions/permissions.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Permissions administration')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Add repository group')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/repo_groups/repo_group_edit.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('%s Repository group settings') % c.repo_group.name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/repo_groups/repo_group_show.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/repo_groups/repo_group_show.html Wed Jul 02 19:05:15 2014 -0400 @@ -2,8 +2,8 @@ <%inherit file="/base/base.html"/> <%def name="title()"> ${_('%s Repository group dashboard') % c.group.group_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/repo_groups/repo_groups.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/repo_groups/repo_groups.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Repository groups administration')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/repos/repo_add.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/repos/repo_add.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Add repository')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/repos/repo_creating.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/repos/repo_creating.html Wed Jul 02 19:05:15 2014 -0400 @@ -7,8 +7,8 @@ <%def name="title()"> ${_('%s Creating repository') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/repos/repo_edit.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/repos/repo_edit.html Wed Jul 02 19:05:15 2014 -0400 @@ -6,8 +6,8 @@ <%def name="title()"> ${_('%s repository settings') % c.repo_info.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/repos/repos.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/repos/repos.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Repositories administration')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/settings/settings.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/settings/settings.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Settings administration')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/user_groups/user_group_add.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/user_groups/user_group_add.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Add user group')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def> <%def name="breadcrumbs_links()">
--- a/kallithea/templates/admin/user_groups/user_group_edit.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/user_groups/user_group_edit.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('%s user group settings') % c.user_group.users_group_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/user_groups/user_groups.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/user_groups/user_groups.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('User groups administration')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/users/user_add.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/users/user_add.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Add user')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def> <%def name="breadcrumbs_links()">
--- a/kallithea/templates/admin/users/user_edit.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/users/user_edit.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('%s user settings') % c.user.username} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/admin/users/users.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/admin/users/users.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Users administration')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/base/base.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/base/base.html Wed Jul 02 19:05:15 2014 -0400 @@ -8,8 +8,8 @@ <div class="header"> <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a> </div> - %if c.rhodecode_name: - <div class="branding">- ${c.rhodecode_name}</div> + %if c.site_name: + <div class="branding">- ${c.site_name}</div> %endif </div> <!-- MENU -->
--- a/kallithea/templates/bookmarks/bookmarks.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/bookmarks/bookmarks.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('%s Bookmarks') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/branches/branches.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/branches/branches.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('%s Branches') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/changelog/changelog.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/changelog/changelog.html Wed Jul 02 19:05:15 2014 -0400 @@ -7,8 +7,8 @@ %if c.changelog_for_path: /${c.changelog_for_path} %endif - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/changeset/changeset.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/changeset/changeset.html Wed Jul 02 19:05:15 2014 -0400 @@ -4,8 +4,8 @@ <%def name="title()"> ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/changeset/changeset_range.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/changeset/changeset_range.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%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)} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/compare/compare_diff.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/compare/compare_diff.html Wed Jul 02 19:05:15 2014 -0400 @@ -7,8 +7,8 @@ %else: ${_('%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)} %endif - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/errors/error_document.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/errors/error_document.html Wed Jul 02 19:05:15 2014 -0400 @@ -38,7 +38,7 @@ <div id="login"> <div class="table"> <div id="main_div"> - <div style="font-size:2.0em;margin: 10px">${c.rhodecode_name}</div> + <div style="font-size:2.0em;margin: 10px">${c.site_name}</div> <h1 class="error_message">${c.error_message}</h1> <p>${c.error_explanation}</p>
--- a/kallithea/templates/files/diff_2way.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/files/diff_2way.html Wed Jul 02 19:05:15 2014 -0400 @@ -13,8 +13,8 @@ <%def name="title()"> ${_('%s File side-by-side diff') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/files/file_diff.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/files/file_diff.html Wed Jul 02 19:05:15 2014 -0400 @@ -2,8 +2,8 @@ <%def name="title()"> ${_('%s File Diff') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/files/files.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/files/files.html Wed Jul 02 19:05:15 2014 -0400 @@ -6,8 +6,8 @@ · ${h.safe_unicode(c.file.path) or '\\'} %endif - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def> @@ -81,7 +81,7 @@ var f_path = parts2.join('/'); //page title make this consistent with title() mako function on top - var title = "${_('%s Files') % c.repo_name}" + " · " + (f_path || '\\') + " · " + "${c.rhodecode_name}"; + var title = "${_('%s Files') % c.repo_name}" + " · " + (f_path || '\\') + " · " + "${c.site_name}"; var _node_list_url = node_list_url.replace('__REV__',rev).replace('__FPATH__', f_path); var _url_base = url_base.replace('__REV__',rev);
--- a/kallithea/templates/files/files_add.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/files/files_add.html Wed Jul 02 19:05:15 2014 -0400 @@ -2,8 +2,8 @@ <%def name="title()"> ${_('%s Files Add') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/files/files_delete.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/files/files_delete.html Wed Jul 02 19:05:15 2014 -0400 @@ -2,8 +2,8 @@ <%def name="title()"> ${_('%s Files Delete') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/files/files_edit.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/files/files_edit.html Wed Jul 02 19:05:15 2014 -0400 @@ -2,8 +2,8 @@ <%def name="title()"> ${_('%s File Edit') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/followers/followers.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/followers/followers.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('%s Followers') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/forks/fork.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/forks/fork.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Fork repository %s') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/forks/forks.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/forks/forks.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('%s Forks') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/index.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/index.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Dashboard')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/index_base.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/index_base.html Wed Jul 02 19:05:15 2014 -0400 @@ -72,7 +72,7 @@ <div style="height: 20px"></div> % endif <div id="welcome" style="display:none;text-align:center"> - <h1><a href="${h.url('home')}">${c.rhodecode_name} ${c.rhodecode_version}</a></h1> + <h1><a href="${h.url('home')}">${c.site_name} ${c.rhodecode_version}</a></h1> </div> <%cnt=0%> <%namespace name="dt" file="/data_table/_dt_elements.html"/>
--- a/kallithea/templates/journal/journal.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/journal/journal.html Wed Jul 02 19:05:15 2014 -0400 @@ -2,8 +2,8 @@ <%inherit file="/base/base.html"/> <%def name="title()"> ${_('Journal')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def> <%def name="breadcrumbs()">
--- a/kallithea/templates/journal/public_journal.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/journal/public_journal.html Wed Jul 02 19:05:15 2014 -0400 @@ -2,12 +2,12 @@ <%inherit file="/base/base.html"/> <%def name="title()"> ${_('Public Journal')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def> <%def name="breadcrumbs()"> - ${c.rhodecode_name} + ${c.site_name} </%def> <%def name="page_nav()"> ${self.menu('journal')}
--- a/kallithea/templates/login.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/login.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Log In')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def> @@ -15,8 +15,8 @@ <div class="header"> <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a> </div> - %if c.rhodecode_name: - <div class="branding">- ${c.rhodecode_name}</div> + %if c.site_name: + <div class="branding">- ${c.site_name}</div> %endif </div> </div> @@ -26,8 +26,8 @@ <%include file="/base/flash_msg.html"/> <!-- login --> <div class="title withlogo"> - %if c.rhodecode_name: - <h5>${_('Log In to %s') % c.rhodecode_name}</h5> + %if c.site_name: + <h5>${_('Log In to %s') % c.site_name}</h5> %else: <h5>${_('Log In')}</h5> %endif
--- a/kallithea/templates/password_reset.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/password_reset.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Password Reset')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def> @@ -15,8 +15,8 @@ <div class="header"> <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a> </div> - %if c.rhodecode_name: - <div class="branding">- ${c.rhodecode_name}</div> + %if c.site_name: + <div class="branding">- ${c.site_name}</div> %endif </div> </div> @@ -25,8 +25,8 @@ <div id="register"> <%include file="/base/flash_msg.html"/> <div class="title withlogo"> - %if c.rhodecode_name: - <h5>${_('Reset your Password to %s') % c.rhodecode_name}</h5> + %if c.site_name: + <h5>${_('Reset your Password to %s') % c.site_name}</h5> %else: <h5>${_('Reset your Password')}</h5> %endif
--- a/kallithea/templates/pullrequests/pullrequest_show.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Wed Jul 02 19:05:15 2014 -0400 @@ -2,8 +2,8 @@ <%def name="title()"> ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/pullrequests/pullrequest_show_all.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/pullrequests/pullrequest_show_all.html Wed Jul 02 19:05:15 2014 -0400 @@ -2,8 +2,8 @@ <%def name="title()"> ${_('%s Pull Requests') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/register.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/register.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('Sign Up')} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def> <div id="header"> @@ -13,8 +13,8 @@ <div class="header"> <a href="${h.url('home')}"><img src="${h.url('/images/kallithea-logo.png')}" alt="RhodeCode"/></a> </div> - %if c.rhodecode_name: - <div class="branding">- ${c.rhodecode_name}</div> + %if c.site_name: + <div class="branding">- ${c.site_name}</div> %endif </div> </div> @@ -24,8 +24,8 @@ <div id="register"> <%include file="/base/flash_msg.html"/> <div class="title withlogo"> - %if c.rhodecode_name: - <h5>${_('Sign Up to %s') % c.rhodecode_name}</h5> + %if c.site_name: + <h5>${_('Sign Up to %s') % c.site_name}</h5> %else: <h5>${_('Sign Up')}</h5> %endif
--- a/kallithea/templates/search/search.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/search/search.html Wed Jul 02 19:05:15 2014 -0400 @@ -7,8 +7,8 @@ %else: ${_('Search in all repositories')} %endif - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/summary/statistics.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/summary/statistics.html Wed Jul 02 19:05:15 2014 -0400 @@ -2,8 +2,8 @@ <%def name="title()"> ${_('%s Statistics') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/summary/summary.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/summary/summary.html Wed Jul 02 19:05:15 2014 -0400 @@ -2,8 +2,8 @@ <%def name="title()"> ${_('%s Summary') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>
--- a/kallithea/templates/tags/tags.html Wed Jul 02 19:05:10 2014 -0400 +++ b/kallithea/templates/tags/tags.html Wed Jul 02 19:05:15 2014 -0400 @@ -3,8 +3,8 @@ <%def name="title()"> ${_('%s Tags') % c.repo_name} - %if c.rhodecode_name: - · ${c.rhodecode_name} + %if c.site_name: + · ${c.site_name} %endif </%def>