2013-07-22 Sergio Martin <sergio.martin@artica.es>

* 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
	input field of module interval on data modules form by 
	a non editable info and improve the help explaining deeply the
	way of change the interval and how to do it. For bug #2308

	* images/cancel.png
	godmode/massive/massive_operations.php: Add missed icon
	and change another one




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8551 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,16 @@
+2013-07-22  Sergio Martin <sergio.martin@artica.es>
+
+	* 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
+	input field of module interval on data modules form by 
+	a non editable info and improve the help explaining deeply the
+	way of change the interval and how to do it. For bug #2308
+
+	* images/cancel.png
+	godmode/massive/massive_operations.php: Add missed icon
+	and change another one
+
 2013-07-19  Sergio Martin <sergio.martin@artica.es>
 
 	* godmode/massive/massive_delete_profiles.php: Fix massive

pandora_console/godmode/agentes/module_manager_editor_common.php

@@ -305,9 +305,11 @@ $table_advanced->data[1][4] = html_print_input_text ('module_ff_interval', $ff_i
 // 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->data[2][0] = __('Interval');
 	$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');
+	$agent_interval = agents_get_interval ($id_agente);
+	$interval_factor = $interval / $agent_interval;
+	$table_advanced->data[2][1] = human_time_description_raw($interval) . ' (' . sprintf(__('Agent interval x %s'), $interval_factor) . ') ' . ui_print_help_icon ('module_interval_factor', true);
 }
 else {
 	$table_advanced->data[2][0] = __('Interval') . ui_print_help_icon ('module_interval', true);

pandora_console/godmode/massive/massive_operations.php

@@ -112,7 +112,7 @@ $alertstab = array('text' => '<a href="index.php?sec=gmassive&sec2=godmode/massi
 	. '</a>', 'active' => $tab == 'massive_alerts');
 
 $userstab = array('text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_users">'
-	. html_print_image ('images/group.png', true, array ('title' => __('Users operations')))
+	. html_print_image ('images/op_workspace.png', true, array ('title' => __('Users operations')))
 	. '</a>', 'active' => $tab == 'massive_users');
 
 $agentstab = array('text' => '<a href="index.php?sec=gmassive&sec2=godmode/massive/massive_operations&tab=massive_agents">'

pandora_console/include/help/en/help_module_interval_factor.php

@@ -4,6 +4,23 @@
 ?>
 
 <h1>The module interval as factor</h1>
+<h2>Where to change the interval</h2>
+<p>
+The module interval in the data type modules will be changed in the module 
+definition in agent configuration file.<br><br>
+The interval configuration token is <b>module_interval</b>.<br><br>
+For example:<br><br>
+<i>
+module_begin<br>
+module_name Module example<br>
+module_type generic_data<br>
+module_exec echo 100<br>
+module_interval 2<br>
+module_description This module will always return 100<br>
+module_end<br>
+</i>
+</p>
+<h2>How to set the interval on this type of modules</h2>
 <p> In the <b>data type modules</b>, the interval is <b>not setted in seconds</b>.<br><br>
 
 The interval is calculated as a <b>multiplier factor</b> for the agent interval.<br><br>
@@ -11,6 +28,6 @@ The interval is calculated as a <b>multiplier factor</b> 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<br><br>
 
-Así, este módulo será procesado cada 300sec x 3 = 900sec (15 minutos).
+This module will be preocessed every 300sec x 3 = 900sec (15 minutes).
 </p>
 

pandora_console/include/help/es/help_module_interval_factor.php

@@ -4,6 +4,23 @@
 ?>
 
 <h1>El intervalo de módulo como factor</h1>
+<h2>Dónde se cambia el intervalo</h2>
+<p>
+El intervalo de los módulos de tipo data <b>se cambia en la definición del módulo en 
+el fichero de configuración del agente</b>.<br><br>
+El token de configuración del intervalo es <b>module_interval</b>.<br><br>
+Por ejemplo:<br><br>
+<i>
+module_begin<br>
+module_name Ejemplo de modulo<br>
+module_type generic_data<br>
+module_exec echo 100<br>
+module_interval 2<br>
+module_description Este modulo devuelve siempre 100<br>
+module_end<br>
+</i>
+</p>
+<h2>Cómo se define el intervalo en este tipo de módulos</h2>
 <p> En los <b>módulos de tipo data</b>, el intervalo <b>no se define en segundos</b>.<br><br>
 
 intervalo se calcula como un <b>factor multiplicador</b> para el intervalo del agente.<br><br>
@@ -11,5 +28,5 @@ intervalo se calcula como un <b>factor multiplicador</b> para el intervalo del a
 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<br><br>
 
-This module will be preocessed every 300sec x 3 = 900sec (15 minutes).
+Este módulo será procesado cada 300seg x 3 = 900seg (15 minutos).
 </p>