From 28b52633b3eb803e61b314373a307b04bbf91136 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 11 Aug 2014 04:14:26 -0400
Subject: [PATCH] Merge branch 'display_prefix_on_new' into 'master'

---
 interface/web/admin/templates/system_config_mail_edit.htm |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm
index e9c0c0e..b231495 100644
--- a/interface/web/admin/templates/system_config_mail_edit.htm
+++ b/interface/web/admin/templates/system_config_mail_edit.htm
@@ -73,17 +73,23 @@
             </div>
             <div class="ctrlHolder">
                 <label for="smtp_user">{tmpl_var name='smtp_user_txt'}</label>
-                <input name="smtp_user" id="smtp_user" value="{tmpl_var name='smtp_user'}" size="30" maxlength="255" type="text" class="textInput" />
+                <input name="smtp_user" id="smtp_user" value="{tmpl_var name='smtp_user'}" size="30" maxlength="255" type="text" autocomplete="off" class="textInput" />
             </div>
             <div class="ctrlHolder">
                 <label for="smtp_pass">{tmpl_var name='smtp_pass_txt'}</label>
-                <input name="smtp_pass" id="smtp_pass" value="" size="30" maxlength="255" type="password" class="textInput" />
+                <input name="smtp_pass" id="smtp_pass" value="" size="30" maxlength="255" type="password" autocomplete="off" class="textInput" />
             </div>
             <div class="ctrlHolder">
-                <p class="label">{tmpl_var name='smtp_crypt_txt'}</p>
-                <div class="multiField">
+                <label for="smtp_crypt">{tmpl_var name='smtp_crypt_txt'}</label>
+                <select name="smtp_crypt" id="smtp_crypt" class="selectInput formLengthHalf">
                     {tmpl_var name='smtp_crypt'}
-                </div>
+                </select>
+            </div>
+            <div class="ctrlHolder">
+                <label for="default_mailserver">{tmpl_var name='default_mailserver_txt'}</label>
+                <select name="default_mailserver" id="default_mailserver" class="selectInput">
+                    {tmpl_var name='default_mailserver'}
+                </select>
             </div>
         </fieldset>
             

--
Gitblit v1.9.1