From 829bec59e3093eebc03fa94d397354f33a9a37dc Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Tue, 14 Feb 2023 16:45:27 +0100
Subject: [PATCH 1/5] Fix

---
 pandora_console/include/functions_ui.php | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 5b41b5985f..e097fb3db0 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -4231,25 +4231,18 @@ function ui_toggle(
         $image_a = html_print_image(
             $img_a,
             true,
-            [
-                'style' => 'rotate: 45deg;',
-                'class' => 'main_menu_icon',
-            ],
+            [ 'style' => 'rotate: 90deg;' ],
             true
         );
     } else {
         $image_a = '';
     }
 
-    hd($image_a, true);
     if (empty($img_b) === false) {
         $image_b = html_print_image(
             $img_b,
             true,
-            [
-                'style' => 'rotate: 90deg;',
-                'class' => 'main_menu_icon',
-            ],
+            [ 'style' => 'rotate: 180deg;' ],
             true
         );
     } else {
@@ -4260,11 +4253,11 @@ function ui_toggle(
     $style = 'overflow:hidden;width: -webkit-fill-available;width: -moz-fill-available;';
     $style = 'overflow:hidden;';
     if ($hidden_default === true) {
-        $imageRotate = '90deg';
+        $imageRotate = '180deg';
         $style .= 'height:0;position:absolute;';
         $original = $img_b;
     } else {
-        $imageRotate = '180deg';
+        $imageRotate = '90deg';
         $style .= 'height:auto;position:relative;';
         $original = $img_a;
     }
@@ -4390,8 +4383,7 @@ function ui_toggle(
         $output .= "				$('#tgl_div_".$uniqid."').css('height', 'auto');\n";
         $output .= "				$('#tgl_div_".$uniqid."').css('position', 'relative');\n";
         $output .= "				$('#image_".$uniqid."').attr({src: '".$image_a."'});\n";
-        $output .= "				$('#image_".$uniqid."').addClass('main_menu_icon');\n";
-        $output .= "				$('#image_".$uniqid."').css('rotate','180deg');\n";
+        $output .= "				$('#image_".$uniqid."').css('rotate','90deg');\n";
         $output .= "				$('#checkbox-".$switch_name."').prop('checked', true);\n";
         $output .= "			}\n";
         $output .= "			else {\n";
@@ -4399,8 +4391,7 @@ function ui_toggle(
         $output .= "				$('#tgl_div_".$uniqid."').css('height', 0);\n";
         $output .= "				$('#tgl_div_".$uniqid."').css('position', 'absolute');\n";
         $output .= "				$('#image_".$uniqid."').attr({src: '".$image_b."'});\n";
-        $output .= "				$('#image_".$uniqid."').addClass('main_menu_icon');\n";
-        $output .= "				$('#image_".$uniqid."').css('rotate','90deg');\n";
+        $output .= "				$('#image_".$uniqid."').css('rotate','180deg');\n";
         $output .= "				$('#checkbox-".$switch_name."').prop('checked', false);\n";
         $output .= "			}\n";
         $output .= "		});\n";

From e539fa96977a2865ba95915120d791022f6f811a Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Wed, 15 Feb 2023 12:48:41 +0100
Subject: [PATCH 2/5] Minor HTML input checkbox fix

---
 pandora_console/include/functions_html.php | 28 ++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index e2cedfe8bb..3bbd0e086f 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -4144,10 +4144,34 @@ function html_print_checkbox_extended(
         $idcounter[$name] = 0;
     }
 
+    $inputClass = 'custom_checkbox_input';
+    $labelClass = 'custom_checkbox';
+
+    if (is_array($attributes) === true) {
+        $tmpAttributes = [];
+        foreach ($attributes as $key => $value) {
+            switch ($key) {
+                case 'input_class':
+                    $inputClass .= ' '.$value;
+                break;
+
+                case 'label_class':
+                    $labelClass .= ' '.$value;
+                break;
+
+                default:
+                    $tmpAttributes[] = $key.'="'.$value.'"';
+                break;
+            }
+        }
+
+        $attributes = implode(' ', $tmpAttributes);
+    }
+
     $id_aux = preg_replace('/[^a-z0-9\:\;\-\_]/i', '', $name.($idcounter[$name] ? $idcounter[$name] : ''));
 
-    $output = '<label class="custom_checkbox">';
-    $output .= '<input class="custom_checkbox_input" name="'.$name.'" type="checkbox" value="'.$value.'" '.($checked ? 'checked="checked"' : '');
+    $output = '<label class="'.$labelClass.'">';
+    $output .= '<input class="'.$inputClass.'" name="'.$name.'" type="checkbox" value="'.$value.'" '.($checked ? 'checked="checked"' : '');
     $output .= (empty($id) === true) ? ' id="checkbox-'.$id_aux.'"' : ' id="'.$id.'"';
     $output .= (empty($script) === false) ? ' onclick="'.$script.'"' : '';
     $output .= ((bool) $disabled === true) ? ' disabled="disabled"' : '';

From 1b174f9cd4b98d1719ed33c4b8a70035cf7ddaec Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Wed, 15 Feb 2023 12:49:31 +0100
Subject: [PATCH 3/5] Ticket 10412 Reporting builder fix

---
 .../godmode/reporting/reporting_builder.php   | 172 +++++++++++-------
 pandora_console/include/styles/pandora.css    |   2 +-
 2 files changed, 103 insertions(+), 71 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 4a1589b866..a17a1b8173 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -63,6 +63,7 @@ function dialog_message(message_id) {
                     .parent()
                     .addClass('checkselected');
                 $(".check_delete").prop("checked", true);
+                console.log($('.check_delete'));
                 $('.check_delete').each(function(){
                     $('#hidden-id_report_'+$(this).val()).prop("disabled", false);
                 });
@@ -73,6 +74,7 @@ function dialog_message(message_id) {
                     .parent()
                     .parent()
                     .removeClass('checkselected');
+                console.log($('.check_delete'));
                 $(".check_delete").prop("checked", false);
             }
         });
@@ -253,7 +255,7 @@ if ($idReport != 0) {
         // Despite its permissions.
         $delete_report_bypass = false;
 
-        if ($action == 'delete_report') {
+        if ($action === 'delete_report') {
             if ($config['id_user'] == $report['id_user']
                 || is_user_admin($config['id_user'])
             ) {
@@ -887,11 +889,10 @@ switch ($action) {
             $filtersStr = http_build_query($filters, '', '&amp;');
             $url = 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder';
             $url .= '&'.$filtersStr;
-            ui_pagination($total_reports, $url, $offset, $pagination);
-
+            // ui_pagination($total_reports, $url, $offset, $pagination);
             $table = new stdClass();
             $table->id = 'report_list';
-            $table->width = '100%';
+            $table->styleTable = 'margin: 0 10px;';
             $table->class = 'info_table';
             $table->cellpadding = 0;
             $table->cellspacing = 0;
@@ -1044,37 +1045,55 @@ switch ($action) {
                         ['title' => __('This report exceeds the item limit for realtime operations')]
                     );
                     $data[3] = null;
-                } else if (!$report['non_interactive']) {
-                    $data[2] = '<a href="'.$config['homeurl'].'index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$report['id_report'].'&pure='.$pure.'">';
-                    $data[2] .= html_print_image(
-                        'images/html.png',
-                        true,
+                } else if ((bool) $report['non_interactive'] === false) {
+                    $data[2] = html_print_anchor(
                         [
-                            'title' => __('HTML view'),
-                            'class' => 'invert_filter',
-                        ]
+                            'href'    => $config['homeurl'].'index.php?sec=reporting&sec2=operation/reporting/reporting_viewer&id='.$report['id_report'].'&pure='.$pure,
+                            'content' => html_print_image(
+                                'images/file-html.svg',
+                                true,
+                                [
+                                    'title' => __('HTML view'),
+                                    'class' => 'invert_filter main_menu_icon',
+                                ]
+                            ),
+                        ],
+                        true
                     );
-                    $data[2] .= '</a>';
-                    $data[3] = '<a onclick="blockResubmit($(this))" href="'.ui_get_full_url(false, false, false, false).'ajax.php?page='.$config['homedir'].'/operation/reporting/reporting_xml&id='.$report['id_report'].'">';
-                    $data[3] .= html_print_image(
-                        'images/xml.png',
-                        true,
+
+                    $data[3] = html_print_anchor(
                         [
-                            'title' => __('Export to XML'),
-                            'class' => 'invert_filter',
-                        ]
+                            'onClick' => 'blockResubmit($(this))',
+                            'href'    => ui_get_full_url(false, false, false, false).'ajax.php?page='.$config['homedir'].'/operation/reporting/reporting_xml&id='.$report['id_report'],
+                            'content' => html_print_image(
+                                'images/file-xml.svg',
+                                true,
+                                [
+                                    'title' => __('Export to XML'),
+                                    'class' => 'invert_filter main_menu_icon',
+                                ]
+                            ),
+                        ],
+                        true
                     );
-                    $data[3] .= '</a>';
                     // I chose ajax.php because it's supposed
                     // to give XML anyway.
                 } else {
                     $data[2] = html_print_image(
-                        'images/html_disabled.png',
-                        true
+                        'images/file-html.svg',
+                        true,
+                        [
+                            'title' => __('HTML view'),
+                            'class' => 'invert_filter main_menu_icon alpha50',
+                        ]
                     );
                     $data[3] = html_print_image(
-                        'images/xml_disabled.png',
-                        true
+                        'images/file-xml.svg',
+                        true,
+                        [
+                            'title' => __('Export to XML'),
+                            'class' => 'invert_filter main_menu_icon alpha50',
+                        ]
                     );
                 }
 
@@ -1145,89 +1164,103 @@ switch ($action) {
 
                 if ($edit || $delete) {
                     $columnview = true;
-                    $table->cellclass[][$next] = 'table_action_buttons';
-
+                    // $table->cellclass[][$next] = 'table_action_buttons';
+                    $tableActionButtons = [];
                     if (!isset($table->head[$next])) {
                         $table->head[$next] = '<span title="Operations">'.__('Op.').'</span>'.html_print_checkbox('all_delete', 0, false, true, false);
                         $table->size = [];
-                        // $table->size[$next] = '80px';
                     }
 
                     if ($edit) {
-                        $data[$next] = '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&action=edit&pure='.$pure.'" class="inline_line">';
-                        $data[$next] .= html_print_input_image(
+                        $tableActionButtons[] = '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&action=edit&pure='.$pure.'" class="inline_line">';
+                        $tableActionButtons[] = html_print_input_image(
                             'edit',
-                            'images/config.png',
+                            'images/edit.svg',
                             1,
                             '',
                             true,
-                            ['title' => __('Edit')]
+                            [
+                                'title' => __('Edit'),
+                                'class' => 'main_menu_icon',
+                            ]
                         );
-                        $data[$next] .= html_print_input_hidden(
+                        $tableActionButtons[] = html_print_input_hidden(
                             'id_report',
                             $report['id_report'],
                             true
                         );
-                        $data[$next] .= '</form>';
+                        $tableActionButtons[] = '</form>';
                     }
 
-                    $data[$next] .= '<form method="post" style="display: inline"; onsubmit="if (!confirm(\''.__('Are you sure?').'\')) return false;">';
-                    $data[$next] .= html_print_input_hidden(
+                    $tableActionButtons[] = '<form method="post" style="display: inline"; onsubmit="if (!confirm(\''.__('Are you sure?').'\')) return false;">';
+                    $tableActionButtons[] = html_print_input_hidden(
                         'id_report',
                         $report['id_report'],
                         true
                     );
-                    $data[$next] .= html_print_input_hidden(
+                    $tableActionButtons[] = html_print_input_hidden(
                         'action',
                         'copy_report',
                         true
                     );
-                    $data[$next] .= html_print_input_image(
+                    $tableActionButtons[] = html_print_input_image(
                         'dup',
-                        'images/copy.png',
+                        'images/copy.svg',
                         1,
                         '',
                         true,
-                        ['title' => __('Duplicate')]
+                        [
+                            'title' => __('Duplicate'),
+                            'class' => 'main_menu_icon',
+                        ]
                     );
-                    $data[$next] .= '</form> ';
+                    $tableActionButtons[] = '</form> ';
 
                     if ($delete) {
-                        $data[$next] .= '<form method="post" class="inline_line" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">';
-                        $data[$next] .= html_print_input_image(
+                        $tableActionButtons[] = '<form method="post" class="inline_line" onsubmit="if (!confirm (\''.__('Are you sure?').'\')) return false">';
+                        $tableActionButtons[] = html_print_input_image(
                             'delete',
-                            'images/cross.png',
+                            'images/delete.svg',
                             1,
                             'margin-right: 10px;',
                             true,
                             [
                                 'title' => __('Delete'),
-                                'class' => 'invert_filter',
+                                'class' => 'main_menu_icon',
                             ]
                         );
-                        $data[$next] .= html_print_input_hidden(
+                        $tableActionButtons[] = html_print_input_hidden(
                             'id_report',
                             $report['id_report'],
                             true
                         );
-                        $data[$next] .= html_print_input_hidden(
+                        $tableActionButtons[] = html_print_input_hidden(
                             'action',
                             'delete_report',
                             true
                         );
 
-                        $data[$next] .= html_print_checkbox_extended(
+                        $tableActionButtons[] = html_print_checkbox_extended(
                             'massive_report_check',
                             $report['id_report'],
                             false,
                             false,
                             '',
-                            'class="check_delete"',
+                            [ 'input_class' => 'check_delete' ],
                             true
                         );
 
-                        $data[$next] .= '</form>';
+                        $tableActionButtons[] = '</form>';
                     }
+
+                    $data[$next] = html_print_div(
+                        [
+                            'class'   => 'table_action_buttons',
+                            'style'   => 'padding-top: 8px;',
+                            'content' => implode('', $tableActionButtons),
+                        ],
+                        true
+                    );
                 } else {
                     if ($op_column) {
                         $data[$next] = '';
@@ -1237,18 +1270,15 @@ switch ($action) {
                 array_push($table->data, $data);
             }
 
-
-
             html_print_table($table);
-            ui_pagination(
+            $tablePagination = ui_pagination(
                 $total_reports,
                 $url,
                 $offset,
                 $pagination,
-                false,
-                'offset',
                 true,
-                'pagination-bottom'
+                'offset',
+                false,
             );
         } else {
             ui_print_info_message(
@@ -1262,25 +1292,28 @@ switch ($action) {
         if (check_acl($config['id_user'], 0, 'RW')
             || check_acl($config['id_user'], 0, 'RM')
         ) {
-            $output = '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=new&pure='.$pure.'">';
-            $buttonsOutput .= html_print_submit_button(
+            $buttonsOutput = [];
+            // Create form.
+            $buttonsOutput[] = '<form method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=new&pure='.$pure.'">';
+            $buttonsOutput[] = html_print_submit_button(
                 __('Create report'),
                 'create',
                 false,
                 [ 'icon' => 'next' ],
                 true
             );
-            $output .= '</form>';
+            $buttonsOutput[] = '</form>';
 
-            $output .= '<form class="inline_line" id="massive_report_form" method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=delete">';
+            // Delete form.
+            $buttonsOutput[] = '<form class="inline_line mrgn_right_10px" id="massive_report_form" method="post" action="index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=main&action=delete">';
 
             foreach ($reports as $report) {
-                $output .= '<input class="massive_report_form_elements" id="hidden-id_report_'.$report['id_report'].'" name="id_report[]" type="hidden" disabled value="'.$report['id_report'].'">';
+                $buttonsOutput[] = '<input class="massive_report_form_elements" id="hidden-id_report_'.$report['id_report'].'" name="id_report[]" type="hidden" disabled value="'.$report['id_report'].'">';
             }
 
             if (empty($report) === false) {
-                $output .= '<input id="hidden-action" name="action" type="hidden" value="delete_report">';
-                $buttonsOutput .= html_print_submit_button(
+                $buttonsOutput[] = html_print_input_hidden('action', 'delete_report', true);
+                $buttonsOutput[] = html_print_submit_button(
                     __('Delete'),
                     'delete_btn',
                     false,
@@ -1292,17 +1325,16 @@ switch ($action) {
                 );
             }
 
-            $output .= html_print_div(
+            $buttonsOutput[] = '</form>';
+
+            echo html_print_action_buttons(
+                implode('', $buttonsOutput),
                 [
-                    'class'   => 'action-buttons',
-                    'content' => $buttonsOutput,
+                    'type'          => 'form_action',
+                    'right_content' => $tablePagination,
                 ],
                 true
             );
-
-            $output .= '</form>';
-
-            echo $output;
         }
 
         enterprise_hook('close_meta_frame');
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 601e0f7681..9511f28620 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -2080,7 +2080,7 @@ table.rounded_cells td {
   align-items: center;
 }
 
-.action-buttons > * {
+.action-buttons > *:not(#backgroundMaskId) {
   z-index: 5;
 }
 

From 4a535b14a2a599f203da7837de6e96371c70fed2 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Wed, 15 Feb 2023 13:43:42 +0100
Subject: [PATCH 4/5] Fully integrated principal action-buttons

---
 pandora_console/general/main_menu.php      |  1 +
 pandora_console/images/radial-disabled.svg | 11 +++++++
 pandora_console/images/radial-off.svg      | 11 +++++++
 pandora_console/images/radial-on.svg       | 13 ++++++++
 pandora_console/include/styles/menu.css    |  4 +--
 pandora_console/include/styles/pandora.css | 28 +++++++++-------
 pandora_console/index.php                  | 38 +++-------------------
 7 files changed, 58 insertions(+), 48 deletions(-)
 create mode 100644 pandora_console/images/radial-disabled.svg
 create mode 100644 pandora_console/images/radial-off.svg
 create mode 100644 pandora_console/images/radial-on.svg

diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index 64ad3b1bbb..60e351646f 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -214,6 +214,7 @@ echo '</div>';
             $('div#page').toggleClass('page_classic page_collapsed');
             $('#header_table').toggleClass('header_table_classic header_table_collapsed');
             $('li.menu_icon').toggleClass("no_hidden_menu menu_icon_collapsed");
+            menuActionButtonResizing();
         });
 
         const id_selected = '<?php echo $menu1_selected; ?>';
diff --git a/pandora_console/images/radial-disabled.svg b/pandora_console/images/radial-disabled.svg
new file mode 100644
index 0000000000..1b38fe43c0
--- /dev/null
+++ b/pandora_console/images/radial-disabled.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / radial-disable@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-radial-disable" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" fill="#C0CCDC">
+            <rect id="Rectangle-2" x="0" y="0" width="20" height="20" rx="4"></rect>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/radial-off.svg b/pandora_console/images/radial-off.svg
new file mode 100644
index 0000000000..68d23663ca
--- /dev/null
+++ b/pandora_console/images/radial-off.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / radial-off@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-radial-off" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Group" transform="translate(1.000000, 1.000000)" stroke="#95A3BF" stroke-width="2">
+            <rect id="Rectangle" x="0" y="0" width="18" height="18" rx="4"></rect>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/images/radial-on.svg b/pandora_console/images/radial-on.svg
new file mode 100644
index 0000000000..7e17258abb
--- /dev/null
+++ b/pandora_console/images/radial-on.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg  viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 61.2 (89653) - https://sketch.com -->
+    <title>Dark / 20 / radial-on@svg</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Dark-/-20-/-radial-on" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" fill="#1D7873">
+            <g id="Rectangle-2">
+                <path d="M16,0 C18.209139,-4.05812251e-16 20,1.790861 20,4 L20,16 C20,18.209139 18.209139,20 16,20 L4,20 C1.790861,20 2.705415e-16,18.209139 0,16 L0,4 C-2.705415e-16,1.790861 1.790861,4.05812251e-16 4,0 L16,0 Z M15.7777439,6.37135141 C15.4305323,5.94186038 14.8008905,5.87515972 14.3713994,6.22237132 L14.3713994,6.22237132 L7.77861597,11.5510307 L5.81650513,8.77747883 L5.73770948,8.67956758 C5.40260169,8.31264068 4.83884178,8.24412234 4.42262802,8.53850895 C3.97172977,8.85742777 3.86473931,9.48148781 4.18365814,9.93238606 L4.18365814,9.93238606 L6.76182606,13.5774872 L6.83812914,13.672688 C7.18888164,14.0598005 7.78987666,14.114854 8.20693177,13.7776959 L8.20693177,13.7776959 L15.6287639,7.77769594 L15.7214138,7.69277628 C16.0660673,7.33480068 16.098247,6.76780467 15.7777439,6.37135141 Z"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index 5e08a4c33f..dda77c12db 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -533,12 +533,12 @@ ul li {
 }
 
 .header_table_classic {
-  padding-left: 315px;
+  padding-left: 300px;
   /* 280 + 35 */
 }
 
 .header_table_collapsed {
-  padding-left: 115px;
+  padding-left: 100px;
   /* 80 + 35 */
 }
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index c26cfcd868..2d9b55a556 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -160,6 +160,8 @@ body {
   min-height: 100%;
   font-weight: 400;
   font-family: "Pandora-Regular";
+  -webkit-font-smoothing: antialiased;
+  text-rendering: optimizeLegibility;
 }
 
 body.body-report {
@@ -10073,8 +10075,8 @@ button.submitButton.onlyIcon {
 
 button.buttonButton.onlyIcon.pending,
 button.submitButton.onlyIcon.pending {
-  mask: url(../../images/arrow.svg) no-repeat right / contain;
-  -webkit-mask: url(../../images/arrow.svg) no-repeat right / contain;
+  mask: url(../../images/validate.svg) no-repeat right / contain;
+  -webkit-mask: url(../../images/validate.svg) no-repeat right / contain;
 }
 
 button.buttonButton.onlyIcon.completed,
@@ -10292,8 +10294,8 @@ button div.ok {
 
 button div.pending,
 button div.next {
-  mask: url(../../images/arrow.svg) no-repeat center / contain;
-  -webkit-mask: url(../../images/arrow.svg) no-repeat center / contain;
+  mask: url(../../images/validate.svg) no-repeat center / contain;
+  -webkit-mask: url(../../images/validate.svg) no-repeat center / contain;
 }
 
 button div.search {
@@ -10602,12 +10604,12 @@ tr.bring_next_field {
   top: 0 !important;
   left: 0 !important;
   border: 0 !important;
-  height: 17px !important;
-  margin-left: -4px !important;
-  margin-top: 12px !important;
+  height: 20px !important;
+  margin-left: -8px !important;
+  margin-top: 10px !important;
   position: absolute !important;
-  width: 17px !important;
-  background: url(../../images/down.svg) no-repeat content-box !important;
+  width: 20px !important;
+  background: url(../../images/dropdown-down.svg) no-repeat content-box !important;
 }
 
 .select2-container--default
@@ -10762,6 +10764,8 @@ tr.bring_next_field {
   padding: 0px;
   bottom: 8px;
   z-index: 1;
+  width: -webkit-fill-available;
+  padding-right: 10px;
 }
 
 .action_buttons_right_content {
@@ -10779,13 +10783,13 @@ tr.bring_next_field {
 .fixed_action_buttons_size {
   width: -webkit-fill-available;
   width: -moz-fill-available;
-  margin-right: 20px;
+  /*margin-right: 20px;*/
 }
 
 .action_buttons_background_mask {
-  width: 3000px;
+  width: -webkit-fill-available;
   position: absolute;
-  right: -45px;
+  left: 0;
   height: 58px;
   top: -8px;
   border: 1px solid #e5e9ed;
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 59b1c60e63..39956244a9 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -1513,7 +1513,7 @@ require 'include/php_to_js_values.php';
 <script type="text/javascript" language="javascript">
     // Handle the scroll.
     $(document).ready(scrollFunction());
-    $(document).ready(menuResizing());
+    $(document).ready(menuActionButtonResizing());
     // When there are less than 5 rows, all rows must be white
     var theme = "<?php echo $config['style']; ?>";
     if (theme === 'pandora') {
@@ -1522,7 +1522,7 @@ require 'include/php_to_js_values.php';
         }
     }
 
-    //$('.button_collapse').on('click', menuResizing());
+    //$('.button_collapse').on('click', menuActionButtonResizing());
 
     // Cursor change for show a spinner. Experimental.
     /*
@@ -1543,8 +1543,8 @@ require 'include/php_to_js_values.php';
         scrollFunction()
     };
 
-    function menuResizing() {
-        $('.action_buttons_right_content').attr('style', 'left: '+($('#menu_full').width() + 36)+'px;');
+    function menuActionButtonResizing() {
+        $('.action_buttons_right_content').attr('style', 'left: '+($('#menu_full').width())+'px;');
     }
 
     function scrollFunction() {
@@ -1557,36 +1557,6 @@ require 'include/php_to_js_values.php';
                 document.getElementById("top_btn").style.display = "none";
             }
         }
-/*
-        var separationHeight = 10;
-        // Position of the visible part of document.
-        var scrollTop = document.documentElement.scrollTop;
-        // Height of all document.
-        var scrollHeight = document.documentElement.scrollHeight;
-        // Height of visible window (browser).
-        var clientHeight = document.documentElement.clientHeight;
-        // Height of footer (Plus 10px).
-        var footerHeight = document.getElementById('foot').offsetHeight + separationHeight;*/
-        // Fixed action buttons element.
-        var actionButtons = document.getElementById('principal_action_buttons');
-        // Handle the position of principal_action_buttons.
-        if (actionButtons) {
-            var $bottom = '', $left = '';
-            /*
-            if ((scrollHeight - clientHeight - scrollTop) < footerHeight) {
-                $bottom = 'bottom:'+(footerHeight - (scrollHeight - clientHeight - window.scrollY))+'px;';
-            } else {
-                $bottom = 'bottom:'+separationHeight+'px;';
-            }
-            */
-            if (actionButtons.classList.contains('fixed_action_buttons_size') === false) {
-                $left = 'left:'+(document.documentElement.offsetWidth - document.getElementById('principal_action_buttons').offsetWidth - 20)+'px;';
-                actionButtons.setAttribute('style', $left);
-            }
-            // Set the position of principal action buttons.
-            //actionButtons.setAttribute('style', $left+$bottom);
-        }
-
     }
 
     // When the user clicks on the button, scroll to the top of the document.

From 38dbec8618d35d8a51c0a21fcbc63b39519ea611 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Wed, 15 Feb 2023 14:45:28 +0100
Subject: [PATCH 5/5] Fix Firefox bug

---
 .../godmode/modules/manage_inventory_modules.php      |  2 +-
 .../godmode/modules/manage_network_components.php     |  2 +-
 pandora_console/include/functions_ui.php              |  2 +-
 pandora_console/include/styles/pandora.css            | 11 +++++++----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pandora_console/godmode/modules/manage_inventory_modules.php b/pandora_console/godmode/modules/manage_inventory_modules.php
index 229272a3cc..dfaeffe815 100644
--- a/pandora_console/godmode/modules/manage_inventory_modules.php
+++ b/pandora_console/godmode/modules/manage_inventory_modules.php
@@ -278,7 +278,7 @@ if ($create_module_inventory === true) {
 $total_modules = db_get_sql('SELECT COUNT(*) FROM tmodule_inventory');
 
 $table = new stdClass();
-$table->styleTable = 'margin: 10px 10px 0; width: -webkit-fill-available';
+$table->styleTable = 'margin: 10px 10px 0; width: -webkit-fill-available; width: -moz-available';
 $table->class = 'info_table';
 $table->size = [];
 $table->size[0] = '140px';
diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index 63bef056f6..6c8f7f5865 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.php
@@ -743,7 +743,7 @@ if ($components === false) {
 }
 
 $table = new stdClass();
-$table->styleTable = 'margin: 10px 10px 0; width: -webkit-fill-available';
+$table->styleTable = 'margin: 10px 10px 0; width: -webkit-fill-available; width: -moz-available';
 $table->head = [];
 $table->class = 'info_table';
 if ($is_management_allowed === true) {
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index e097fb3db0..e0790db4e7 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -4250,7 +4250,7 @@ function ui_toggle(
     }
 
     // Options.
-    $style = 'overflow:hidden;width: -webkit-fill-available;width: -moz-fill-available;';
+    $style = 'overflow:hidden;width: -webkit-fill-available;width: -moz-available;';
     $style = 'overflow:hidden;';
     if ($hidden_default === true) {
         $imageRotate = '180deg';
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 2d9b55a556..9a209c6ded 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1750,7 +1750,7 @@ div.title_line {
   border-bottom: 1px solid #c1ccdc;
   /* width: calc(100% + 3em); */
   width: -webkit-fill-available;
-  width: -moz-fill-available;
+  width: -moz-available;
   padding-right: 0px;
   /* margin-bottom: 20px; */
   height: 53px;
@@ -2759,6 +2759,7 @@ td.cellBig {
 
 .info_box_container.info_box_information {
   width: -webkit-fill-available;
+  width: -moz-available;
   position: relative;
   top: 0 !important;
   right: 0;
@@ -10765,6 +10766,7 @@ tr.bring_next_field {
   bottom: 8px;
   z-index: 1;
   width: -webkit-fill-available;
+  width: -moz-available;
   padding-right: 10px;
 }
 
@@ -10782,12 +10784,13 @@ tr.bring_next_field {
 
 .fixed_action_buttons_size {
   width: -webkit-fill-available;
-  width: -moz-fill-available;
+  width: -moz-available;
   /*margin-right: 20px;*/
 }
 
 .action_buttons_background_mask {
   width: -webkit-fill-available;
+  width: -moz-available;
   position: absolute;
   left: 0;
   height: 58px;
@@ -10861,7 +10864,7 @@ pre.external_tools_output {
   background-color: #fff;
   z-index: 1;
   width: -webkit-fill-available;
-  width: -moz-fill-available;
+  width: -moz-available;
 }
 
 /*
@@ -11021,7 +11024,7 @@ span.subsection_header_title {
 
 .width_available {
   width: -webkit-fill-available !important;
-  width: -moz-fill-available !important;
+  width: -moz-available !important;
 }
 
 .snmp-td {