From 3dbe668973cb8f243369450a7e456daec5dbd3ab Mon Sep 17 00:00:00 2001
From: Pablo Aragon <pablo.aragon@pandorafms.com>
Date: Tue, 28 Feb 2023 17:47:49 +0100
Subject: [PATCH] Events meta

---
 .../godmode/events/event_edit_filter.php      |  15 +-
 .../godmode/events/event_responses.editor.php | 241 ++++++++++++------
 pandora_console/godmode/events/events.php     |  43 ++--
 pandora_console/include/ajax/events.php       |   2 +-
 pandora_console/include/functions_ui.php      |   6 +-
 pandora_console/include/styles/pandora.css    |   4 +
 pandora_console/include/styles/tables.css     |  15 ++
 pandora_console/operation/events/events.php   |   3 +-
 8 files changed, 213 insertions(+), 116 deletions(-)

diff --git a/pandora_console/godmode/events/event_edit_filter.php b/pandora_console/godmode/events/event_edit_filter.php
index 5c4bdbaae9..d2a8e6bbef 100644
--- a/pandora_console/godmode/events/event_edit_filter.php
+++ b/pandora_console/godmode/events/event_edit_filter.php
@@ -269,26 +269,13 @@ $table->cellspacing = 0;
 $table->cellpadding = 0;
 $table->size[0] = '50%';
 $table->size[1] = '50%';
-$table->class = 'databox filters events-filters-create';
+$table->class = 'databox filters events-filters-create pdd_10px';
 $table->style[0] = 'vertical-align: top;';
 $table->rowspan = [];
 $table->rowspan[3][0] = 2;
 
 $table->valign[1] = 'top';
 
