diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e680b8434e..525ace40bc 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,17 @@ +2013-05-06 Sergio Martin + + * include/help/en/help_module_interval_factor.php + include/help/es/help_module_interval_factor.php + godmode/agentes/module_manager_editor_common.php: Change the + control of interval module when is data module from extended + from time to normal box with a different help tip explaining + that this control is not setted in seconds. + + * operation/integria_incidents/incident.php + images/book_edit.png + general/pandora_help.php + godmode/setup/setup_general.php: Aesthetic fixes + 2013-05-04 Junichi Satoh * mobile/include/ui.class.php: Added charset. diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php index e2042cbf3a..3feebfaa84 100644 --- a/pandora_console/general/pandora_help.php +++ b/pandora_console/general/pandora_help.php @@ -59,14 +59,24 @@ foreach ($files as $file) { } if (! $id || ! file_exists ($help_file)) { - echo "
"; - echo '

'; + echo '
'; + echo ''; + echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0')); + echo ""; + echo '

'. html_print_image('images/interrogant.png', true, array('title' => __('Pandora FMS help system'))) . '

'; + echo '
'; + echo '
'; + echo '
'; + echo '

'; echo __('Help system error'); - echo "

"; - echo "
"; - echo '' . html_print_image("images/pandora_logo.png", array("border" => '0')) . '
'; + echo "


"; + echo "
"; + echo html_print_image("images/pandora_logo.png", array("border" => '0')) . '
'; echo "
"; echo '
'.__('Pandora FMS help system has been called with a help reference that currently don\'t exist. There is no help content to show.').'
'; + echo '

'; + echo '
'; + include ('footer.php'); return; } diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 7955339b87..6fe0adcb08 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -299,11 +299,19 @@ $table_advanced->data[1][3] = __('FF interval'); $table_advanced->data[1][4] = html_print_input_text ('module_ff_interval', $ff_interval, '', 5, 10, true, $disabledBecauseInPolicy).ui_print_help_tip (__('Module execution flip flop time interval (in secs).'), true); -$table_advanced->data[2][0] = __('Interval').ui_print_help_icon ('module_interval', true); +// In the data modules, the interval is not in seconds. It is a factor +// to be multiplied for the agent interval +if($moduletype == MODULE_DATA) { + $table_advanced->data[2][0] = __('Interval') . ui_print_help_icon ('module_interval_factor', true); + $table_advanced->colspan[2][1] = 2; + $table_advanced->data[2][1] = html_print_input_text ('module_interval', $interval, '', 4, 4, true) . ' ' . __('Times the agent interval'); +} +else { + $table_advanced->data[2][0] = __('Interval') . ui_print_help_icon ('module_interval', true); + $table_advanced->colspan[2][1] = 2; + $table_advanced->data[2][1] = html_print_extended_select_for_time ('module_interval' , $interval, '', '', '0', false, true, false, false); +} -$table_advanced->colspan[2][1] = 2; -$table_advanced->data[2][1] = html_print_extended_select_for_time ('module_interval' , $interval, '', '', '0', false, true, false, false); - $table_advanced->data[2][3] = __('Post process').' ' . ui_print_help_icon ('postprocess', true); $table_advanced->data[2][4] = html_print_input_text ('post_process', $post_process, '', 15, 25, true, $disabledBecauseInPolicy); diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php index a0e4d943e6..63eda0be80 100644 --- a/pandora_console/godmode/setup/setup_general.php +++ b/pandora_console/godmode/setup/setup_general.php @@ -95,10 +95,6 @@ $table->data[18][0] = __('Enable Integria incidents in Pandora Console'); $table->data[18][1] = __('Yes').'   '.html_print_radio_button ('integria_enabled', 1, '', $config["integria_enabled"], true).'  '; $table->data[18][1] .= __('No').'   '.html_print_radio_button ('integria_enabled', 0, '', $config["integria_enabled"], true); -$table->data[19][0] = __('Enable Netflow'); -$table->data[19][1] = __('Yes').' '.html_print_radio_button ('activate_netflow', 1, '', $config["activate_netflow"], true).'  '; -$table->data[19][1] .= __('No').' '.html_print_radio_button ('activate_netflow', 0, '', $config["activate_netflow"], true); - if ($config["integria_enabled"]) { require_once('include/functions_incidents.php'); $invent = incidents_call_api($config['integria_url']."/include/api.php?user=".$config['id_user']."&pass=".$config['integria_api_password']."&op=get_inventories"); @@ -164,6 +160,10 @@ if ($config["integria_enabled"]) { $table->data[22][1] = html_print_select($inventories, 'integria_inventory', $config["integria_inventory"], '', '', '', true); } +$table->data[19][0] = __('Enable Netflow'); +$table->data[19][1] = __('Yes').' '.html_print_radio_button ('activate_netflow', 1, '', $config["activate_netflow"], true).'  '; +$table->data[19][1] .= __('No').' '.html_print_radio_button ('activate_netflow', 0, '', $config["activate_netflow"], true); + $zone_name = array('Africa' => __('Africa'), 'America' => __('America'), 'Antarctica' => __('Antarctica'), 'Arctic' => __('Arctic'), 'Asia' => __('Asia'), 'Atlantic' => __('Atlantic'), 'Australia' => __('Australia'), 'Europe' => __('Europe'), 'Indian' => __('Indian'), 'Pacific' => __('Pacific'), 'UTC' => __('UTC')); $zone_selected = get_parameter('zone'); diff --git a/pandora_console/images/book_edit.png b/pandora_console/images/book_edit.png index c60368abf7..f494fd0a20 100644 Binary files a/pandora_console/images/book_edit.png and b/pandora_console/images/book_edit.png differ diff --git a/pandora_console/include/help/en/help_module_interval_factor.php b/pandora_console/include/help/en/help_module_interval_factor.php new file mode 100644 index 0000000000..fcad2d1548 --- /dev/null +++ b/pandora_console/include/help/en/help_module_interval_factor.php @@ -0,0 +1,16 @@ + + +

