From 2d7d9eaa5acda62f1580bc09304ce85a7f7cea9f Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.net>
Date: Thu, 23 Jan 2014 13:40:54 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc3master/master' into vhostalias
---
interface/web/client/templates/client_edit_limits.htm | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm
index 05ceb63..c97e03f 100644
--- a/interface/web/client/templates/client_edit_limits.htm
+++ b/interface/web/client/templates/client_edit_limits.htm
@@ -3,7 +3,6 @@
<div class="panel panel_client">
- <tmpl_if name="is_admin">
<div class="pnl_toolsarea">
<fieldset><legend>{tmpl_var name="toolsarea_head_txt"}</legend>
<div class="buttons topbuttons">
@@ -11,11 +10,9 @@
</div>
</fieldset>
</div>
- </tmpl_if>
<div class="pnl_formsarea">
<fieldset class="inlineLabels"><legend>Limits</legend>
- <tmpl_if name="is_admin">
<div class="ctrlHolder">
<label for="template_master">{tmpl_var name='template_master_txt'}</label>
<select name="template_master" id="template_master" class="selectInput">
@@ -40,7 +37,14 @@
<div class="ctrlHolder">
</div>
- </tmpl_if>
+ <tmpl_if name="is_admin">
+ <div class="ctrlHolder">
+ <label for="parent_client_id_id">{tmpl_var name='parent_client_id_txt'}</label>
+ <select name="parent_client_id" id="parent_client_id" class="selectInput">
+ {tmpl_var name='parent_client_id'}
+ </select>
+ </div>
+ </tmpl_if>
<div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
<div>
<div class="ctrlHolder">
@@ -301,7 +305,7 @@
</div>
</div>
-<tmpl_if name="is_admin">
+
<script type="text/javascript">
<!--
function custom_template_selected() {
@@ -317,7 +321,7 @@
.find('div.pnl_formsarea')
.find('fieldset')
.find('input,select,button')
- .not('#template_master,#template_additional,#default_mailserver,#default_webserver,#default_dbserver,#default_dnsserver,#default_slave_dnsserver')
+ .not('#template_master,#template_additional,#default_mailserver,#default_webserver,#default_dbserver,#default_dnsserver,#default_slave_dnsserver,#customer_no_template,#customer_no_start,#customer_no_counter,#parent_client_id')
.click(function(e) {
if(custom_template_selected()) return true;
e.preventDefault();
@@ -330,4 +334,3 @@
//-->
</script>
-</tmpl_if>
\ No newline at end of file
--
Gitblit v1.9.1