From 4e2af1d5f260af16f03fd0f77573fdd9d60aab26 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Fri, 24 Feb 2023 14:34:32 +0100
Subject: [PATCH] Fixes

---
 pandora_console/extensions/insert_data.php   | 29 +++++++++----
 pandora_console/godmode/setup/os.builder.php | 43 +++++++++++---------
 pandora_console/include/styles/pandora.css   |  6 +--
 pandora_console/include/styles/tables.css    |  3 ++
 4 files changed, 51 insertions(+), 30 deletions(-)

diff --git a/pandora_console/extensions/insert_data.php b/pandora_console/extensions/insert_data.php
index f60b00b469..3ccf1af688 100644
--- a/pandora_console/extensions/insert_data.php
+++ b/pandora_console/extensions/insert_data.php
@@ -186,14 +186,14 @@ function mainInsertData()
     }
 
     $table = new stdClass();
-    $table->class = 'databox';
+    $table->class = 'databox filter-table-adv';
     $table->style = [];
     $table->cellstyle[0][0] = 'width: 0';
     $table->cellstyle[0][1] = 'width: 0';
     $table->data = [];
-    $table->data[0][0] = __('Agent');
-    $table->data[0][1] = __('Module');
-    $table->data[0][2] = __('Date');
+    $table->data[0][0] = '<label>'.__('Agent').'</label>';
+    $table->data[0][1] = '<label>'.__('Module').'</label>';
+    $table->data[0][2] = '<label>'.__('Date').'</label>';
     $params = [];
     $params['return'] = true;
     $params['show_helptip'] = true;
@@ -227,10 +227,23 @@ function mainInsertData()
     $table->data[1][2] .= '&nbsp;';
     $table->data[1][2] .= html_print_input_text('time', ($save === true) ? date(TIME_FORMAT) : $time, '', 10, 7, true);
 
-    $table->data[2][0] = __('Data');
-    $table->data[2][1] = __('CSV');
-    $table->data[3][0] = html_print_input_text('data', $data, __('Data'), 40, 60, true);
-    $table->data[3][1] = html_print_input_file('csv', true);
+    $table->data[2][0] = '<label>'.__('Data').'</label>';
+    $table->data[2][1] = '<label>'.__('CSV').'</label>';
+    $table->data[3][0] = html_print_input_text(
+        'data',
+        $data,
+        __('Data'),
+        40,
+        60,
+        true
+    );
+    $table->data[3][1] = html_print_div(
+        [
+            'class'   => '',
+            'content' => html_print_input_file('csv', true),
+        ],
+        true
+    );
 
     echo "<form method='post' enctype='multipart/form-data'>";
 
diff --git a/pandora_console/godmode/setup/os.builder.php b/pandora_console/godmode/setup/os.builder.php
index ac2026d0e6..f54eea5834 100644
--- a/pandora_console/godmode/setup/os.builder.php
+++ b/pandora_console/godmode/setup/os.builder.php
@@ -42,19 +42,6 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! is_user_admin($config['id_user
 
 $icons = get_list_os_icons_dir();
 
-echo '<form id="form_setup" method="post">';
-$table = new stdClass();
-$table->width = '100%';
-$table->class = 'databox filters';
-
-$table->style[0] = 'width: 15%';
-
-$table->data[0][0] = __('Name:');
-$table->data[0][1] = html_print_input_text('name', $name, __('Name'), 20, 30, true, false, false, '', 'w250px');
-$table->data[1][0] = __('Description');
-$table->data[1][1] = html_print_textarea('description', 5, 20, $description, '', true, 'w250px');
-$table->data[2][0] = __('Icon');
-
 $iconData = [];
 $iconData[] = html_print_select(
     $icons,
@@ -75,14 +62,32 @@ $iconData[] = html_print_div(
     true
 );
 
-$table->data[2][1] = html_print_div(
-    [
-        'style'   => 'display: flex;align-items: center;',
-        'content' => implode('', $iconData),
-    ],
-    true
+echo '<form id="form_setup" method="post">';
+$table = new stdClass();
+$table->width = '100%';
+$table->class = 'databox filter-table-adv';
+
+// $table->style[0] = 'width: 15%';
+$table->data[0][] = html_print_label_input_block(
+    __('Name'),
+    html_print_input_text('name', $name, __('Name'), 20, 30, true, false, false, '', 'w250px')
 );
 
+$table->data[0][] = html_print_label_input_block(
+    __('Icon'),
+    html_print_div(
+        [
+            'class'   => 'flex-row-center',
+            'content' => implode('', $iconData),
+        ],
+        true
+    )
+);
+
+$table->data[1][] = html_print_label_input_block(
+    __('Description'),
+    html_print_textarea('description', 5, 20, $description, '', true, 'w250px')
+);
 
 html_print_table($table);
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 91df0d66e6..d5fa17ed9c 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -9909,14 +9909,14 @@ div#err_msg_centralised {
 .inputFile {
   background-color: #f6f7fb;
   height: 16px;
-  /*font-family: "lato";*/
-  font-size: 12px;
+  font-size: 12px !important;
   padding: 5.5pt 20pt;
   cursor: pointer;
-  color: #14524f;
+  color: #14524f !important;
   border: 2px solid #14524f;
   box-shadow: none;
   border-radius: 50px;
+  align-self: baseline;
 }
 
 .inputFile > input[type="file"] {
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index b5daf09a17..e20df3f556 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -557,6 +557,9 @@ table.filter-table-adv td > div .label-thin {
   font-weight: 400;
 }
 
+table.databox.filter-table-adv {
+  padding: 10px;
+}
 /*
 padding-right: calc(100% - 1024px);
 */