From bbec6a92a4c065c49d41f82a1d98f1402a334ca8 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 13 Mar 2023 09:35:12 +0100 Subject: [PATCH 1/2] Minor fixes --- pandora_console/godmode/category/category.php | 5 +---- pandora_console/include/functions_treeview.php | 12 ++++++------ pandora_console/include/functions_ui.php | 14 ++++++++++---- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/pandora_console/godmode/category/category.php b/pandora_console/godmode/category/category.php index aa3a23778d..935d2c1d5d 100755 --- a/pandora_console/godmode/category/category.php +++ b/pandora_console/godmode/category/category.php @@ -262,10 +262,7 @@ if ($is_management_allowed === true) { [ 'icon' => 'next' ], true ), - [ - 'type' => 'form_action', - 'right_content' => $tablePagination, - ] + [ 'right_content' => $tablePagination ] ); echo ''; diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index e93910ec15..86367a1097 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -727,8 +727,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) false, false, '', - 'white-box-content', - 'white_table_flex margin-bottom-10 border-bottom-gray' + 'white-box-content mrgn_top_0 mrgn_btn_0px', + 'white_table_flex' ); if ($config['agentaccess']) { @@ -747,8 +747,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) true, false, '', - 'white-box-content border-bottom-gray', - 'white_table_flex margin-top-10 margin-bottom-10' + 'white-box-content mrgn_top_0 mrgn_btn_0px border-bottom-gray', + 'white_table_flex' ); } @@ -920,8 +920,8 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false) true, false, '', - 'white-box-content border-bottom-gray', - 'white_table_flex margin-top-10 margin-bottom-10' + 'white-box-content mrgn_top_0 mrgn_btn_0px border-bottom-gray', + 'white_table_flex' ); if (empty($server_data) === false && is_metaconsole() === true) { diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index d272ee224a..8df6dc2fa1 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -4327,7 +4327,10 @@ function ui_toggle( $image_a = html_print_image( $img_a, true, - [ 'style' => 'rotate: '.$rotateA ], + [ + 'class' => 'mrgn_right_10px', + 'style' => 'rotate: '.$rotateA, + ], true ); } else { @@ -4338,7 +4341,10 @@ function ui_toggle( $image_b = html_print_image( $img_b, true, - [ 'style' => 'rotate: '.$rotateB ], + [ + 'class' => 'mrgn_right_10px', + 'style' => 'margin-right:10px; rotate: '.$rotateB, + ], true ); } else { @@ -4401,7 +4407,7 @@ function ui_toggle( $original, true, [ - 'class' => 'float-left main_menu_icon', + 'class' => 'float-left main_menu_icon mrgn_right_10px', 'style' => 'object-fit: contain; margin-right:10px; rotate:'.$imageRotate, 'title' => $title, 'id' => 'image_'.$uniqid, @@ -4433,7 +4439,7 @@ function ui_toggle( $original, true, [ - 'class' => 'main_menu_icon', + 'class' => 'main_menu_icon mrgn_right_10px', 'style' => 'object-fit: contain; float:right; margin-right:10px; rotate:'.$imageRotate, 'title' => $title, 'id' => 'image_'.$uniqid, From 590e7a39789a34a58601e2017b4f587765aee264 Mon Sep 17 00:00:00 2001 From: Jose Gonzalez Date: Mon, 13 Mar 2023 11:25:43 +0100 Subject: [PATCH 2/2] Netflow improvements --- pandora_console/include/functions_network.php | 4 +- .../operation/netflow/netflow_explorer.php | 24 ++++++---- .../operation/network/network_report.php | 48 ++++++++++++++----- 3 files changed, 55 insertions(+), 21 deletions(-) diff --git a/pandora_console/include/functions_network.php b/pandora_console/include/functions_network.php index c503945c87..1945b5428b 100644 --- a/pandora_console/include/functions_network.php +++ b/pandora_console/include/functions_network.php @@ -68,10 +68,10 @@ function network_print_explorer_header( $cell = '
'; $cell .= $title; $cell .= html_print_link_with_params( - 'images/arrow-down-white.png', + 'images/arrow@svg.svg', array_merge($hidden_data, ['order_by' => $order]), 'image', - ($selected === $order) ? 'opacity: 0.5' : '' + 'rotate: 270deg; width: 20px; margin-top: 4px;'.(($selected === $order) ? '' : 'opacity: 0.5') ); $cell .= '
'; diff --git a/pandora_console/operation/netflow/netflow_explorer.php b/pandora_console/operation/netflow/netflow_explorer.php index cb09927178..3f7e18ba52 100644 --- a/pandora_console/operation/netflow/netflow_explorer.php +++ b/pandora_console/operation/netflow/netflow_explorer.php @@ -1,21 +1,29 @@ $labels, ]; + // Results table. + $resultsTable = html_print_div( + [ + 'class' => '', + 'style' => 'flex: 50;margin-right: 5px;', + 'content' => html_print_table($table, true), + ], + true + ); // Pie graph. - html_print_div( + $pieGraph = html_print_div( [ 'class' => 'databox netflow-pie-graph-container padding-2 white_box', + 'style' => 'flex: 50;margin-left: 5px;', 'content' => pie_graph( $chart_data, $options ), - ] + ], + true ); // Print the filter remove link. if (empty($main_value) === false) { @@ -418,7 +438,13 @@ if (empty($data)) { } // Print results. - html_print_table($table); + html_print_div( + [ + 'style' => 'max-width: -webkit-fill-available; display: flex', + 'class' => '', + 'content' => $resultsTable.$pieGraph, + ] + ); } ?>