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/monitor/templates/syslog_list.htm |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm
index 2458d14..8f62422 100644
--- a/interface/web/monitor/templates/syslog_list.htm
+++ b/interface/web/monitor/templates/syslog_list.htm
@@ -4,40 +4,40 @@
 <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="tstamp_txt"></th>
-                        <th><tmpl_var name="server_id_txt"></th>
-                        <th><tmpl_var name="loglevel_txt"></th>
-                        <th><tmpl_var name="message_txt"></th>
-                        <th>{tmpl_var name='search_limit'}</th>
+                        <th data-column="tstamp"><tmpl_var name="tstamp_txt"></th>
+                        <th data-column="server_id"><tmpl_var name="server_id_txt"></th>
+                        <th data-column="loglevel"><tmpl_var name="loglevel_txt"></th>
+                        <th data-column="message"><tmpl_var name="message_txt"></th>
+                        <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
                     </tr>
                     <tr>
                         <td>&nbsp;</td>
-                        <td><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
-                        <td><select name="search_loglevel">{tmpl_var name='search_loglevel'}</select></td>
-                        <td><div class="col-sm-9"><input type="text" name="search_message" value="{tmpl_var name='search_message'}" /></div></td>
-                        <td>
-                            <button type="button" class="btn btn-default formbutton-filter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','monitor/log_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_loglevel">{tmpl_var name='search_loglevel'}</select></td>
+                        <td><input class="form-control" type="text" name="search_message" value="{tmpl_var name='search_message'}" /></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="monitor/log_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>{tmpl_var name="tstamp"}</td>
                             <td>{tmpl_var name="server_id"}</td>
                             <td>{tmpl_var name="loglevel"}</td>
                             <td>{tmpl_var name="message"}</td>
-                            <td>
+                            <td class="text-right">
                                 <tmpl_if name="loglevel" op="==" value="Error">
-                                    <a class="btn btn-default formbutton-delete" href="javascript: del_record('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+                                    <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
                                 </tmpl_if>
                                 <tmpl_if name="loglevel" op="==" value="Warning">
-                                    <a class="btn btn-default formbutton-delete" href="javascript: del_record('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');">{tmpl_var name='delete_txt'}</button>
+                                    <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('monitor/log_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a>
                                 </tmpl_if>
                             </td>
                         </tr>

--
Gitblit v1.9.1