Merge branch 'master' of git.ispconfig.org:renky/ispconfig3

Dominik

2015-01-21 83aa23b76fbdca327c52bd14fc1a1bc62aa5b3ee

 interface/web/sites/templates/web_vhost_domain_edit.htm

@@ -261,7 +261,7 @@
    } else {
        jQuery('.fastcgi_php_version:visible').hide();
    }
    //resetFormChanged();
    //ISPConfig.resetFormChanged();
    
    jQuery('#php').change(function(){
        reloadFastcgiPHPVersions();
@@ -304,7 +304,7 @@
                jQuery('#php option[value="suphp"]').show();
            }
            if(noFormChange) {
                resetFormChanged();
                ISPConfig.resetFormChanged();
                jQuery('#php').addClass('no-page-form-change').change();
                jQuery('#php').removeClass('no-page-form-change');
            } else {
@@ -331,8 +331,8 @@
   }
      
    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);
        ISPConfig.loadOptionInto('ip_address','sites/ajax_get_ip.php?ip_type=IPv4&server_id='+serverId+'&client_group_id='+clientGroupId);
        ISPConfig.loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId);
    }
      
    function reloadFastcgiPHPVersions(noFormChange) {
@@ -348,18 +348,18 @@
                options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
            });
            $('#fastcgi_php_version').html(options).change();
            if(noFormChange) resetFormChanged();
            if(noFormChange) ISPConfig.resetFormChanged();
        });
    }
    
    <tmpl_if name="readonly_tab">
        jQuery('div.panel_web_domain').find('fieldset').find('input,select,button').not('#directive_snippets_id').bind('click mousedown', function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); });
        jQuery('#dom-edit-submit').click(function() {
         submitForm('pageForm','sites/web_vhost_domain_edit.php');
         ISPConfig.submitForm('pageForm','sites/web_vhost_domain_edit.php');
        });
    <tmpl_else>
        jQuery('#dom-edit-submit').click(function() {
            submitForm('pageForm','sites/web_vhost_domain_edit.php');
            ISPConfig.submitForm('pageForm','sites/web_vhost_domain_edit.php');
        });
    </tmpl_if>