From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/admin/templates/iptables_edit.htm | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/interface/web/admin/templates/iptables_edit.htm b/interface/web/admin/templates/iptables_edit.htm
index d5ba0ef..e2fff03 100644
--- a/interface/web/admin/templates/iptables_edit.htm
+++ b/interface/web/admin/templates/iptables_edit.htm
@@ -8,46 +8,41 @@
<label for="server_id" class="col-sm-3 control-label">{tmpl_var name='server_id_txt'}</label>
<div class="col-sm-9"><select name="server_id" id="server_id" class="form-control">
{tmpl_var name='server_id'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<div class="form-group">
<label for="table" class="col-sm-3 control-label">{tmpl_var name='table_txt'}</label>
<div class="col-sm-9"><select name="table" id="table" class="form-control">
{tmpl_var name='table'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<div class="form-group">
<label for="protocol" class="col-sm-3 control-label">{tmpl_var name='protocol_txt'}</label>
<div class="col-sm-9"><select name="protocol" id="protocol" class="form-control">
{tmpl_var name='protocol'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<div class="form-group">
<label for="singleport" class="col-sm-3 control-label">{tmpl_var name='singleport_txt'}</label>
- <div class="col-sm-9"><input type="text" name="singleport" id="singleport" value="{tmpl_var name='singleport'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="singleport" id="singleport" value="{tmpl_var name='singleport'}" class="form-control" /></div></div>
<div class="form-group">
<label for="multiport" class="col-sm-3 control-label">{tmpl_var name='multiport_txt'}</label>
- <div class="col-sm-9"><input type="text" name="multiport" id="multiport" value="{tmpl_var name='multiport'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="multiport" id="multiport" value="{tmpl_var name='multiport'}" class="form-control" /></div></div>
<div class="form-group">
<label for="destination_ip" class="col-sm-3 control-label">{tmpl_var name='destination_ip_txt'}</label>
- <div class="col-sm-9"><input type="text" name="destination_ip" id="destination_ip" value="{tmpl_var name='destination_ip'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="destination_ip" id="destination_ip" value="{tmpl_var name='destination_ip'}" class="form-control" /></div></div>
<div class="form-group">
<label for="source_ip" class="col-sm-3 control-label">{tmpl_var name='source_ip_txt'}</label>
- <div class="col-sm-9"><input type="text" name="source_ip" id="source_ip" value="{tmpl_var name='source_ip'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="source_ip" id="source_ip" value="{tmpl_var name='source_ip'}" class="form-control" /></div></div>
<div class="form-group">
<label for="state" class="col-sm-3 control-label">{tmpl_var name='state_txt'}</label>
- <div class="col-sm-9"><input type="text" name="state" id="state" value="{tmpl_var name='state'}" class="form-control" />
- </div></div>
+ <div class="col-sm-9"><input type="text" name="state" id="state" value="{tmpl_var name='state'}" class="form-control" /></div></div>
<div class="form-group">
<label for="target" class="col-sm-3 control-label">{tmpl_var name='target_txt'}</label>
<div class="col-sm-9"><select name="target" id="target" class="form-control">
{tmpl_var name='target'}
- </select>
- </div></div>
+ </select></div>
+ </div>
<div class="form-group">
<label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
<div class="col-sm-9">
@@ -57,7 +52,6 @@
<input type="hidden" name="id" value="{tmpl_var name='id'}">
<div class="clear"><div class="right">
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/iptables_edit.php');">{tmpl_var name='btn_save_txt'}</button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/iptables_list.php">
- <span>{tmpl_var name='btn_cancel_txt'}</span></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/iptables_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/iptables_list.php">{tmpl_var name='btn_cancel_txt'}</button>
</div></div>
\ No newline at end of file
--
Gitblit v1.9.1