From d7f774bf576a5232b75b9540766e0124a00de53a Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Thu, 21 Sep 2023 13:12:11 +0200 Subject: [PATCH 1/4] #12099 Fix filter header --- pandora_console/operation/reporting/reporting_viewer.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index f84ecdb699..8a23c4fa69 100755 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -284,8 +284,8 @@ ui_print_standard_header( // ------------------------ INIT FORM ----------------------------------- $table2 = new stdClass(); $table2->id = 'controls_table'; -$table2->size[2] = '20%'; -$table2->style[3] = 'position:absolute; left: auto'; +// $table2->size[2] = '20%'; +// $table2->style[3] = 'position:absolute; left: auto'; $table2->styleTable = 'border:none'; if (defined('METACONSOLE')) { From f2bda1e58d037d18f3814f69085bc050fe5bb5b3 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Fri, 22 Sep 2023 13:05:29 +0200 Subject: [PATCH 2/4] #12099 Fix filter position --- pandora_console/operation/reporting/reporting_viewer.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 8a23c4fa69..4602292893 100755 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -284,8 +284,7 @@ ui_print_standard_header( // ------------------------ INIT FORM ----------------------------------- $table2 = new stdClass(); $table2->id = 'controls_table'; -// $table2->size[2] = '20%'; -// $table2->style[3] = 'position:absolute; left: auto'; +$table2->style[3] = 'position:absolute !important; right: 1em !important;'; $table2->styleTable = 'border:none'; if (defined('METACONSOLE')) { From 9a5a1f02bfbabb41e3c452af73a949afa559ee74 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Mon, 25 Sep 2023 09:55:55 +0200 Subject: [PATCH 3/4] #12099 Fix filter position --- pandora_console/include/styles/pandora.css | 11 +++++++++++ .../operation/reporting/reporting_viewer.php | 13 +++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 8d6fa524d4..817b415860 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -12566,3 +12566,14 @@ tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input { .ui-date-range-in > a { background-color: #81b92e3b !important; } + +.div-report_export_filter { + left: -7em; + position: absolute; +} + +.button-export_filter { + position: absolute; + left: 7em; + margin-top: 20px; +} diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 4602292893..4465b965ab 100755 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -284,7 +284,9 @@ ui_print_standard_header( // ------------------------ INIT FORM ----------------------------------- $table2 = new stdClass(); $table2->id = 'controls_table'; -$table2->style[3] = 'position:absolute !important; right: 1em !important;'; +$table2->size[2] = '20%'; +$table2->style[3] = 'position:absolute !important; left: auto !important;'; +// $table2->style[3] = 'position:absolute !important; right: 1em !important;'; $table2->styleTable = 'border:none'; if (defined('METACONSOLE')) { @@ -328,8 +330,9 @@ $Actionbuttons .= html_print_submit_button( 'date_submit', false, [ - 'mode' => 'mini', - 'icon' => 'next', + 'mode' => 'mini', + 'icon' => 'next', + 'style' => 'position: absolute; top: 25px;', ], true ); @@ -431,7 +434,9 @@ $(document).ready (function () { $("#string_items").show(); } }); - + $('#div-report_export').addClass('div-report_export_filter'); + $('#button-export').addClass('button-export_filter '); + $('#report_export_menu').removeClass('right'); }); From 4b999b79d3439f89893817a0294585bdb6112462 Mon Sep 17 00:00:00 2001 From: miguel angel rasteu Date: Mon, 25 Sep 2023 10:57:46 +0200 Subject: [PATCH 4/4] #12099 Fix filter position --- pandora_console/include/functions_html.php | 4 ++ pandora_console/include/styles/pandora.css | 17 ++++-- .../operation/reporting/reporting_viewer.php | 54 +++++++++++++------ 3 files changed, 55 insertions(+), 20 deletions(-) diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index cd4a00bf4d..599a48360e 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -7384,11 +7384,15 @@ function html_print_select_date_range( $('#".$name."_default').hide(); $('#".$name."_extend').hide(); $('#hidden-custom_date').val('1'); + $('.filter_label_position_before').addClass('filter_label_position_after'); } else if ($(this).val() === 'custom') { $('#".$name."_range').hide(); $('#".$name."_default').hide(); $('#".$name."_extend').show(); $('#hidden-custom_date').val('2'); + $('.filter_label_position_before').removeClass('filter_label_position_after'); + } else { + $('.filter_label_position_before').removeClass('filter_label_position_after'); } }); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 817b415860..c7f9671564 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -12568,12 +12568,19 @@ tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input { } .div-report_export_filter { - left: -7em; - position: absolute; + left: 0em; + top: 0em; + position: relative; } .button-export_filter { - position: absolute; - left: 7em; - margin-top: 20px; + position: relative; + left: 17em; + top: -38px; + width: 30%; +} + +.filter_label_position_after { + position: relative; + top: -92px; } diff --git a/pandora_console/operation/reporting/reporting_viewer.php b/pandora_console/operation/reporting/reporting_viewer.php index 4465b965ab..e3e07590ba 100755 --- a/pandora_console/operation/reporting/reporting_viewer.php +++ b/pandora_console/operation/reporting/reporting_viewer.php @@ -312,11 +312,19 @@ if ($html_menu_export === ENTERPRISE_NOT_HOOK) { $html_menu_export = ''; } +if ((bool) is_metaconsole() === true) { + $table2->data[0][2] = html_print_label_input_block( + __('Date').' ', + html_print_select_date_range('date', true, get_parameter('date', SECONDS_1DAY), $date_init, $time_init, date('Y/m/d'), date('H:i:s'), $date_text), + ); +} else { + $table2->data[0][2] = html_print_label_input_block( + __('Date').' ', + html_print_select_date_range('date', true, get_parameter('date', SECONDS_1DAY), $date_init, $time_init, date('Y/m/d'), date('H:i:s'), $date_text), + ['label_class' => 'filter_label_position_before'] + ); +} -$table2->data[0][2] = html_print_label_input_block( - __('Date').':
', - html_print_select_date_range('date', true, get_parameter('date', SECONDS_1DAY), $date_init, $time_init, date('Y/m/d'), date('H:i:s'), $date_text) -); $table2->data[0][3] = $html_menu_export; @@ -325,17 +333,32 @@ $searchForm = '
'mini', - 'icon' => 'next', - 'style' => 'position: absolute; top: 25px;', - ], - true -); +if ((bool) is_metaconsole() === true) { + $Actionbuttons .= html_print_submit_button( + __('Update'), + 'date_submit', + false, + [ + 'mode' => 'mini', + 'icon' => 'next', + 'style' => 'position: absolute; top: 60px;', + ], + true + ); +} else { + $Actionbuttons .= html_print_submit_button( + __('Update'), + 'date_submit', + false, + [ + 'mode' => 'mini', + 'icon' => 'next', + 'style' => 'position: absolute; top: 20px;', + ], + true + ); +} + $searchForm .= html_print_div( [ @@ -428,6 +451,7 @@ $(document).ready (function () { $("#string_to").show(); $('#string_from').show(); $("#string_items").hide(); + console.log($(".filter_label_position_before").html()); } else { $("#string_to").hide(); $('#string_from').hide();