From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Mon, 11 Jun 2012 05:00:57 -0400 Subject: [PATCH] Updated version number to 3.0.4.6 --- interface/web/sites/templates/web_domain_edit.htm | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm index 9e2a6b5..178c639 100644 --- a/interface/web/sites/templates/web_domain_edit.htm +++ b/interface/web/sites/templates/web_domain_edit.htm @@ -15,7 +15,7 @@ <input type="hidden" name="server_id" value="{tmpl_var name='server_id_value'}" /> <tmpl_else> <label for="server_id">{tmpl_var name='server_id_txt'}</label> - <select name="server_id" id="server_id" class="selectInput" onChange="loadOptionInto('ip_address','sites/ajax_get_ip.php?server_id='+document.getElementById('server_id').value)"> + <select name="server_id" id="server_id" class="selectInput"> {tmpl_var name='server_id'} </select> </tmpl_if> @@ -26,6 +26,8 @@ {tmpl_var name='client_group_id'} </select> </div> + <tmpl_else> + <input type="hidden" id="server_id" name="server_id" value="{tmpl_var name='server_id_value'}" /> </tmpl_if> <tmpl_if name="is_reseller"> <div class="ctrlHolder"> @@ -39,6 +41,12 @@ <label for="ip_address">{tmpl_var name='ip_address_txt'}</label> <select name="ip_address" id="ip_address" class="selectInput formLengthIPv4"> {tmpl_var name='ip_address'} + </select> + </div> + <div class="ctrlHolder"> + <label for="ipv6_address">{tmpl_var name='ipv6_address_txt'}</label> + <select name="ipv6_address" id="ipv6_address" class="selectInput formLengthIPv4"> + {tmpl_var name='ipv6_address'} </select> </div> <div class="ctrlHolder"> @@ -75,6 +83,12 @@ <p class="label">{tmpl_var name='ruby_txt'}</p> <div class="multiField"> {tmpl_var name='ruby'} + </div> + </div> + <div class="ctrlHolder apache"> + <p class="label">{tmpl_var name='python_txt'}</p> + <div class="multiField"> + {tmpl_var name='python'} </div> </div> <div class="ctrlHolder apache"> @@ -127,6 +141,7 @@ </div> <script language="JavaScript" type="text/javascript"> var serverId; + var clientGroupId = jQuery('#client_group_id').val(); var serverIdDisabled = jQuery('#server_id_disabled').val(); if(serverIdDisabled > 0){ serverId = serverIdDisabled; @@ -134,12 +149,18 @@ serverId = jQuery('#server_id').val(); jQuery('#server_id').change(function(){ serverId = $(this).val(); - adjustForm(serverId); + adjustForm(); + reloadWebIP(); }); } - adjustForm(serverId); + adjustForm(); - function adjustForm(serverId){ + jQuery('#client_group_id').change(function(){ + clientGroupId = $(this).val(); + reloadWebIP(); + }); + + function adjustForm(){ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) { if(data.servertype == "nginx"){ var selected = jQuery('#php').val(); @@ -158,5 +179,10 @@ } }); } + + function reloadWebIP() { + loadOptionInto('ip_address','sites/ajax_get_ip.php?ip_type=IPv4&server_id='+serverId+'&client_group_id='+clientGroupId); + loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId); + } </script> -- Gitblit v1.9.1