# HG changeset patch # User Thomas De Schampheleire # Date 1437753200 -7200 # Node ID 071777309be11e4ad017f43f1e6188289f113b44 # Parent 3fa7b86b483e5855d5f5a5e961912bf716c5d784 admin: e-mail: don't repeat the e-mail settings from the .ini file None of the settings from the .ini file are currently listed in the admin interface, except for e-mail. There is no need for such an exception: either we list all settings or none. diff -r 3fa7b86b483e -r 071777309be1 kallithea/templates/admin/settings/settings_email.html --- a/kallithea/templates/admin/settings/settings_email.html Fri Jul 24 17:50:22 2015 +0200 +++ b/kallithea/templates/admin/settings/settings_email.html Fri Jul 24 17:53:20 2015 +0200 @@ -1,27 +1,3 @@ -
-<% - elems = [ - (_('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.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.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: -
${dt}:
-
${dd}
-%endfor -
- ${h.form(url('admin_settings_email'), method='post')}