From 3b0546fc2539df441819dbf05d679d349c62267a Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 08 Jan 2015 09:35:43 -0500
Subject: [PATCH] Merge branch 'pixcept/ispconfig3-mods-new-layout-3.1'
---
interface/web/admin/templates/server_config_ufw_edit.htm | 79 +++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 41 deletions(-)
diff --git a/interface/web/admin/templates/server_config_ufw_edit.htm b/interface/web/admin/templates/server_config_ufw_edit.htm
index 12a94ae..941f359 100644
--- a/interface/web/admin/templates/server_config_ufw_edit.htm
+++ b/interface/web/admin/templates/server_config_ufw_edit.htm
@@ -1,66 +1,63 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_server_config">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>UFW Firewall</legend>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='ufw_enable_txt'}</p>
- <div class="multiField">
+ <legend>UFW Firewall</legend>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ufw_enable_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='ufw_enable'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='ufw_manage_builtins_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ufw_manage_builtins_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='ufw_manage_builtins'}
</div>
</div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='ufw_ipv6_txt'}</p>
- <div class="multiField">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='ufw_ipv6_txt'}</label>
+ <div class="col-sm-9">
{tmpl_var name='ufw_ipv6'}
</div>
</div>
- <div class="ctrlHolder">
- <label for="ufw_default_input_policy">{tmpl_var name='ufw_default_input_policy_txt'}</label>
- <select name="ufw_default_input_policy" id="ufw_default_input_policy" class="selectInput">
+ <div class="form-group">
+ <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>
+ </select></div>
</div>
- <div class="ctrlHolder">
- <label for="ufw_default_output_policy">{tmpl_var name='ufw_default_output_policy_txt'}</label>
- <select name="ufw_default_output_policy" id="ufw_default_output_policy" class="selectInput">
+ <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>
+ </select></div>
</div>
- <div class="ctrlHolder">
- <label for="ufw_default_forward_policy">{tmpl_var name='ufw_default_forward_policy_txt'}</label>
- <select name="ufw_default_forward_policy" id="ufw_default_forward_policy" class="selectInput">
+ <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>
+ </select></div>
</div>
- <div class="ctrlHolder">
- <label for="ufw_default_application_policy">{tmpl_var name='ufw_default_application_policy_txt'}</label>
- <select name="ufw_default_application_policy" id="ufw_default_application_policy" class="selectInput">
+ <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>
+ </select></div>
</div>
- <div class="ctrlHolder">
- <label for="ufw_log_level">{tmpl_var name='ufw_log_level_txt'}</label>
- <select name="ufw_log_level" id="ufw_log_level" class="selectInput">
+ <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>
+ </select></div>
</div>
- </fieldset>
+
<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','admin/server_config_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('admin/server_config_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
\ No newline at end of file
+ <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-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>
\ No newline at end of file
--
Gitblit v1.9.1