From 83aa23b76fbdca327c52bd14fc1a1bc62aa5b3ee Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.com>
Date: Wed, 21 Jan 2015 18:55:41 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:renky/ispconfig3
---
interface/web/monitor/templates/syslog_list.htm | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm
index 1ac5cc4..b9e2134 100644
--- a/interface/web/monitor/templates/syslog_list.htm
+++ b/interface/web/monitor/templates/syslog_list.htm
@@ -9,10 +9,10 @@
<table class="table">
<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 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>
@@ -21,7 +21,7 @@
<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"}" onclick="submitForm('pageForm','monitor/log_list.php');"><span class="icon icon-filter"></span></button>
+ <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>
@@ -34,10 +34,10 @@
<td>{tmpl_var name="message"}</td>
<td class="text-right">
<tmpl_if name="loglevel" op="==" value="Error">
- <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('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></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></button>
</tmpl_if>
<tmpl_if name="loglevel" op="==" value="Warning">
- <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: del_record('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></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></button>
</tmpl_if>
</td>
</tr>
--
Gitblit v1.9.1