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

2013-05-06 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
	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



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8103 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-05-06 16:39:41 +00:00
parent 11d57f0a3a
commit e6ec4c1b96
8 changed files with 78 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/ChangeLog
View File

@ -1,3 +1,17 @@
2013-05-06 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
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 <junichi@rworks.jp>
* mobile/include/ui.class.php: Added charset.

20
pandora_console/general/pandora_help.php
View File

@ -59,14 +59,24 @@ foreach ($files as $file) {
}
if (! $id || ! file_exists ($help_file)) {
echo "<div class='databox' id='login'><div id='login_f' class='databox'>";
echo '<h1 id="log_f" style="margin-top: 0px;" class="error">';
echo '<div id="main_help">';
echo '<span style="float:left; margin: 20px 20px 0px 20px; padding: 0px">';
echo html_print_image('images/pandora_tinylogo.png', true, array("border" => '0'));
echo "</span>";
echo '<p style="text-align: right"><strong style="float: right; padding-top: 12px; padding-right: 8px;">'. html_print_image('images/interrogant.png', true, array('title' => __('Pandora FMS help system'))) . '</strong></p>';
echo '<div style="clear:both;"></div>';
echo '<div style="font-family: verdana, arial; font-size: 11px; text-align:left">';
echo '<div style="font-size: 12px; margin-left: 20px; margin-right:20px; " class="databox">';
echo '<h1>';
echo __('Help system error');
echo "</h1>";
echo "<div class='noa'>";
echo '<a href="../index.php">' . html_print_image("images/pandora_logo.png", array("border" => '0')) . '</a><br>';
echo "</h1><HR><br>";
echo "<div style='text-align: center;'>";
echo html_print_image("images/pandora_logo.png", array("border" => '0')) . '<br>';
echo "</div>";
echo '<div class="msg">'.__('Pandora FMS help system has been called with a help reference that currently don\'t exist. There is no help content to show.').'</div></div></div>';
echo '<br /><br />';
echo '<div style="text-align: center; padding: 15px; font-family: verdana, arial; font-size: 11px;">';
include ('footer.php');
return;
}

16
pandora_console/godmode/agentes/module_manager_editor_common.php
View File

@ -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);

8
pandora_console/godmode/setup/setup_general.php
View File

@ -95,10 +95,6 @@ $table->data[18][0] = __('Enable Integria incidents in Pandora Console');
$table->data[18][1] = __('Yes').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('integria_enabled', 1, '', $config["integria_enabled"], true).'&nbsp;&nbsp;';
$table->data[18][1] .= __('No').'&nbsp;&nbsp;&nbsp;'.html_print_radio_button ('integria_enabled', 0, '', $config["integria_enabled"], true);
$table->data[19][0] = __('Enable Netflow');
$table->data[19][1] = __('Yes').'&nbsp;'.html_print_radio_button ('activate_netflow', 1, '', $config["activate_netflow"], true).'&nbsp;&nbsp;';
$table->data[19][1] .= __('No').'&nbsp;'.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').'&nbsp;'.html_print_radio_button ('activate_netflow', 1, '', $config["activate_netflow"], true).'&nbsp;&nbsp;';
$table->data[19][1] .= __('No').'&nbsp;'.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');

BIN
pandora_console/images/book_edit.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 771 B

After

Width:  |  Height:  |  Size: 1.4 KiB

16
pandora_console/include/help/en/help_module_interval_factor.php Normal file
View File

@ -0,0 +1,16 @@
<?php
/* Include package help/en
*/
?>
<h1>The module interval as factor</h1>
<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>
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).
</p>

15
pandora_console/include/help/es/help_module_interval_factor.php Normal file
View File

@ -0,0 +1,15 @@
<?php
/* Include package help/es
*/
?>
<h1>El intervalo de módulo como factor</h1>
<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>
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).
</p>

4
pandora_console/operation/integria_incidents/incident.php
View File

@ -40,11 +40,11 @@ if ($tab == 'list' || $tab == 'editor') {
'list' => array(
'active' => false,
'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=list">' .
html_print_image ("images/page_white_text.png", true, array ("title" => __('Incidents'))) .'</a>'),
html_print_image ("images/list.png", true, array ("title" => __('Incidents'))) .'</a>'),
'editor' => array(
'active' => false,
'text' => '<a href="index.php?login=1&sec=incidencias&sec2=operation/integria_incidents/incident&tab=editor">' .
html_print_image ("images/add.png", true, array ("title" => __('New Incident'))) .'</a>'));
html_print_image ("images/pen.png", true, array ("title" => __('New Incident'))) .'</a>'));
}
else {
$buttons = array(