From 32cf5086338a83adbbfa5dfd3213ab4e50c047b7 Mon Sep 17 00:00:00 2001
From: Pablo Aragon <pablo.aragon@pandorafms.com>
Date: Mon, 27 Feb 2023 14:38:39 +0100
Subject: [PATCH] 10457-System audit log

---
 pandora_console/include/class/AuditLog.class.php | 13 +++++++++----
 pandora_console/include/functions_ui.php         |  7 ++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/class/AuditLog.class.php b/pandora_console/include/class/AuditLog.class.php
index 0a8add5775..f05277d184 100644
--- a/pandora_console/include/class/AuditLog.class.php
+++ b/pandora_console/include/class/AuditLog.class.php
@@ -162,6 +162,7 @@ class AuditLog extends HTML
                 'id'      => 'load-filter',
                 'class'   => 'float-left margin-right-2 margin-left-2 sub config',
                 'text'    => __('Load filter'),
+                'icon'    => 'load',
                 'onclick' => '',
             ];
 
@@ -169,6 +170,7 @@ class AuditLog extends HTML
                 'id'      => 'save-filter',
                 'class'   => 'float-left margin-right-2 sub wand',
                 'text'    => __('Save filter'),
+                'icon'    => 'save',
                 'onclick' => '',
             ];
 
@@ -181,7 +183,7 @@ class AuditLog extends HTML
                 [
                     'id'                  => $this->tableId,
                     'class'               => 'info_table',
-                    'style'               => 'width: 100%',
+                    'style'               => 'width: 99%',
                     'columns'             => $columns,
                     'column_names'        => $column_names,
                     'ajax_url'            => $this->ajaxController,
@@ -199,21 +201,21 @@ class AuditLog extends HTML
                             [
                                 'label' => __('Free search').ui_print_help_tip(__('Search filter by User, Action, Date, Source IP or Comments fields content'), true),
                                 'type'  => 'text',
-                                'class' => 'w200px',
+                                'class' => 'w100p',
                                 'id'    => 'filter_text',
                                 'name'  => 'filter_text',
                             ],
                             [
                                 'label' => __('Max. hours old'),
                                 'type'  => 'text',
-                                'class' => 'w100px',
+                                'class' => 'w100p',
                                 'id'    => 'filter_period',
                                 'name'  => 'filter_period',
                             ],
                             [
                                 'label' => __('IP'),
                                 'type'  => 'text',
-                                'class' => 'w100px',
+                                'class' => 'w100p',
                                 'id'    => 'filter_ip',
                                 'name'  => 'filter_ip',
                             ],
@@ -241,6 +243,7 @@ class AuditLog extends HTML
                             ],
                         ],
                     ],
+                    'filter_main_class'   => 'box-flat white_table_graph fixed_filter_bar',
                 ]
             );
         } catch (Exception $e) {
@@ -254,6 +257,8 @@ class AuditLog extends HTML
 
         // Load own javascript file.
         echo $this->loadJS();
+
+        html_print_action_buttons([], ['type' => 'form_action']);
     }
 
 
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 4e1eac465e..a08d6f4b32 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3573,8 +3573,7 @@ function ui_print_datatable(array $parameters)
             $filter .= html_print_input(($input + ['return' => true]), 'li');
         }
 
-        $filter .= '<li>';
-
+        $filter .= '</ul>';
         // Extra buttons.
         $extra_buttons = '';
         if (isset($parameters['form']['extra_buttons']) === true
@@ -3616,9 +3615,7 @@ function ui_print_datatable(array $parameters)
             true
         );
 
-        $filter .= '</li>';
-
-        $filter .= '</ul><div id="both"></div></form>';
+        $filter .= '<div id="both"></div></form>';
         if (isset($parameters['form']['no_toggle']) === false) {
             $filter = ui_toggle(
                 $filter,