Merged revisions from 3.0.5 stable branch: 3758-3768, 3769 shall not be mer...

tbrehm

2013-01-17 43b345cabb3e8743a91c39e8d6367c1aa594ebd2

 interface/web/sites/templates/web_domain_edit.htm

@@ -67,48 +67,48 @@
                <label for="traffic_quota">{tmpl_var name='traffic_quota_txt'}</label>
                <input name="traffic_quota" id="traffic_quota" value="{tmpl_var name='traffic_quota'}" size="7" maxlength="7" type="text" class="textInput formLengthLimit" />&nbsp;MB <tmpl_var name='traffic_quota_exceeded_txt'>
            </div>
            <div class="ctrlHolder">
            <tmpl_if name="limit_cgi" op="==" value="y"><div class="ctrlHolder">
                <p class="label">{tmpl_var name='cgi_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='cgi'}
                </div>
            </div>
            <div class="ctrlHolder">
            </div></tmpl_if>
            <tmpl_if name="limit_ssi" op="==" value="y"><div class="ctrlHolder">
                <p class="label">{tmpl_var name='ssi_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='ssi'}
                </div>
            </div>
            <div class="ctrlHolder apache">
            </div></tmpl_if>
            <tmpl_if name="limit_perl" op="==" value="y"><div class="ctrlHolder apache">
                <p class="label">{tmpl_var name='perl_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='perl'}
                </div>
            </div>
            <div class="ctrlHolder apache">
            </div></tmpl_if>
            <tmpl_if name="limit_ruby" op="==" value="y"><div class="ctrlHolder apache">
                <p class="label">{tmpl_var name='ruby_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='ruby'}
                </div>
            </div>
            <div class="ctrlHolder apache">
            </div></tmpl_if>
            <tmpl_if name="limit_python" op="==" value="y"><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">
            </div></tmpl_if>
            <tmpl_if name="force_suexec" op="==" value="n"><div class="ctrlHolder apache">
                <p class="label">{tmpl_var name='suexec_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='suexec'}
                </div>
            </div>
            <div class="ctrlHolder">
            </div></tmpl_if>
            <tmpl_if name="limit_hterror" op="==" value="y"><div class="ctrlHolder">
                <p class="label">{tmpl_var name='errordocs_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='errordocs'}
                </div>
            </div>
            </div></tmpl_if>

            <div class="ctrlHolder">
                <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
@@ -116,12 +116,12 @@
                    {tmpl_var name='subdomain'}
                </select>
            </div>
            <div class="ctrlHolder">
            <tmpl_if name="limit_ssl" op="==" value="y"><div class="ctrlHolder">
                <p class="label">{tmpl_var name='ssl_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='ssl'}
                </div>
            </div>
            </div></tmpl_if>
            <div class="ctrlHolder">
                <label for="php">{tmpl_var name='php_txt'}</label>
                <select name="php" id="php" class="selectInput formLengthHalf">
@@ -145,8 +145,8 @@
        <input type="hidden" name="id" value="{tmpl_var name='id'}">

        <div class="buttonHolder buttons">
            <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_domain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
            <button id="dom-edit-submit" class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}"><span>{tmpl_var name='btn_save_txt'}</span></button>
            <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
        </div>
    </div>

@@ -166,8 +166,8 @@
            reloadFastcgiPHPVersions();
        });
    }
    adjustForm();
    reloadFastcgiPHPVersions();
    adjustForm(true);
    reloadFastcgiPHPVersions(true);
      
    jQuery('#client_group_id').change(function(){
        clientGroupId = $(this).val();
@@ -179,6 +179,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,24 +190,31 @@
        }
    });
      
    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();
                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('.apache').show();
                jQuery('#php option[value="fast-cgi"]').show();
                jQuery('#php option[value="cgi"]').show();
                jQuery('#php option[value="mod"]').show();
                jQuery('#php option[value="suphp"]').show();
            }
            if(noFormChange) {
                resetFormChanged();
                jQuery('#php').addClass('no-page-form-change').change();
                jQuery('#php').removeClass('no-page-form-change');
            } else {
                jQuery('#php').change();
            }
        });
    }
@@ -215,7 +224,7 @@
        loadOptionInto('ipv6_address','sites/ajax_get_ip.php?ip_type=IPv6&server_id='+serverId+'&client_group_id='+clientGroupId);
    }
      
    function reloadFastcgiPHPVersions() {
    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"}, function(data) {
            var options = '<option value="">Default</option>';
            var phpfastcgiselected = '';
@@ -227,12 +236,20 @@
                }
                options += '<option value="'+key+'"'+phpfastcgiselected+'>'+val+'</option>';
            });
            $('#fastcgi_php_version').html(options);
            $('#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.panel_web_domain').find('fieldset').find('input,select,button').click(function(e) { e.preventDefault(); }).focus(function() { $(this).blur(); });
        jQuery('#dom-edit-submit').click(function() {
               submitForm('pageForm','sites/web_domain_edit.php');
        });
    <tmpl_else>
        jQuery('#dom-edit-submit').click(function() {
            submitForm('pageForm','sites/web_domain_edit.php');
        });
    </tmpl_if>
         
</script>