From 8164cdd8c7f87d977ec35738ca121c7fc6e1cb2e Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 09 Jul 2014 07:21:40 -0400
Subject: [PATCH] Merge branch 'hide_client' into 'master'

---
 interface/web/mail/templates/mail_domain_edit.htm |   28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 12ff756..658f0cf 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -20,12 +20,14 @@
                             </select>
                     </tmpl_if>
                 </div>
-                <div class="ctrlHolder">
-                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
-                    <select name="client_group_id" id="client_group_id" class="selectInput">
-                        {tmpl_var name='client_group_id'}
-                    </select>
-                </div>
+                <tmpl_unless name="domain_option">
+                    <div class="ctrlHolder">
+                        <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                        <select name="client_group_id" id="client_group_id" class="selectInput">
+                            {tmpl_var name='client_group_id'}
+                        </select>
+                    </div>
+                </tmpl_unless>
             <tmpl_else>
                 <tmpl_if name="only_one_server">
                     <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" />
@@ -48,12 +50,14 @@
             </tmpl_if>
 
             <tmpl_if name="is_reseller">
-                <div class="ctrlHolder">
-                    <label for="client_group_id">{tmpl_var name='client_txt'}</label>
-                    <select name="client_group_id" id="client_group_id" class="selectInput">
-                        {tmpl_var name='client_group_id'}
-                    </select>
-                </div>
+                <tmpl_unless name="domain_option">
+                    <div class="ctrlHolder">
+                        <label for="client_group_id">{tmpl_var name='client_txt'}</label>
+                        <select name="client_group_id" id="client_group_id" class="selectInput">
+                            {tmpl_var name='client_group_id'}
+                        </select>
+                    </div>
+                </tmpl_unless>
             </tmpl_if>
 
             <div class="ctrlHolder">

--
Gitblit v1.9.1