From fac03aa97013f819bbc6c201d107ebfc4fab4e18 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Wed, 04 Jun 2014 12:47:35 -0400
Subject: [PATCH] Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
---
interface/web/admin/templates/system_config_mail_edit.htm | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm
index 2f8b697..98966fd 100644
--- a/interface/web/admin/templates/system_config_mail_edit.htm
+++ b/interface/web/admin/templates/system_config_mail_edit.htm
@@ -12,6 +12,24 @@
</div>
</div>
<div class="ctrlHolder">
+ <p class="label">{tmpl_var name='mailbox_show_autoresponder_tab_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='mailbox_show_autoresponder_tab'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='mailbox_show_mail_filter_tab_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='mailbox_show_mail_filter_tab'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='mailbox_show_custom_rules_tab_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='mailbox_show_custom_rules_tab'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
<p class="label">{tmpl_var name='mailboxlist_webmail_link_txt'}</p>
<div class="multiField">
{tmpl_var name='mailboxlist_webmail_link'}
@@ -55,11 +73,11 @@
</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">
<label for="smtp_crypt">{tmpl_var name='smtp_crypt_txt'}</label>
@@ -77,4 +95,4 @@
</div>
</div>
-</div>
\ No newline at end of file
+</div>
--
Gitblit v1.9.1