From 2d5fcd53c19a65b9c968a1db2e9af643537379c3 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 24 Oct 2014 09:29:47 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/admin/templates/server_config_mail_edit.htm | 10 +++++++++-
1 files changed, 9 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 2bf8f93..54d6014 100644
--- a/interface/web/admin/templates/server_config_mail_edit.htm
+++ b/interface/web/admin/templates/server_config_mail_edit.htm
@@ -24,6 +24,14 @@
<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='dkim_strength_txt'}</p>
+ <div class="multiField">
+ <select name="dkim_strength" id="dkim_strength" class="selectInput">
+ {tmpl_var name='dkim_strength'}
+ </select>
+ </div>
+ </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">
@@ -58,7 +66,7 @@
<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'}
+ {tmpl_var name='mailbox_virtual_uidgid_maps'} {tmpl_var name='mailbox_virtual_uidgid_maps_info_txt'}
</div>
</div>
<div class="ctrlHolder">
--
Gitblit v1.9.1