From 39fab06dfae1e0218a1bb3aa48a381586dfaea6d Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Sat, 13 Dec 2014 16:18:41 -0500
Subject: [PATCH] Merge branch 'develop' into 'master'
---
interface/web/mail/templates/mail_user_mailbox_edit.htm | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/interface/web/mail/templates/mail_user_mailbox_edit.htm b/interface/web/mail/templates/mail_user_mailbox_edit.htm
index f946502..186b03d 100644
--- a/interface/web/mail/templates/mail_user_mailbox_edit.htm
+++ b/interface/web/mail/templates/mail_user_mailbox_edit.htm
@@ -45,6 +45,10 @@
<input name="cc" id="cc" value="{tmpl_var name='cc'}" size="30" maxlength="255" type="text" class="textInput" /> {tmpl_var name='name_optional_txt'} {tmpl_var name='cc_note_txt'}
</div>
<div class="ctrlHolder">
+ <label for="sender_name">{tmpl_var name='sender_cc_txt'}</label>
+ <input name="sender_cc" id="sender_cc" value="{tmpl_var name='sender_cc'}" size="30" maxlength="255" type="text" class="textInput" /> {tmpl_var name='name_optional_txt'} {tmpl_var name='sender_cc_note_txt'}
+ </div>
+ <div class="ctrlHolder">
<label for="policy">{tmpl_var name='policy_txt'}</label>
<select name="policy" id="policy" class="selectInput">
{tmpl_var name='policy'}
@@ -57,6 +61,12 @@
</div>
</div>
<div class="ctrlHolder">
+ <p class="label">{tmpl_var name='disablesmtp_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='disablesmtp'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
<p class="label">{tmpl_var name='disableimap_txt'}</p>
<div class="multiField">
{tmpl_var name='disableimap'}
--
Gitblit v1.9.1