Merge branch 'stable-3.1'

Marius Burkard

2016-07-01 49441bdd0f3ff75d5092d5b832b97ea722a66363

 interface/web/sites/templates/web_vhost_domain_edit.htm

@@ -74,7 +74,7 @@
                    {tmpl_var name='ip_address'}
                </select></div>
            </div>
            <div class="form-group" style="display:none">
            <div class="form-group">
                <label for="ipv6_address" class="col-sm-3 control-label">{tmpl_var name='ipv6_address_txt'}</label>
                <div class="col-sm-9"><select name="ipv6_address" id="ipv6_address" class="form-control">
                    {tmpl_var name='ipv6_address'}
@@ -126,7 +126,7 @@
            </tmpl_if>
            <div class="form-group">
                <label for="web_folder" class="col-sm-3 control-label">{tmpl_var name='web_folder_txt'}</label>
                <div class="col-sm-6"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'></div><div class="col-sm-3 input-sm"> readonly="readonly"</div></tmpl_if> />
                <div class="col-sm-9"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'>readonly="readonly"</tmpl_if> /></div>
            </div>
      </tmpl_if>
      <tmpl_if name="vhostdomain_type" value="aliasdomain">
@@ -148,7 +148,7 @@
            </div>
            <div class="form-group">
                <label for="web_folder" class="col-sm-3 control-label">{tmpl_var name='web_folder_txt'}</label>
                <div class="col-sm-6"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'></div><div class="col-sm-3 input-sm"> readonly="readonly"</div></tmpl_if> />
                <div class="col-sm-9"><input type="text" name="web_folder" id="web_folder" value="{tmpl_var name='web_folder'}" class="form-control"<tmpl_if name='fixed_folder' op='==' value='y'> readonly="readonly"</tmpl_if> /></div>
            </div>
      </tmpl_if>
            <div class="form-group">
@@ -206,16 +206,18 @@
            </div>
            <tmpl_if name="limit_ssl" op="==" value="y"><div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='ssl_txt'}</label>
                <div class="col-sm-9">
                <div class="col-sm-9" data-uncheck-fields="ssl_letsencrypt">
                    {tmpl_var name='ssl'}
                </div>
            </div>
            <tmpl_if name="limit_ssl_letsencrypt" op="==" value="y">
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='ssl_letsencrypt_txt'}</label>
                <div class="col-sm-9">
                <div class="col-sm-9" data-check-fields="ssl">
                    {tmpl_var name='ssl_letsencrypt'}
                </div>
            </div></tmpl_if>
            </tmpl_if>
            <div class="form-group">
                <label for="php" class="col-sm-3 control-label">{tmpl_var name='php_txt'}</label>
                <div class="col-sm-9"><select name="php" id="php" class="form-control">
@@ -229,12 +231,12 @@
                    {tmpl_var name='fastcgi_php_version'}
                </select></div>
            </div>
         <div class="form-group">
            <tmpl_if name="limit_directive_snippets" op="==" value="y"><div class="form-group">
            <label for="directive_snippets_id" class="col-sm-3 control-label">{tmpl_var name='directive_snippets_id_txt'}</label>
            <div class="col-sm-9"><select name="directive_snippets_id" id="directive_snippets_id" class="form-control">
               {tmpl_var name='directive_snippets_id'}
            </select></div>
         </div>
         </div></tmpl_if>
         {tmpl_hook name="field_enable_pagespeed"}
         <div class="form-group nginx pagespeed">
            <label class="col-sm-3 control-label">{tmpl_var name='enable_pagespeed_txt'}</label>
@@ -430,8 +432,8 @@
      
    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 options = '';
            var options = '<option value="">Default</option>';
         //var options = '';
            var phpfastcgiselected = '';
            $.each(data, function(key, val) {
            <tmpl_if name="id">