tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-12-13 Ramon Novoa <rnovoa@artica.es> 

* include/functions_netflow.php,
	  operation/netflow/nf_live_view.php: Style improvements.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7280 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2012-12-13 18:12:17 +00:00
parent 77d8ea31eb
commit a8ce3c6b17
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-12-13 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php,
operation/netflow/nf_live_view.php: Style improvements.
2012-12-13 Sergio Martin <sergio.martin@artica.es>
* include/functions_config.php: Changed parameter names of

4
pandora_console/include/functions_netflow.php
View File

@ -911,7 +911,7 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi
if ($interval_length != 0) {
$html .= "&nbsp;<b>" . _('Resolution') . ":</b> $interval_length " . __('seconds');
}
$html .= graph_netflow_aggregate_area ($data, $interval, 660, 320, netflow_format_unit ($unit));
$html .= graph_netflow_aggregate_area ($data, $interval, 850, 320, netflow_format_unit ($unit));
return $html;
} else if ($output == 'PDF') {
$html = "<b>" . __('Unit') . ":</b> " . netflow_format_unit ($unit);
@ -919,7 +919,7 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi
if ($interval_length != 0) {
$html .= "&nbsp;<b>" . _('Resolution') . ":</b> $interval_length " . __('seconds');
}
$html .= graph_netflow_aggregate_area ($data, $interval, 660, 320, netflow_format_unit ($unit), 2, true);
$html .= graph_netflow_aggregate_area ($data, $interval, 850, 320, netflow_format_unit ($unit), 2, true);
return $html;
} else if ($output == 'XML') {
$xml = "<unit>$unit</unit>\n";

12
pandora_console/operation/netflow/nf_live_view.php
View File

@ -193,14 +193,16 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
$table->data = array ();
$table->data[0][0] = ui_print_error_message ('Define a name for the filter and click on Save as new filter again', '', true);
$table->colspan[0][0] = 4;
$table->colspan[0][0] = 4;
$table->data[1][0] = '<span id="filter_name_color"><b>'.__('Name').'</b></span>';
$table->data[1][1] = html_print_input_text ('name', $filter['id_name'], false, 20, 80, true);
$own_info = get_user_info ($config['id_user']);
$table->data[1][2] = '<span id="filter_group_color"><b>'.__('Group').'</b></span>';
$table->data[1][3] = html_print_select_groups($config['id_user'], "IW", $own_info['is_admin'], 'assign_group', $filter['id_group'], '', '', -1, true, false, false);
$table->rowstyle[0] = 'display: none';
$table->rowstyle[1] = 'display: none';
// Read filter type
if ($filter['advanced_filter'] != '') {
$filter_type = 1;
@ -312,11 +314,7 @@ if ($draw != '') {
else {
displayAdvancedFilter ();
}
// Hide filter name and group
document.getElementById("table2-0").style.display = 'none';
document.getElementById("table2-1").style.display = 'none';
$("#filter_id").change(function () {
var filter_type;