Till Brehm
2016-01-31 874c680208c4a4ea2c650c938318e7a661b679b9
Improved server config form.
2 files modified
112 ■■■■ changed files
interface/web/admin/lib/lang/en_server_config.lng 1 ●●●● patch | view | raw | blame | history
interface/web/admin/templates/server_config_web_edit.htm 111 ●●●● patch | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng
@@ -266,6 +266,7 @@
$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
$wb['enable_spdy_txt'] = 'Makes SPDY available';
$wb['web_settings_txt'] = 'Web Server';
// New for XMPP
$wb['xmpp_server_txt'] = 'XMPP Server';
interface/web/admin/templates/server_config_web_edit.htm
@@ -3,13 +3,25 @@
</div>
<p><tmpl_var name="list_desc_txt"></p>
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
  <div class="panel panel-default">
    <div class="panel-heading" role="tab" id="headingWeb">
      <h4 class="panel-title">
        <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseWeb" aria-expanded="true" aria-controls="collapseWeb">
          {tmpl_var name='web_settings_txt'}
        </a>
      </h4>
    </div>
    <div id="collapseWeb" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingWeb">
      <div class="panel-body">
      <!-- Begin content -->
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='server_type_txt'}</label>
                <div class="col-sm-9"><select name="server_type" id="server_type" class="form-control">
                <div class="col-sm-9">
                    <select name="server_type" id="server_type" class="form-control">
                        {tmpl_var name='server_type'}
                    </select></div>
                    </select>
                </div>
            </div>
            <div class="form-group">
                <label for="website_basedir" class="col-sm-3 control-label">{tmpl_var name='website_basedir_txt'}</label>
@@ -136,8 +148,21 @@
                    {tmpl_var name='overquota_notify_onok'}
                </div>
            </div>
            <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-ssl-settings" aria-expanded="false" aria-controls="toggle-ssl-settings">{tmpl_var name='ssl_settings_txt'}</button></div>
            <div id="toggle-ssl-settings" class="collapse">
      <!-- End content -->
      </div>
    </div>
  </div>
  <div class="panel panel-default">
    <div class="panel-heading" role="tab" id="headingSSL">
      <h4 class="panel-title">
        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseSSL" aria-expanded="false" aria-controls="collapseSSL">
          {tmpl_var name='ssl_settings_txt'}
        </a>
      </h4>
    </div>
    <div id="collapseSSL" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingSSL">
      <div class="panel-body">
      <!-- Begin content -->
                <div class="form-group">
                    <label class="col-sm-3 control-label">{tmpl_var name='enable_sni_txt'}</label>
                    <div class="col-sm-9">
@@ -158,9 +183,21 @@
                <div class="form-group">
                    <label for="CA_pass" class="col-sm-3 control-label">{tmpl_var name='CA_pass_txt'}</label>
                    <div class="col-sm-9"><input type="password" name="CA_pass" id="CA_pass" value="{tmpl_var name='CA_pass'}" autocomplete="off" class="form-control" /></div></div>
      <!-- End content -->
            </div>
            <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-permissions" aria-expanded="false" aria-controls="toggle-permissions">{tmpl_var name='permissions_txt'}</button></div>
            <div id="toggle-permissions" class="collapse">
    </div>
  </div>
  <div class="panel panel-default">
    <div class="panel-heading" role="tab" id="headingPerms">
      <h4 class="panel-title">
        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsePerms" aria-expanded="false" aria-controls="collapsePerms">
          {tmpl_var name='permissions_txt'}
        </a>
      </h4>
    </div>
    <div id="collapsePerms" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingPerms">
      <div class="panel-body">
      <!-- Begin content -->
                <div class="form-group">
                    <label class="col-sm-3 control-label">{tmpl_var name='set_folder_permissions_on_update_txt'}</label>
                    <div class="col-sm-9">
@@ -188,9 +225,22 @@
                <div class="form-group">
                    <label for="connect_userid_to_webid_start" class="col-sm-3 control-label">{tmpl_var name='connect_userid_to_webid_start_txt'}</label>
                    <div class="col-sm-9"><input type="text" name="connect_userid_to_webid_start" id="connect_userid_to_webid_start" value="{tmpl_var name='connect_userid_to_webid_start'}" class="form-control" /></div></div>
      <!-- End content -->
            </div>
            <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-php_settings" aria-expanded="false" aria-controls="toggle-php_settings">{tmpl_var name='php_settings_txt'}</button></div>
            <div id="toggle-php_settings" class="collapse">
    </div>
  </div>
  <div class="panel panel-default">
    <div class="panel-heading" role="tab" id="headingPHP">
      <h4 class="panel-title">
        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapsePHP" aria-expanded="false" aria-controls="collapsePHP">
          {tmpl_var name='php_settings_txt'}
        </a>
      </h4>
    </div>
    <div id="collapsePHP" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingPHP">
      <div class="panel-body">
      <!-- Begin content -->
                <div class="form-group apache">
                    <label for="php_ini_path_apache" class="col-sm-3 control-label">{tmpl_var name='php_ini_path_apache_txt'}</label>
                    <div class="col-sm-9"><input type="text" name="php_ini_path_apache" id="php_ini_path_apache" value="{tmpl_var name='php_ini_path_apache'}" class="form-control" /></div></div>
