From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import

---
 interface/web/sites/templates/web_domain_edit.htm |   43 ++++++++++++++++++++++++++++++-------------
 1 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/interface/web/sites/templates/web_domain_edit.htm b/interface/web/sites/templates/web_domain_edit.htm
index fe8e316..d12c3a3 100644
--- a/interface/web/sites/templates/web_domain_edit.htm
+++ b/interface/web/sites/templates/web_domain_edit.htm
@@ -1,6 +1,15 @@
 <h2><tmpl_var name="list_head_txt"></h2>
 <p><tmpl_var name="list_desc_txt"></p>
 
+<tmpl_if name="config_error_msg">
+<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
+                <p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
+				<div>
+				<div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} :&nbsp;</div><div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
+				</div>
+</div>
+</tmpl_if>
+
 <div class="panel panel_web_domain">
 
     <div class="pnl_formsarea">
@@ -45,7 +54,7 @@
             </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">
+                <select name="ipv6_address" id="ipv6_address" class="selectInput formLengthIPv6">
                     {tmpl_var name='ipv6_address'}
                 </select>
             </div>
@@ -166,12 +175,13 @@
             reloadFastcgiPHPVersions();
         });
     }
-    adjustForm();
-    reloadFastcgiPHPVersions();
+    adjustForm(true);
+    reloadFastcgiPHPVersions(true);
 		
     jQuery('#client_group_id').change(function(){
         clientGroupId = $(this).val();
         reloadWebIP();
+		reloadFastcgiPHPVersions();
     });
 		
     if(jQuery('#php').val() == 'fast-cgi' || jQuery('#php').val() == 'php-fpm'){
@@ -179,6 +189,8 @@
     } else {
         jQuery('.fastcgi_php_version:visible').hide();
     }
+    //resetFormChanged();
+    
     jQuery('#php').change(function(){
         reloadFastcgiPHPVersions();
         if(jQuery(this).val() == 'fast-cgi' || jQuery(this).val() == 'php-fpm'){
@@ -188,16 +200,18 @@
         }
     });
 		
-    function adjustForm(){
+    function adjustForm(noFormChange){
         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();
                 jQuery('.apache').hide();
+                if(selected != "no" && selected != "php-fpm") {
+                    jQuery('#php option[value="php-fpm"]').attr('selected', 'selected').val('php-fpm');
+                }
                 jQuery('#php option[value="fast-cgi"]').hide();
                 jQuery('#php option[value="cgi"]').hide();
                 jQuery('#php option[value="mod"]').hide();
                 jQuery('#php option[value="suphp"]').hide();
-                if(selected != "no" && selected != "php-fpm") jQuery('#php option[value="php-fpm"]').attr('selected', 'selected');
             } else {
                 jQuery('.apache').show();
                 jQuery('#php option[value="fast-cgi"]').show();
@@ -205,7 +219,13 @@
                 jQuery('#php option[value="mod"]').show();
                 jQuery('#php option[value="suphp"]').show();
             }
-            jQuery('#php').change();
+            if(noFormChange) {
+                resetFormChanged();
+                jQuery('#php').addClass('no-page-form-change').change();
+                jQuery('#php').removeClass('no-page-form-change');
+            } else {
+                jQuery('#php').change();
+            }
         });
     }
 		
@@ -214,8 +234,8 @@
         loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId);
     }
 		
-    function reloadFastcgiPHPVersions() {
-        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi"}, function(data) {
+    function reloadFastcgiPHPVersions(noFormChange) {
+        jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, php_type : jQuery('#php').val(), type : "getphpfastcgi", client_group_id : clientGroupId}, function(data) {
             var options = '<option value="">Default</option>';
             var phpfastcgiselected = '';
             $.each(data, function(key, val) {
@@ -227,16 +247,13 @@
                 options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
             });
             $('#fastcgi_php_version').html(options).change();
+            if(noFormChange) resetFormChanged();
         });
     }
     
     <tmpl_if name="readonly_tab">
-        jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').attr('disabled', 'disabled');
-        jQuery('div.tabbox_tabs').find('a').click(function() {
-               jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').removeAttr('disabled');
-        });
+        jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').bind('click mousedown', function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); });
         jQuery('#dom-edit-submit').click(function() {
-               jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').removeAttr('disabled');
                submitForm('pageForm','sites/web_domain_edit.php');
         });
     <tmpl_else>

--
Gitblit v1.9.1