Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 a7796bec1be01b51f400e9a3a698535b12b636aa

 interface/web/admin/templates/server_config_ufw_edit.htm

@@ -27,37 +27,37 @@
                <label for="ufw_default_input_policy" class="col-sm-3 control-label">{tmpl_var name='ufw_default_input_policy_txt'}</label>
                <div class="col-sm-9"><select name="ufw_default_input_policy" id="ufw_default_input_policy" class="form-control">
                    {tmpl_var name='ufw_default_input_policy'}
                </select>
            </div></div>
                </select></div>
            </div>
            <div class="form-group">
                <label for="ufw_default_output_policy" class="col-sm-3 control-label">{tmpl_var name='ufw_default_output_policy_txt'}</label>
                <div class="col-sm-9"><select name="ufw_default_output_policy" id="ufw_default_output_policy" class="form-control">
                    {tmpl_var name='ufw_default_output_policy'}
                </select>
            </div></div>
                </select></div>
            </div>
            <div class="form-group">
                <label for="ufw_default_forward_policy" class="col-sm-3 control-label">{tmpl_var name='ufw_default_forward_policy_txt'}</label>
                <div class="col-sm-9"><select name="ufw_default_forward_policy" id="ufw_default_forward_policy" class="form-control">
                    {tmpl_var name='ufw_default_forward_policy'}
                </select>
            </div></div>
                </select></div>
            </div>
            <div class="form-group">
                <label for="ufw_default_application_policy" class="col-sm-3 control-label">{tmpl_var name='ufw_default_application_policy_txt'}</label>
                <div class="col-sm-9"><select name="ufw_default_application_policy" id="ufw_default_application_policy" class="form-control">
                    {tmpl_var name='ufw_default_application_policy'}
                </select>
            </div></div>
                </select></div>
            </div>
            <div class="form-group">
                <label for="ufw_log_level" class="col-sm-3 control-label">{tmpl_var name='ufw_log_level_txt'}</label>
                <div class="col-sm-9"><select name="ufw_log_level" id="ufw_log_level" class="form-control">
                    {tmpl_var name='ufw_log_level'}
                </select>
            </div></div>
                </select></div>
            </div>
        
            
        <input type="hidden" name="id" value="{tmpl_var name='id'}">
            
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/server_config_edit.php');">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/server_config_edit.php">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/server_config_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>