From cf0ab4535161353a59c7346270ec628a8b0ad88c Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Sat, 4 Apr 2015 00:54:50 +0100
Subject: [PATCH] Updated alert-log table to use new header, also fixed sorting
 on time logged column

---
 html/includes/table/alertlog.inc.php |  2 +-
 html/pages/alert-log.inc.php         | 51 ++++++++++++++--------------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/html/includes/table/alertlog.inc.php b/html/includes/table/alertlog.inc.php
index 46e12efa77..d707d9fd14 100644
--- a/html/includes/table/alertlog.inc.php
+++ b/html/includes/table/alertlog.inc.php
@@ -66,7 +66,7 @@ foreach (dbFetchRows($sql,$param) as $alertlog) {
         $glyph_color = 'khaki';
         $text = 'Better';
     }
-    $response[] = array('humandate'=>$alertlog['humandate'],
+    $response[] = array('time_logged'=>$alertlog['humandate'],
                         'hostname'=>generate_device_link($dev, shorthost($dev['hostname'])),
                         'alert'=>htmlspecialchars($alertlog['alert']),
                         'status'=>"<b><span class='glyphicon glyphicon-".$glyph_icon."' style='color:".$glyph_color."'></span> $text</b>");
diff --git a/html/pages/alert-log.inc.php b/html/pages/alert-log.inc.php
index 6dcb128bc5..0d67679dc4 100644
--- a/html/pages/alert-log.inc.php
+++ b/html/pages/alert-log.inc.php
@@ -2,31 +2,7 @@
 $param = array();
 
 $pagetitle[] = "Alert Log";
-print_optionbar_start();
-?>
 
-<form method="post" action="" class="form-inline" role="form" id="result_form">
-    <div class="form-group">
-      <label>
-        <strong>Device</strong>
-      </label>
-      <select name="device_id" id="device_id" class="form-control input-sm">
-        <option value="">All Devices</option>
-        <?php
-          foreach (get_all_devices() as $hostname)
-          {
-            echo("<option value='".getidbyname($hostname)."'");
-            if (getidbyname($hostname) == $_POST['device_id']) { echo("selected"); }
-            echo(">".$hostname."</option>");
-          }
-        ?>
-      </select>
-    </div>
-    <button type="submit" class="btn btn-default input-sm">Filter</button>
-</form>
-
-<?php
-print_optionbar_end();
             echo('<div class="panel panel-default panel-condensed">
                 <div class="panel-heading">
                     <div class="row">
@@ -44,7 +20,7 @@ print_optionbar_end();
 <table id="alertlog" class="table table-hover table-condensed table-striped">
     <thead>
         <tr>
-            <th data-column-id="humandate" data-order="desc">Time logged</th>
+            <th data-column-id="time_logged" data-order="desc">Time logged</th>
             <th data-column-id="hostname">Device</th>
             <th data-column-id="alert">alert</th>
             <th data-column-id="status" data-sortable="false">Status</th>
@@ -57,6 +33,31 @@ print_optionbar_end();
 
 var grid = $("#alertlog").bootgrid({
     ajax: true,
+    templates: {
+        header: "<div id=\"{{ctx.id}}\" class=\"{{css.header}}\"><div class=\"row\">"+
+                "<div class=\"col-sm-8 actionBar\"><span class=\"pull-left\">"+
+                "<form method=\"post\" action=\"\" class=\"form-inline\" role=\"form\" id=\"result_form\">"+
+                "<div class=\"form-group\">"+
+                "<label>"+
+                "<strong>Device&nbsp;</strong>"+
+                "</label>"+
+                "<select name=\"device_id\" id=\"device_id\" class=\"form-control input-sm\">"+
+                "<option value=\"\">All Devices</option>"+
+<?php
+    foreach (get_all_devices() as $hostname) {
+        echo('"<option value=\"'.getidbyname($hostname).'\""+');
+            if (getidbyname($hostname) == $_POST['device_id']) {
+                echo('" selected "+');
+            }
+            echo('">'.$hostname.'</option>"+');
+        }
+?>
+               "</select>"+
+               "</div>"+
+               "<button type=\"submit\" class=\"btn btn-default input-sm\">Filter</button>"+
+               "</form></span></div>"+
+               "<div class=\"col-sm-4 actionBar\"><p class=\"{{css.search}}\"></p><p class=\"{{css.actions}}\"></p></div></div></div>"
+    },
     post: function ()
     {
         return {