@@ -225,9 +275,21 @@
                            {tmpl_var name='php_handler'}
                        </select></div>
                </div>
      <!-- End content -->
            </div>
            <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-apps_vhost_settings" aria-expanded="false" aria-controls="toggle-apps_vhost_settings">{tmpl_var name='apps_vhost_settings_txt'}</button></div>
            <div id="toggle-apps_vhost_settings" class="collapse">
    </div>
  </div>
  <div class="panel panel-default">
    <div class="panel-heading" role="tab" id="headingApps">
      <h4 class="panel-title">
        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseApps" aria-expanded="false" aria-controls="collapseApps">
          {tmpl_var name='apps_vhost_settings_txt'}
        </a>
      </h4>
    </div>
    <div id="collapseApps" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingApps">
      <div class="panel-body">
      <!-- Begin content -->
                <div class="form-group">
                    <label for="apps_vhost_enabled" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_enabled_txt'}</label>
                    <div class="col-sm-9">{tmpl_var name='apps_vhost_enabled'}</div></div>
@@ -240,9 +302,22 @@
                <div class="form-group">
                    <label for="apps_vhost_servername" class="col-sm-3 control-label">{tmpl_var name='apps_vhost_servername_txt'}</label>
                    <div class="col-sm-9"><input type="text" name="apps_vhost_servername" id="apps_vhost_servername" value="{tmpl_var name='apps_vhost_servername'}" class="form-control" /></div></div>
      <!-- End content -->
            </div>
            <div class="col-sm-3"></div><div class="col-sm-9"><button class="btn btn-default formbutton-default" type="button" data-toggle="collapse" data-target="#toggle-awstats_settings" aria-expanded="false" aria-controls="toggle-awstats_settings">{tmpl_var name='awstats_settings_txt'}</button></div>
            <div id="toggle-awstats_settings" class="collapse">
    </div>
  </div>
  <div class="panel panel-default">
    <div class="panel-heading" role="tab" id="headingAWStats">
      <h4 class="panel-title">
        <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseAWStats" aria-expanded="false" aria-controls="collapseAWStats">
          {tmpl_var name='awstats_settings_txt'}
        </a>
      </h4>
    </div>
    <div id="collapseAWStats" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingAWStats">
      <div class="panel-body">
      <!-- Begin content -->
                <div class="form-group">
                    <label for="awstats_conf_dir" class="col-sm-3 control-label">{tmpl_var name='awstats_conf_dir_txt'}</label>
                    <div class="col-sm-9"><input type="text" name="awstats_conf_dir" id="awstats_conf_dir" value="{tmpl_var name='awstats_conf_dir'}" class="form-control" /></div></div>
@@ -255,8 +330,12 @@
                <div class="form-group">
                    <label for="awstats_buildstaticpages_pl" class="col-sm-3 control-label">{tmpl_var name='awstats_buildstaticpages_pl_txt'}</label>
                    <div class="col-sm-9"><input type="text" name="awstats_buildstaticpages_pl" id="awstats_buildstaticpages_pl" value="{tmpl_var name='awstats_buildstaticpages_pl'}" class="form-control" /></div></div>
            </div>
        
      <!-- End content -->
      </div>
    </div>
  </div>
</div>
            
        <input type="hidden" name="id" value="{tmpl_var name='id'}">
            
@@ -266,7 +345,7 @@
        </div></div>
<script language="JavaScript" type="text/javascript">
    var serverType = jQuery('#server_type').val();
    jQuery('#server_type').replaceWith('<label for="server_Type" class="col-sm-3 control-label">'+serverType+'</label><input type="hidden" name="server_type" value="'+serverType+'">');
    jQuery('#server_type').replaceWith('<p>'+serverType+'</p><input type="hidden" name="server_type" value="'+serverType+'">');
    adjustForm();
    jQuery('#server_type').change(function(){
        serverType = $(this).val();