From 2d629550204f65bed065fb7c62aee48560285c81 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Mon, 2 Dec 2019 16:11:17 +0100 Subject: [PATCH] Changed filters styles in netflow live view --- .../operation/netflow/nf_live_view.php | 130 ++++++++---------- 1 file changed, 58 insertions(+), 72 deletions(-) diff --git a/pandora_console/operation/netflow/nf_live_view.php b/pandora_console/operation/netflow/nf_live_view.php index a9f742d779..ff942ddc3c 100644 --- a/pandora_console/operation/netflow/nf_live_view.php +++ b/pandora_console/operation/netflow/nf_live_view.php @@ -373,93 +373,80 @@ if (is_metaconsole()) { echo "".html_print_select_groups($config['id_user'], 'IW', $own_info['is_admin'], 'assign_group', $filter['id_group'], '', '', -1, true, false, false).''; echo ''; - echo ''; - echo ''; - html_print_image( - 'images/darrowdown.png', - false, - [ - 'onclick' => 'toggleFilters(event)', - 'style' => 'cursor: pointer;', - 'id' => 'nf-toggle-button', - ] - ); - echo __('Advanced'); - echo ''; - echo ''; + $advanced_toggle = ''; - echo ''; + $advanced_toggle .= ''; if ($netflow_disable_custom_lvfilters) { - echo ''; - echo ''; + $advanced_toggle .= ''; + $advanced_toggle .= ''; } else { - echo ''; - echo ''; + $advanced_toggle .= ''; + $advanced_toggle .= ''; } - echo ''; + $advanced_toggle .= ''; $user_groups = users_get_groups($config['id_user'], 'AR', $own_info['is_admin'], true); $user_groups[0] = 0; // Add all groups. $sql = 'SELECT * FROM tnetflow_filter WHERE id_group IN ('.implode(',', array_keys($user_groups)).')'; - echo "'; - echo ''; + $advanced_toggle .= "'; + $advanced_toggle .= ''; - echo ""; + $advanced_toggle .= ""; if ($netflow_disable_custom_lvfilters) { - echo ''; - echo ''; + $advanced_toggle .= ''; + $advanced_toggle .= ''; } else { - echo "'; - echo ''; + $advanced_toggle .= "'; + $advanced_toggle .= ''; } if ($netflow_disable_custom_lvfilters) { - echo ''; - echo ''; + $advanced_toggle .= ''; + $advanced_toggle .= ''; } else { - echo "'; - echo ''; + $advanced_toggle .= "'; + $advanced_toggle .= ''; } - echo ''; + $advanced_toggle .= ''; - echo ""; + $advanced_toggle .= ""; if ($netflow_disable_custom_lvfilters) { - echo ''; - echo ''; + $advanced_toggle .= ''; + $advanced_toggle .= ''; } else { - echo "'; - echo ''; + $advanced_toggle .= "'; + $advanced_toggle .= ''; } if ($netflow_disable_custom_lvfilters) { - echo ''; - echo ''; + $advanced_toggle .= ''; + $advanced_toggle .= ''; } else { - echo "'; - echo ''; + $advanced_toggle .= "'; + $advanced_toggle .= ''; } - echo ''; + $advanced_toggle .= ''; - echo ""; + $advanced_toggle .= ""; if ($netflow_disable_custom_lvfilters) { - echo ''; - echo ''; + $advanced_toggle .= ''; + $advanced_toggle .= ''; } else { - echo ''; - echo "'; + $advanced_toggle .= ''; + $advanced_toggle .= "'; } - echo ''; - echo ''; + $advanced_toggle .= ''; + $advanced_toggle .= ''; $onclick = "if (!confirm('".__('Warning').'. '.__('IP address resolution can take a lot of time')."')) return false;"; $radio_buttons = __('Yes').'  '.html_print_radio_button_extended( @@ -479,14 +466,28 @@ if (is_metaconsole()) { $address_resolution, true ); - echo ''; - echo ''; + $advanced_toggle .= ''; + $advanced_toggle .= ''; - echo ''; - echo ''; + $advanced_toggle .= ''; + $advanced_toggle .= ''; - echo ''; + $advanced_toggle .= ''; + $advanced_toggle .= '
'.__('Filter').''.__('Normal').' '.html_print_radio_button_extended('filter_type', 0, '', $filter_type, false, 'displayNormalFilter();', 'style="margin-right: 40px;"', true).__('Custom').' '.html_print_radio_button_extended('filter_type', 1, '', $filter_type, false, 'displayAdvancedFilter();', 'style="margin-right: 40px;"', true).''.__('Filter').''.__('Normal').' '.html_print_radio_button_extended('filter_type', 0, '', $filter_type, false, 'displayNormalFilter();', 'style="margin-right: 40px;"', true).__('Custom').' '.html_print_radio_button_extended('filter_type', 1, '', $filter_type, false, 'displayAdvancedFilter();', 'style="margin-right: 40px;"', true).''.__('Load filter').''.__('Load filter').'".html_print_select_from_sql($sql, 'filter_id', $filter_id, '', __('Select a filter'), 0, true); - html_print_input_hidden('filter_selected', $filter_selected, false); - echo '
".html_print_select_from_sql($sql, 'filter_id', $filter_id, '', __('Select a filter'), 0, true); + $advanced_toggle .= html_print_input_hidden('filter_selected', $filter_selected, false); + $advanced_toggle .= '
".__('Dst Ip').ui_print_help_tip(__('Destination IP. A comma separated list of destination ip. If we leave the field blank, will show all ip. Example filter by ip:
25.46.157.214,160.253.135.249'), true).'		'.html_print_input_text('ip_dst', $filter['ip_dst'], false, 40, 80, true).'".__('Dst Ip').ui_print_help_tip(__('Destination IP. A comma separated list of destination ip. If we leave the field blank, will show all ip. Example filter by ip:
25.46.157.214,160.253.135.249'), true).'		'.html_print_input_text('ip_dst', $filter['ip_dst'], false, 40, 80, true).'".__('Src Ip').ui_print_help_tip(__('Source IP. A comma separated list of source ip. If we leave the field blank, will show all ip. Example filter by ip:
25.46.157.214,160.253.135.249'), true).'		'.html_print_input_text('ip_src', $filter['ip_src'], false, 40, 80, true).'".__('Src Ip').ui_print_help_tip(__('Source IP. A comma separated list of source ip. If we leave the field blank, will show all ip. Example filter by ip:
25.46.157.214,160.253.135.249'), true).'		'.html_print_input_text('ip_src', $filter['ip_src'], false, 40, 80, true).'
".__('Dst Port').ui_print_help_tip(__('Destination port. A comma separated list of destination ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:
80,22'), true).'		'.html_print_input_text('dst_port', $filter['dst_port'], false, 40, 80, true).'".__('Dst Port').ui_print_help_tip(__('Destination port. A comma separated list of destination ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:
80,22'), true).'		'.html_print_input_text('dst_port', $filter['dst_port'], false, 40, 80, true).'".__('Src Port').ui_print_help_tip(__('Source port. A comma separated list of source ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:
80,22'), true).'		'.html_print_input_text('src_port', $filter['src_port'], false, 40, 80, true).'".__('Src Port').ui_print_help_tip(__('Source port. A comma separated list of source ports. If we leave the field blank, will show all ports. Example filter by ports 80 and 22:
80,22'), true).'		'.html_print_input_text('src_port', $filter['src_port'], false, 40, 80, true).'
'.__('IP address resolution').''.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true).''.$radio_buttons.''.__('IP address resolution').''.ui_print_help_tip(__('Resolve the IP addresses to get their hostnames.'), true).''.$radio_buttons.''.__('Source ip').''.html_print_input_text('router_ip', $filter['router_ip'], false, 40, 80, true).''.__('Source ip').''.html_print_input_text('router_ip', $filter['router_ip'], false, 40, 80, true).'
'; + + echo ''; + echo ui_toggle( + $advanced_toggle, + __('Advanced'), + '', + '', + true, + true, + 'white_box white_box_opened', + 'no-border flex-row' + ); + echo ''; echo ''; echo "
"; @@ -601,21 +602,6 @@ if (is_metaconsole()) { return true; }; - function toggleFilters (event) { - // Display or show the items. - var is_advanced = $("#radiobtn0001").is(':checked'); - var class_name = is_advanced ? ".filter_advance" : ".filter_normal"; - $(".nf_filter").not(class_name).toggle(); - - // Change the image. - $('#' + event.target.id).attr( - 'src', - $(".nf_filter").not(class_name).first().is(':visible') - ? 'images/darrowup.png' - : 'images/darrowdown.png' - ); - } - // Display the appropriate filter var filter_type = ; if (filter_type == 0) { @@ -768,7 +754,7 @@ if (is_metaconsole()) { } \ No newline at end of file