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/server_ip_list.htm | 54 +++++++++++++++++++++++++-----------------------------
1 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm
index f406ce9..892c263 100644
--- a/interface/web/admin/templates/server_ip_list.htm
+++ b/interface/web/admin/templates/server_ip_list.htm
@@ -3,51 +3,49 @@
</div>
- <p>{tmpl_var name="toolsarea_head_txt"}</p>
+ <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p>
- <button class="button iconstxt icoAdd" type="button" data-load-content="admin/server_ip_edit.php">
- <span>{tmpl_var name="add_new_record_txt"}</span>
- </button>
+ <button class="btn btn-default formbutton-success" type="button" data-load-content="admin/server_ip_edit.php">{tmpl_var name="add_new_record_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="server_id_txt"></th>
- <th><tmpl_var name="client_id_txt"></th>
- <th><tmpl_var name="ip_type_txt"></th>
- <th><tmpl_var name="ip_address_txt"></th>
- <th><tmpl_var name="virtualhost_txt"></th>
- <th><tmpl_var name="virtualhost_port_txt"></th>
- <th>{tmpl_var name='search_limit'}</th>
+ <th data-column="server_id"><tmpl_var name="server_id_txt"></th>
+ <th class="small-col" data-column="client_id"><tmpl_var name="client_id_txt"></th>
+ <th data-column="ip_type"><tmpl_var name="ip_type_txt"></th>
+ <th data-column="ip_address"><tmpl_var name="ip_address_txt"></th>
+ <th data-column="virtualhost"><tmpl_var name="virtualhost_txt"></th>
+ <th data-column="virtualhost_port"><tmpl_var name="virtualhost_port_txt"></th>
+ <th class="text-right">{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
- <td><select name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
- <td><select name="search_ip_type">{tmpl_var name='search_ip_type'}</select></td>
- <td><input type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
- <td><select name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
- <td><input type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></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/server_ip_list.php');">{tmpl_var name="filter_txt"}</button>
+ <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+ <td><select class="form-control" name="search_client_id">{tmpl_var name='search_client_id'}</select></td>
+ <td><select class="form-control" name="search_ip_type">{tmpl_var name='search_ip_type'}</select></td>
+ <td><input class="form-control" type="text" name="search_ip_address" value="{tmpl_var name='search_ip_address'}" /></td>
+ <td><select class="form-control" name="search_virtualhost">{tmpl_var name='search_virtualhost'}</select></td>
+ <td><input class="form-control" type="text" name="search_virtualhost_port" value="{tmpl_var name='search_virtualhost_port'}" /></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/server_ip_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>">
- <td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
- <td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="client_id"}</a></td>
+ <tr>
+ <td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='server_id'}">{tmpl_var name="server_id"}</a></td>
+ <td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='client_id'}">{tmpl_var name="client_id"}</a></td>
<td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ip_type"}</a></td>
- <td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="ip_address"}</a></td>
+ <td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}" data-toggle="tooltip" data-placement="bottom" title="{tmpl_var name='ip_address'}">{tmpl_var name="ip_address"}</a></td>
<td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="virtualhost"}</a></td>
<td><a href="#" data-load-content="admin/server_ip_edit.php?id={tmpl_var name='id'}">{tmpl_var name="virtualhost_port"}</a></td>
- <td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/server_ip_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/server_ip_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>
@@ -64,5 +62,3 @@
</tfoot>
</table>
</div>
-
-
\ No newline at end of file
--
Gitblit v1.9.1