Mercurial > kallithea
changeset 4214:130df90c8278 kallithea-2.2.5-rebrand
Rename rhodecode_ini to ini
author | Bradley M. Kuhn <bkuhn@sfconservancy.org> |
---|---|
date | Wed, 02 Jul 2014 19:06:06 -0400 |
parents | 13c0ab8eb343 |
children | 4fddb2f34e7f |
files | kallithea/controllers/admin/settings.py kallithea/templates/admin/settings/settings_email.html kallithea/templates/admin/settings/settings_system.html |
diffstat | 3 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/settings.py Wed Jul 02 19:06:01 2014 -0400 +++ b/kallithea/controllers/admin/settings.py Wed Jul 02 19:06:06 2014 -0400 @@ -374,7 +374,7 @@ defaults.update(self._get_hg_ui_settings()) import kallithea - c.rhodecode_ini = kallithea.CONFIG + c.ini = kallithea.CONFIG return htmlfill.render( render('admin/settings/settings.html'), @@ -463,7 +463,7 @@ defaults.update(self._get_hg_ui_settings()) import kallithea - c.rhodecode_ini = kallithea.CONFIG + c.ini = kallithea.CONFIG c.rhodecode_update_url = defaults.get('rhodecode_update_url') server_info = Setting.get_server_info() for key, val in server_info.iteritems():
--- a/kallithea/templates/admin/settings/settings_email.html Wed Jul 02 19:06:01 2014 -0400 +++ b/kallithea/templates/admin/settings/settings_email.html Wed Jul 02 19:06:06 2014 -0400 @@ -1,19 +1,19 @@ <dl class="dl-horizontal"> <% elems = [ - (_('Email prefix'), c.rhodecode_ini.get('email_prefix'), ''), - (_('Kallithea email from'), c.rhodecode_ini.get('app_email_from'), ''), - (_('Error email from'), c.rhodecode_ini.get('error_email_from'), ''), - (_('Error email recipients'), c.rhodecode_ini.get('email_to'), ''), + (_('Email prefix'), c.ini.get('email_prefix'), ''), + (_('Kallithea email from'), c.ini.get('app_email_from'), ''), + (_('Error email from'), c.ini.get('error_email_from'), ''), + (_('Error email recipients'), c.ini.get('email_to'), ''), - (_('SMTP server'), c.rhodecode_ini.get('smtp_server'), ''), - (_('SMTP username'), c.rhodecode_ini.get('smtp_username'), ''), - (_('SMTP password'), '%s chars' % len(c.rhodecode_ini.get('smtp_password', '')), ''), - (_('SMTP port'), c.rhodecode_ini.get('smtp_port'), ''), + (_('SMTP server'), c.ini.get('smtp_server'), ''), + (_('SMTP username'), c.ini.get('smtp_username'), ''), + (_('SMTP password'), '%s chars' % len(c.ini.get('smtp_password', '')), ''), + (_('SMTP port'), c.ini.get('smtp_port'), ''), - (_('SMTP use TLS'), c.rhodecode_ini.get('smtp_use_tls'), ''), - (_('SMTP use SSL'), c.rhodecode_ini.get('smtp_use_ssl'), ''), - (_('SMTP auth'), c.rhodecode_ini.get('smtp_auth'), ''), + (_('SMTP use TLS'), c.ini.get('smtp_use_tls'), ''), + (_('SMTP use SSL'), c.ini.get('smtp_use_ssl'), ''), + (_('SMTP auth'), c.ini.get('smtp_auth'), ''), ] %> %for dt, dd, tt in elems:
--- a/kallithea/templates/admin/settings/settings_system.html Wed Jul 02 19:06:01 2014 -0400 +++ b/kallithea/templates/admin/settings/settings_system.html Wed Jul 02 19:06:06 2014 -0400 @@ -5,7 +5,7 @@ (_('Python version'), c.py_version, ''), (_('Platform'), c.platform, ''), (_('GIT version'), c.git_version, ''), - (_('GIT path'), c.rhodecode_ini.get('git_path'), ''), + (_('GIT path'), c.ini.get('git_path'), ''), (_('Upgrade info endpoint'), h.literal('%s <br/><span style="color:#999999">%s.</span>' % (c.rhodecode_update_url, _('Note: please make sure this server can access this url'))), ''), ] %>