From edf806b98d675a2037b019644aff76b7e8b7738c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 21 Nov 2011 02:33:09 -0500
Subject: [PATCH] Merged revisions 2741-2788 from SVN stable branch.

---
 interface/web/monitor/templates/datalog_list.htm |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/interface/web/monitor/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm
index 44e4c1d..eb617e5 100644
--- a/interface/web/monitor/templates/datalog_list.htm
+++ b/interface/web/monitor/templates/datalog_list.htm
@@ -1,4 +1,5 @@
 <h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
 
 <div class="panel panel_list_datalog">
 
@@ -11,15 +12,13 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
             <th class="tbl_col_dbtable" scope="col"><tmpl_var name="dbtable_txt"></th>
-            <th class="tbl_col_status" scope="col"><tmpl_var name="status_txt"></th>
             <th class="tbl_col_buttons" scope="col">&nbsp;</th>
           </tr>
           <tr>
             <td class="tbl_col_tstamp">&nbsp;</td>
-            <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','monitor/datalog_list.php');">{tmpl_var name='search_server_id'}</select></td>
-            <td class="tbl_col_action"><select name="search_action" onChange="submitForm('pageForm','monitor/datalog_list.php');">{tmpl_var name='search_action'}</select></td>
+            <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
+            <td class="tbl_col_action"><select name="search_action">{tmpl_var name='search_action'}</select></td>
             <td class="tbl_col_dbtable"><input type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></td>
-            <td class="tbl_col_status"><select name="search_status" onChange="submitForm('pageForm','monitor/datalog_list.php');">{tmpl_var name='search_status'}</select></td>
             <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','monitor/datalog_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
           </tr>
         </thead>
@@ -30,7 +29,6 @@
             <td class="tbl_col_server_id">{tmpl_var name="server_id"}</td>
             <td class="tbl_col_action">{tmpl_var name="action"}</td>
             <td class="tbl_col_dbtable">{tmpl_var name="dbtable"}</td>
-            <td class="tbl_col_status">{tmpl_var name="status"}</td>
             <td class="tbl_col_buttons">
               <div class="buttons icons16">    
                 <!--<a class="icons16 icoDelete" href="javascript: del_record('monitor/datalog_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a> -->
@@ -41,7 +39,7 @@
         </tbody>
         <tfoot>
           <tr>
-            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+            <td class="tbl_footer tbl_paging" colspan="5"><tmpl_var name="paging"></td>
           </tr>
         </tfoot>
       </table>

--
Gitblit v1.9.1