From b98be2e5bcd1abfb98a544fdad66696007925b38 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Sat, 11 Oct 2014 03:29:49 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/mail/templates/mail_user_mailbox_edit.htm | 4 ++++
1 files changed, 4 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 0c564c3..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'}
--
Gitblit v1.9.1