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_list.htm | 51 +++++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm
index 666bc2b..1152909 100644
--- a/interface/web/admin/templates/server_list.htm
+++ b/interface/web/admin/templates/server_list.htm
@@ -4,36 +4,38 @@
<p><tmpl_var name="list_desc_txt"></p>
- <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_name_txt"></th>
- <th><tmpl_var name="mail_server_txt"></th>
- <th><tmpl_var name="web_server_txt"></th>
- <th><tmpl_var name="dns_server_txt"></th>
- <th><tmpl_var name="file_server_txt"></th>
- <th><tmpl_var name="db_server_txt"></th>
- <th><tmpl_var name="vserver_server_txt"></th>
- <th>{tmpl_var name='search_limit'}</th>
+ <th data-column="server_name" width="20%"><tmpl_var name="server_name_txt"></th>
+ <th data-column="mail_server"><tmpl_var name="mail_server_txt"></th>
+ <th data-column="web_server"><tmpl_var name="web_server_txt"></th>
+ <th data-column="dns_server"><tmpl_var name="dns_server_txt"></th>
+ <th data-column="file_server"><tmpl_var name="file_server_txt"></th>
+ <th data-column="db_server"><tmpl_var name="db_server_txt"></th>
+ <th data-column="vserver_server"><tmpl_var name="vserver_server_txt"></th>
+ <th data-column="vserver_server"><tmpl_var name="xmpp_server_txt"></th>
+ <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
</tr>
<tr>
- <td><div class="col-sm-9"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></div></td>
- <td><select name="search_active">{tmpl_var name='search_mail_server'}</select></td>
- <td><select name="search_active">{tmpl_var name='search_web_server'}</select></td>
- <td><select name="search_active">{tmpl_var name='search_dns_server'}</select></td>
- <td><select name="search_active">{tmpl_var name='search_file_server'}</select></td>
- <td><select name="search_active">{tmpl_var name='search_db_server'}</select></td>
- <td><select name="search_active">{tmpl_var name='search_vserver_server'}</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/server_list.php');">{tmpl_var name="filter_txt"}</button>
+ <td><input class="form-control" type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_mail_server'}</select></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_web_server'}</select></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_dns_server'}</select></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_file_server'}</select></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_db_server'}</select></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_vserver_server'}</select></td>
+ <td><select class="form-control" name="search_active">{tmpl_var name='search_xmpp_server'}</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/server_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/server_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_name"}</a></td>
<td>{tmpl_var name="mail_server"}</td>
<td>{tmpl_var name="web_server"}</td>
@@ -41,20 +43,21 @@
<td>{tmpl_var name="file_server"}</td>
<td>{tmpl_var name="db_server"}</td>
<td>{tmpl_var name="vserver_server"}</td>
- <td>
- <a class="btn btn-default formbutton-delete" href="javascript: del_record('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+ <td>{tmpl_var name="xmpp_server"}</td>
+ <td class="text-right">
+ <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('admin/server_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>
<tmpl_unless name="records">
<tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
- <td colspan="8">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+ <td colspan="7">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
</tr>
</tmpl_unless>
</tbody>
<tfoot>
<tr>
- <td colspan="8"><tmpl_var name="paging"></td>
+ <td colspan="7"><tmpl_var name="paging"></td>
</tr>
</tfoot>
</table>
--
Gitblit v1.9.1