From 7e03905e63a7d85ed1f3af127b5aba0f13e80570 Mon Sep 17 00:00:00 2001
From: crcro <crc@nuamchefazi.ro>
Date: Tue, 9 Jan 2018 22:47:33 +0200
Subject: [PATCH] webui: Small graylog cleanup (#8057)

---
 html/includes/common/graylog.inc.php | 1 -
 html/includes/table/graylog.inc.php  | 3 +--
 includes/common.php                  | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/html/includes/common/graylog.inc.php b/html/includes/common/graylog.inc.php
index 61264ce915..a37c45b31b 100644
--- a/html/includes/common/graylog.inc.php
+++ b/html/includes/common/graylog.inc.php
@@ -26,7 +26,6 @@ $tmp_output = '
     <table id="graylog" class="table table-hover table-condensed graylog">
         <thead>
             <tr>
-                <th data-column-id="rowLabel"></th>
                 <th data-column-id="timestamp">Timestamp</th>
                 <th data-column-id="level">Level</th>
                 <th data-column-id="source">Source</th>
diff --git a/html/includes/table/graylog.inc.php b/html/includes/table/graylog.inc.php
index 6ec83348fa..2511e7fdc0 100644
--- a/html/includes/table/graylog.inc.php
+++ b/html/includes/table/graylog.inc.php
@@ -81,8 +81,7 @@ foreach ($messages['messages'] as $message) {
 
 
     $response[] = array(
-                      'rowLabel' => graylog_severity_label($message['message']['level']),
-                      'timestamp' => $displayTime,
+                      'timestamp' => graylog_severity_label($message['message']['level']) . $displayTime,
                       'source'    => '<a href="'.generate_url(array('page'=>'device', 'device'=>$message['message']['source'])).'">'.$message['message']['source'].'</a>',
                       'message'    => $message['message']['message'],
                       'facility'  => $message['message']['facility'],
diff --git a/includes/common.php b/includes/common.php
index 6b56aaf8c5..cb7ed8cd92 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -69,7 +69,7 @@ function graylog_severity_label($severity)
         ""  => "label-info",
     );
     $barColor = isset($map[$severity]) ? $map[$severity] : 'label-info';
-    return '<span class="alert-status '.$barColor .'">&nbsp;</span>';
+    return '<span class="alert-status '.$barColor .'" style="margin-right:8px;float:left;"></span>';
 }
 
 function external_exec($command)