[PATCH 5 of 8] admin: e-mail: clarify e-mail settings a bit more

Thomas De Schampheleire patrickdepinguin at gmail.com
Wed Jul 22 19:50:05 UTC 2015


# HG changeset patch
# User Thomas De Schampheleire <thomas.de.schampheleire at gmail.com>
# Date 1437593297 -7200
#      Wed Jul 22 21:28:17 2015 +0200
# Node ID be74730111dac1a1f1fcd51a274ae5b5a7a5f540
# Parent  c8e5401db62afbfe417a35b10189bf85aff97726
admin: e-mail: clarify e-mail settings a bit more

Add some clarification to the e-mail settings on the settings page.
Use the setting name as form label.

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,17 +1,17 @@
 <%
  elems = [
-    (_('Email prefix'), 'email_prefix'),
-    (_('Kallithea email from'), 'app_email_from'),
-    (_('Error email from'), 'error_email_from'),
-    (_('Error email recipients'), 'email_to'),
+    (_('Subject prefix for e-mails sent by Kallithea'), 'email_prefix'),
+    (_('Sender for e-mails sent by Kallithea'), 'app_email_from'),
+    (_('Sender for error e-mails'), 'error_email_from'),
+    (_('Recipients for admin and error e-mails'), 'email_to'),
 
     (_('SMTP server'), 'smtp_server'),
     (_('SMTP username'), 'smtp_username'),
     (_('SMTP port'), 'smtp_port'),
 
-    (_('SMTP use TLS'), 'smtp_use_tls'),
-    (_('SMTP use SSL'), 'smtp_use_ssl'),
-    (_('SMTP auth'), 'smtp_auth'),
+    (_('Use TLS encryption'), 'smtp_use_tls'),
+    (_('Use SSL encryption'), 'smtp_use_ssl'),
+    (_('SMTP authentication mechanisms'), 'smtp_auth'),
  ]
 %>
 
@@ -20,13 +20,14 @@
 
         <h4>${_('Settings (read-only)')}</h4>
         <div class="fields">
-          %for label, setting in elems:
+          %for help, setting in elems:
             <div class="field">
                 <div class="label">
-                    <label for="${setting}">${label}</label>
+                    <label for="${setting}">${setting}</label>
                 </div>
                 <div class="input">
                     ${h.text('setting', c.ini.get(setting), size=50, readonly='readonly')}
+                    <span class="help-block">${help}</span>
                 </div>
             </div>
           %endfor


More information about the kallithea-general mailing list