-if (is_metaconsole()) {
-    if ($id) {
-        $table->head[0] = __('Update Filter');
-    } else {
-        $table->head[0] = __('Create Filter');
-    }
-
-    $table->head_colspan[0] = 4;
-    $table->headstyle[0] = 'text-align: center';
-    $table->style[0] = '';
-    $table->valign[1] = '';
-}
-
 $table->data = [];
 
 $table->data[0][0] = html_print_label_input_block(
diff --git a/pandora_console/godmode/events/event_responses.editor.php b/pandora_console/godmode/events/event_responses.editor.php
index 5d802fbf49..863b1b4ebb 100644
--- a/pandora_console/godmode/events/event_responses.editor.php
+++ b/pandora_console/godmode/events/event_responses.editor.php
@@ -82,36 +82,32 @@ if ($event_response_id > 0) {
 }
 
 $table = new stdClass();
-$table->styleTable = 'margin: 10px 10px 0';
+$table->styleTable = 'margin: 10px 10px 10px';
 $table->class = 'databox filters';
-$table->colspan[4][1] = 3;
-
-if (is_metaconsole()) {
-    $table->head[0] = __('Edit event responses');
-    $table->head_colspan[0] = 5;
-    $table->headstyle[0] = 'text-align: center';
-}
-
-$table->size = [];
-
-$table->style[0] = 'font-weight: bold;';
-$table->style[2] = 'font-weight: bold;';
+$table->cellspacing = 0;
+$table->cellpadding = 0;
+$table->size[0] = '50%';
+$table->size[1] = '50%';
 
 $table->data = [];
 
 $data = [];
-$data[0] = __('Name');
-$data[1] = html_print_input_text(
-    'name',
-    $event_response['name'],
-    '',
-    50,
-    255,
-    true,
-    false,
-    true
+
+$data[0] = html_print_label_input_block(
+    __('Name'),
+    '<div class="w100p margin-top-10">'.html_print_input_text(
+        'name',
+        $event_response['name'],
+        '',
+        false,
+        255,
+        true,
+        false,
+        true,
+        '',
+        'w100p'
+    ).html_print_input_hidden('id_response', $event_response['id'], true).'</div>'
 );
-$data[1] .= html_print_input_hidden('id_response', $event_response['id'], true);
 
 $return_all_group = false;
 
@@ -119,32 +115,64 @@ if (users_can_manage_group_all('PM') === true) {
     $return_all_group = true;
 }
 
-$data[2] = __('Group');
-$data[3] = html_print_select_groups(false, 'PM', $return_all_group, 'id_group', $event_response['id_group'], '', '', '', true);
+
+$data[1] = html_print_label_input_block(
+    __('Group'),
+    '<div class="w100p margin-top-10">'.html_print_select_groups(
+        false,
+        'PM',
+        $return_all_group,
+        'id_group',
+        $event_response['id_group'],
+        '',
+        '',
+        '',
+        true,
+        false,
+        false,
+        'w100p'
+    ).'</div>'
+);
 $table->data[0] = $data;
 
 $data = [];
-$table->colspan[1][1] = 3;
-$data[0] = __('Description');
-$data[1] = html_print_textarea(
-    'description',
-    5,
-    40,
-    $event_response['description'],
-    'class="'.$class_description.'"',
-    true
+$table->colspan[1][0] = 2;
+$data[0] = html_print_label_input_block(
+    __('Description'),
+    '<div class="w100p margin-top-10">'.html_print_textarea(
+        'description',
+        5,
+        1,
+        $event_response['description'],
+        'class="'.$class_description.' w100p"',
+        true,
+        'w100p'
+    ).'</div>'
 );
 $table->data[1] = $data;
 
 $data = [];
-$data[0] = __('Location').ui_print_help_tip(__('For Command type Modal Window mode is enforced'), true);
 $locations = [
     __('Modal window'),
     __('New window'),
 ];
-$data[1] = html_print_select($locations, 'new_window', $event_response['new_window'], '', '', '', true);
+$data[0] = html_print_label_input_block(
+    __('Location').ui_print_help_tip(__('For Command type Modal Window mode is enforced'), true),
+    '<div class="w100p margin-top-10">'.html_print_select(
+        $locations,
+        'new_window',
+        $event_response['new_window'],
+        '',
+        '',
+        '',
+        true,
+        false,
+        true,
+        'w100p'
+    ).'</div>'
+);
 
-$data[2] = '<span class="size">'.__('Size').'</span>';
+$data[1] = '<span class="size">'.__('Size').'</span>';
 if ($event_response['modal_width'] == 0) {
     $event_response['modal_width'] = 620;
 }
@@ -153,40 +181,88 @@ if ($event_response['modal_height'] == 0) {
     $event_response['modal_height'] = 500;
 }
 
-$data[3] = '<span class="size">'.__('Width').' (px) </span>';
-$data[3] .= '<span class="size">'.html_print_input_text('modal_width', $event_response['modal_width'], '', 4, 5, true).'</span>';
-$data[3] .= '<span class="size">'.__('Height').' (px) </span>';
-$data[3] .= '<span class="size">'.html_print_input_text('modal_height', $event_response['modal_height'], '', 4, 5, true).'</span>';
+$data[1] = '<div class="flex flex-space-around">';
+$data[1] .= html_print_label_input_block(
+    __('Width').' (px) ',
+    '<div class="w100p margin-top-10">'.html_print_input_text(
+        'modal_width',
+        $event_response['modal_width'],
+        '',
+        4,
+        5,
+        true
+    ).'</div>',
+    ['div_class' => 'mgn_tp_0_imp']
+);
+$data[1] .= html_print_label_input_block(
+    __('Height').' (px) ',
+    '<div class="w100p margin-top-10">'.html_print_input_text(
+        'modal_height',
+        $event_response['modal_height'],
+        '',
+        4,
+        5,
+        true
+    ).'</div>'
+);
+$data[1] .= '</div>';
 $table->data[2] = $data;
 
 $data = [];
-$data[0] = __('Parameters');
-$data[1] = html_print_input_text(
-    'params',
-    $event_response['params'],
-    '',
-    50,
-    255,
-    true
+$data[0] = html_print_label_input_block(
+    __('Parameters'),
+    '<div class="w100p margin-top-10">'.html_print_input_text(
+        'params',
+        $event_response['params'],
+        '',
+        50,
+        255,
+        true,
+        false,
+        false,
+        '',
+        'w100p'
+    ).'</div>'
 );
+
 $types = [
     'url'     => __('URL'),
     'command' => __('Command'),
 ];
-$data[2] = __('Type');
-$data[3] = html_print_select($types, 'type', $event_response['type'], '', '', '', true);
+
+$data[1] = html_print_label_input_block(
+    __('Type'),
+    '<div class="w100p margin-top-10">'.html_print_select(
+        $types,
+        'type',
+        $event_response['type'],
+        '',
+        '',
+        '',
+        true,
+        false,
+        true,
+        'w100p',
+        false,
+        'width: 100%'
+    ).'</div>'
+);
 $table->data[3] = $data;
 
 $data = [];
-$data[0] = '<span id="command_label" class="labels">'.__('Command').'</span><span id="url_label" class="labels invisible">'.__('URL').'</span>'.ui_print_help_icon('response_macros', true);
-$data[1] = html_print_textarea(
-    'target',
-    3,
-    1,
-    $event_response['target'],
-    'class="mh_initial w100p"',
-    true
+$table->colspan[4][0] = 2;
+$data[0] = html_print_label_input_block(
+    __('Command').'<span id="url_label" class="labels invisible">'.__('URL').'</span>'.ui_print_help_icon('response_macros', true),
+    '<div class="w100p margin-top-10">'.html_print_textarea(
+        'target',
+        3,
+        1,
+        $event_response['target'],
+        'class="mh_initial w100p"',
+        true
+    ).'</div>'
 );
+$table->data[4] = $data;
 
 $servers_to_exec = [];
 $servers_to_exec[0] = __('Local console');
@@ -206,24 +282,43 @@ if (enterprise_installed()) {
     }
 }
 
-$data[2] = '<div id="server_to_exec_label" class="labels invisible">'.__('Server to execute command').'</div>';
-$data[3] = '<div id="server_to_exec_value" class="invisible" >'.html_print_select($servers_to_exec, 'server_to_exec', $event_response['server_to_exec'], '', '', '', true).'</div>';
-
-$table->data[4] = $data;
-
 $data = [];
-$data[0] = '<div id="command_timeout_label" class="labels invisible">'.__('Command timeout (s)');
-$data[1] = '<div id="command_timeout_value" class="invisible">'.html_print_input_text('command_timeout', $event_response['command_timeout'], '', 4, 5, true);
+$data[0] = html_print_label_input_block(
+    '<div id="server_to_exec_label" class="labels invisible">'.__('Server to execute command').'</div>',
+    '<div id="server_to_exec_value" class="invisible" >'.html_print_select(
+        $servers_to_exec,
+        'server_to_exec',
+        $event_response['server_to_exec'],
+        '',
+        '',
+        '',
+        true
+    ).'</div>'
+);
+
+$data[1] = html_print_label_input_block(
+    '<div id="command_timeout_label" class="labels invisible">'.__('Command timeout (s)'),
+    '<div id="command_timeout_value" class="invisible">'.html_print_input_text(
+        'command_timeout',
+        $event_response['command_timeout'],
+        '',
+        4,
+        5,
+        true
+    )
+);
 
 $table->data[5] = $data;
 
 $data = [];
-$data[0] = __('Display command').ui_print_help_tip(__('If enabled the command will be displayed to any user that can execute this event response'), true);
-$data[1] = html_print_checkbox_switch(
-    'display_command',
-    1,
-    $event_response['display_command'],
-    true
+$data[0] = html_print_label_input_block(
+    __('Display command').ui_print_help_tip(__('If enabled the command will be displayed to any user that can execute this event response'), true),
+    '<div class="w100p margin-top-10">'.html_print_checkbox_switch(
+        'display_command',
+        1,
+        $event_response['display_command'],
+        true
+    ).'</div>'
 );
 
 $table->data[6] = $data;
diff --git a/pandora_console/godmode/events/events.php b/pandora_console/godmode/events/events.php
index 236c499cce..59b8c9bb71 100644
--- a/pandora_console/godmode/events/events.php
+++ b/pandora_console/godmode/events/events.php
@@ -31,7 +31,7 @@ global $config;
 
 check_login();
 
-enterprise_hook('open_meta_frame');
+
 
 if (!check_acl($config['id_user'], 0, 'EW') && !check_acl($config['id_user'], 0, 'EM') && ! check_acl($config['id_user'], 0, 'PM')) {
     db_pandora_audit(
@@ -125,28 +125,25 @@ switch ($section) {
     break;
 }
 
-if (is_metaconsole() === false) {
-    ui_print_standard_header(
-        $subpage,
-        'images/gm_events.png',
-        false,
-        '',
-        true,
-        (array) $buttons,
+ui_print_standard_header(
+    $subpage,
+    'images/gm_events.png',
+    false,
+    '',
+    true,
+    (array) $buttons,
+    [
         [
-            [
-                'link'  => '',
-                'label' => __('Configuration'),
-            ],
-            [
-                'link'  => '',
-                'label' => __('Events'),
-            ],
-        ]
-    );
-} else {
-    ui_meta_print_header(__('Manage events').$subpage, '', $buttons);
-}
+            'link'  => '',
+            'label' => __('Configuration'),
+        ],
+        [
+            'link'  => '',
+            'label' => __('Events'),
+        ],
+    ]
+);
+
 
 require_once $config['homedir'].'/include/functions_events.php';
 
@@ -168,5 +165,3 @@ switch ($section) {
         include_once $config['homedir'].'/godmode/events/event_responses.php';
     break;
 }
-
-enterprise_hook('close_meta_frame');
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index b5681cdea9..2476ef5ce5 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -2279,7 +2279,7 @@ if ($process_buffers === true) {
         '',
         true,
         true,
-        'white_box white_box_opened fixed_filter_bar',
+        'white_box white_box_opened no_border',
         'no-border flex-row'
     );
 
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 55ac2413ea..7c4d1edbe3 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3957,7 +3957,7 @@ function ui_print_datatable(array $parameters)
         ui_require_css_file('datatables.min', 'include/styles/js/');
         ui_require_css_file('tables');
         if (is_metaconsole()) {
-            ui_require_css_file('tables_meta', ENTERPRISE_DIR.'/include/styles/');
+            ui_require_css_file('meta_tables', ENTERPRISE_DIR.'/include/styles/');
         }
 
         ui_require_javascript_file('datatables.min');
@@ -3985,10 +3985,10 @@ function ui_print_datatable(array $parameters)
         );
         $output .= '"/>';
         if (is_metaconsole() === true) {
-            // Load tables_meta.css.
+            // Load meta_tables.css.
             $output .= '<link rel="stylesheet" href="';
             $output .= ui_get_full_url(
-                ENTERPRISE_DIR.'/include/styles/tables_meta.css',
+                ENTERPRISE_DIR.'/include/styles/meta_tables.css',
                 false,
                 false,
                 false
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 14aef9dd0c..73f8494488 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -11367,3 +11367,7 @@ div[role="dialog"] {
   -webkit-mask: url(../../images/alert@svg.svg) no-repeat center / contain;
   margin: 0 auto;
 }
+
+.display-grid {
+  display: grid;
+}
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index 29acb29f3c..451d653905 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -712,3 +712,18 @@ td:has(div > .no-margin-top) {
 .no-margin-top {
   margin-top: 0px !important;
 }
+
+tr.datos > td.datos > div > label,
+tr.datos2 > td.datos2 > div > label,
+tr.datos2 > td.datos2 > div > div > label {
+  font-size: 13px;
+  line-height: 16px;
+}
+
+tr.datos2 > td.datos2 > div > div {
+  margin-top: 10px;
+}
+
+.mgn_tp_0_imp {
+  margin-top: 0px !important;
+}
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index 4c0a94b786..8882093eb9 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -74,7 +74,8 @@ $readonly = false;
 ui_require_css_file('events');
 ui_require_css_file('tables');
 if (is_metaconsole() === true) {
-    ui_require_css_file('meta_tables', ENTERPRISE_DIR.'/meta/styles/');
+    ui_require_css_file('tables');
+    // ui_require_css_file('meta_tables', ENTERPRISE_DIR.'/meta/styles/');
     ui_require_css_file('meta_events', ENTERPRISE_DIR.'/meta/styles/');
 }