[PATCH 2 of 2] admin: e-mail: don't repeat the e-mail settings from the .ini file

Thomas De Schampheleire patrickdepinguin at gmail.com
Fri Jul 24 17:03:47 UTC 2015


# HG changeset patch
# User Thomas De Schampheleire <thomas.de.schampheleire at gmail.com>
# Date 1437753200 -7200
#      Fri Jul 24 17:53:20 2015 +0200
# Node ID 61c2b09a860a0c2beffd16942f23e8471fecd1d1
# Parent  a777d0c6ac9b3cf048a7020dea0cebb911d5a6a2
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 --git a/kallithea/templates/admin/settings/settings_email.html b/kallithea/templates/admin/settings/settings_email.html
--- a/kallithea/templates/admin/settings/settings_email.html
+++ b/kallithea/templates/admin/settings/settings_email.html
@@ -1,27 +1,3 @@
-<dl class="dl-horizontal">
-<%
- 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 style="width:150px; text-align: left">${dt}:</dt>
-  <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
-%endfor
-</dl>
-
 ${h.form(url('admin_settings_email'), method='post')}
     <div class="form">
 


More information about the kallithea-general mailing list