From 2f74cf27ad6fbb852df78bcccca1fb645c8a57e0 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 02 Mar 2016 07:19:30 -0500
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/mail/templates/xmpp_domain_edit_modules.htm | 61 +++++++++++++++++-------------
1 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/interface/web/mail/templates/xmpp_domain_edit_modules.htm b/interface/web/mail/templates/xmpp_domain_edit_modules.htm
index f6d988f..8efcf50 100644
--- a/interface/web/mail/templates/xmpp_domain_edit_modules.htm
+++ b/interface/web/mail/templates/xmpp_domain_edit_modules.htm
@@ -4,43 +4,50 @@
<p><tmpl_var name="list_desc_txt"></p>
-
-<div class="form-group">
- <label class="col-sm-3 control-label">{tmpl_var name='use_anon_host_txt'}</label>
- <div class="col-sm-9">
- {tmpl_var name='use_anon_host'}
+<tmpl_if name="limit_xmpp_anon" value="y">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='use_anon_host_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='use_anon_host'}
+ </div>
</div>
-</div>
+</tmpl_if>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='use_pubsub_txt'}</label>
<div class="col-sm-9">
{tmpl_var name='use_pubsub'}
</div>
</div>
-<div class="form-group">
- <label class="col-sm-3 control-label">{tmpl_var name='use_vjud_txt'}</label>
- <div class="col-sm-9">
- {tmpl_var name='use_vjud'}
+<tmpl_if name="limit_xmpp_vjud" value="y">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='use_vjud_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='use_vjud'}
+ </div>
</div>
-</div>
-<div class="form-group">
- <label for="vjud_opt_mode" class="col-sm-3 control-label">{tmpl_var name='vjud_opt_mode_txt'}</label>
- <div class="col-sm-3"><select name="vjud_opt_mode" id="vjud_opt_mode" class="form-control">
- {tmpl_var name='vjud_opt_mode'}
- </select></div>
-</div>
-<div class="form-group">
- <label class="col-sm-3 control-label">{tmpl_var name='use_proxy_txt'}</label>
- <div class="col-sm-9">
- {tmpl_var name='use_proxy'}
+ <div class="form-group">
+ <label for="vjud_opt_mode" class="col-sm-3 control-label">{tmpl_var name='vjud_opt_mode_txt'}</label>
+ <div class="col-sm-3"><select name="vjud_opt_mode" id="vjud_opt_mode" class="form-control">
+ {tmpl_var name='vjud_opt_mode'}
+ </select></div>
</div>
-</div>
-<div class="form-group">
- <label class="col-sm-3 control-label">{tmpl_var name='use_status_host_txt'}</label>
- <div class="col-sm-9">
- {tmpl_var name='use_status_host'}
+</tmpl_if>
+<tmpl_if name="limit_xmpp_proxy" value="y">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='use_proxy_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='use_proxy'}
+ </div>
</div>
-</div>
+</tmpl_if>
+<tmpl_if name="limit_xmpp_status" value="y">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='use_status_host_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='use_status_host'}
+ </div>
+ </div>
+</tmpl_if>
--
Gitblit v1.9.1