The module interval as factor

+

In the data type modules, the interval is not setted in seconds.

+ +The interval is calculated as a multiplier factor for the agent interval.

+ +For example, if the agent has interval 300 (5 minutes), and you want a module that +will be processed only every 15 minutes, then you should set a module interval 3

+ +Así, este módulo será procesado cada 300sec x 3 = 900sec (15 minutos). +

+ diff --git a/pandora_console/include/help/es/help_module_interval_factor.php b/pandora_console/include/help/es/help_module_interval_factor.php new file mode 100644 index 0000000000..47def7d333 --- /dev/null +++ b/pandora_console/include/help/es/help_module_interval_factor.php @@ -0,0 +1,15 @@ + + +

El intervalo de módulo como factor

+

En los módulos de tipo data, el intervalo no se define en segundos.

+ +intervalo se calcula como un factor multiplicador para el intervalo del agente.

+ +Por ejemplo, si el agente tiene intervalo 300 (5 minutos), y se quiere un módulo que +sea procesado sólo cada 15 minutos, se debe establecer un intervalo de módulo 3

+ +This module will be preocessed every 300sec x 3 = 900sec (15 minutes). +

diff --git a/pandora_console/operation/integria_incidents/incident.php b/pandora_console/operation/integria_incidents/incident.php index 41f1265d8a..b654bc03be 100755 --- a/pandora_console/operation/integria_incidents/incident.php +++ b/pandora_console/operation/integria_incidents/incident.php @@ -40,11 +40,11 @@ if ($tab == 'list' || $tab == 'editor') { 'list' => array( 'active' => false, 'text' => '' . - html_print_image ("images/page_white_text.png", true, array ("title" => __('Incidents'))) .''), + html_print_image ("images/list.png", true, array ("title" => __('Incidents'))) .''), 'editor' => array( 'active' => false, 'text' => '' . - html_print_image ("images/add.png", true, array ("title" => __('New Incident'))) .'')); + html_print_image ("images/pen.png", true, array ("title" => __('New Incident'))) .'')); } else { $buttons = array(