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_list.htm | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/interface/web/admin/templates/iptables_list.htm b/interface/web/admin/templates/iptables_list.htm
index da46eee..e1fcb3d 100644
--- a/interface/web/admin/templates/iptables_list.htm
+++ b/interface/web/admin/templates/iptables_list.htm
@@ -3,47 +3,45 @@
</div>
- <p>Tools</p>
+ <p class="fieldset-legend">Tools</p>
- <button class="button iconstxt icoAdd" type="button" data-load-content="admin/iptables_edit.php">
- <span>{tmpl_var name="add_new_rule_txt"}</span>
- </button>
+ <button class="btn btn-default formbutton-success" type="button" data-load-content="admin/iptables_edit.php">{tmpl_var name="add_new_rule_txt"}</button>
- <p><tmpl_var name="list_head_txt"></p>
+ <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p>
<div class="table-wrapper marginTop15">
<table class="table">
- <thead class="dark">
+ <thead class="dark form-group-sm">
<tr>
- <th><tmpl_var name="active_txt"></th>
- <th><tmpl_var name="server_id_txt"></th>
- <th><tmpl_var name="table_txt"></th>
- <th><tmpl_var name="protocol_txt"></th>
- <th><tmpl_var name="singleport_txt"></th>
- <th><tmpl_var name="multiport_txt"></th>
- <th><tmpl_var name="state_txt"></th>
- <th><tmpl_var name="target_txt"></th>
- <th> </th>
+ <th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th>
+ <th data-column="server_id"><tmpl_var name="server_id_txt"></th>
+ <th data-column="table"><tmpl_var name="table_txt"></th>
+ <th data-column="protocol"><tmpl_var name="protocol_txt"></th>
+ <th data-column="singleport"><tmpl_var name="singleport_txt"></th>
+ <th data-column="multiport"><tmpl_var name="multiport_txt"></th>
+ <th data-column="state"><tmpl_var name="state_txt"></th>
+ <th data-column="target"><tmpl_var name="target_txt"></th>
+ <th class="text-right"> </th>
</tr>
<tr>
- <td><select name="search_active">{tmpl_var name='search_active'}</select></td>
- <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
<td></td>
- <td><select name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
+ <td><select class="form-control" name="search_protocol">{tmpl_var name='search_protocol'}</select></td>
<td></td>
<td></td>
<td></td>
- <td><select name="search_target">{tmpl_var name='search_target'}</select></td>
- <td>
- <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','admin/iptables_list.php');">{tmpl_var name="filter_txt"}filter_txt</button>
+ <td><select class="form-control" name="search_target">{tmpl_var name='search_target'}</select></td>
+ <td class="text-right">
+ <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="admin/iptables_list.php"><span class="icon icon-filter"></span></button>
</td>
</tr>
</thead>
<tbody>
<tmpl_loop name="records">
- <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+ <tr>
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td>
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="table"}</a></td>
@@ -52,8 +50,8 @@
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="multiport"}</a></td>
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="state"}</a></td>
<td><a href="#" data-load-content="admin/iptables_edit.php?id={tmpl_var name='id'}">{tmpl_var name="target"}</a></td>
- <td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/iptables_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <td class="text-right">
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/iptables_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
</td>
</tr>
</tmpl_loop>
--
Gitblit v1.9.1