From e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 27 Jan 2014 10:33:40 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/admin/templates/server_config_mail_edit.htm | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/interface/web/admin/templates/server_config_mail_edit.htm b/interface/web/admin/templates/server_config_mail_edit.htm
index fb399e1..aba9527 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -20,6 +20,10 @@
<input name="homedir_path" id="homedir_path" value="{tmpl_var name='homedir_path'}" size="40" maxlength="255" type="text" class="textInput" />
</div>
<div class="ctrlHolder">
+ <label for="dkim_path">{tmpl_var name='dkim_path_txt'}</label>
+ <input name="dkim_path" id="dkim_path" value="{tmpl_var name='dkim_path'}" size="40" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
<p class="label">{tmpl_var name='pop3_imap_daemon_txt'}</p>
<div class="multiField">
<select name="pop3_imap_daemon" id="pop3_imap_daemon" class="selectInput">
@@ -50,6 +54,12 @@
<div class="ctrlHolder">
<label for="mailuser_group">{tmpl_var name='mailuser_group_txt'}</label>
<input name="mailuser_group" id="mailuser_group" value="{tmpl_var name='mailuser_group'}" size="10" maxlength="255" type="text" class="textInput formLengthHalf" />
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='mailbox_virtual_uidgid_maps_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='mailbox_virtual_uidgid_maps'}
+ </div>
</div>
<div class="ctrlHolder">
<label for="relayhost">{tmpl_var name='relayhost_txt'}</label>
@@ -113,4 +123,4 @@
</div>
</div>
-</div>
\ No newline at end of file
+</div>
--
Gitblit v1.9.1