diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 198c22b4bb..8458dcfcc8 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 8d6fa524d4..c7f9671564 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -12566,3 +12566,21 @@ tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input {
.ui-date-range-in > a {
background-color: #81b92e3b !important;
}
+
+.div-report_export_filter {
+ left: 0em;
+ top: 0em;
+ position: relative;
+}
+
+.button-export_filter {
+ 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 f84ecdb699..e3e07590ba 100755
--- a/pandora_console/operation/reporting/reporting_viewer.php
+++ b/pandora_console/operation/reporting/reporting_viewer.php
@@ -285,7 +285,8 @@ ui_print_standard_header(
$table2 = new stdClass();
$table2->id = 'controls_table';
$table2->size[2] = '20%';
-$table2->style[3] = 'position:absolute; left: auto';
+$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')) {
@@ -311,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;
@@ -324,16 +333,32 @@ $searchForm = '