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

2013-04-12 Mario Pulido <mario.pulido@artica.es> 

* godmode/users/configure_user.php,
	godmode/modules/manage_network_components_form_common.php,
        godmode/modules/manage_network_components_form_network.php,
        include/help/en/help_meta_access.php,
        include/help/es/help_meta_access.php: Added meta_access help in 
	user editor and module network creation.

	*godmode/modules/manage_network_components_form_network.php: Added 
	help tips in module network creation 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7971 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mariopulido 2013-04-12 11:03:12 +00:00
parent a8eff92aa2
commit 38d5b046bc
6 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,3 +1,15 @@
2013-04-12 Mario Pulido <mario.pulido@artica.es>
* godmode/users/configure_user.php,
godmode/modules/manage_network_components_form_common.php,
godmode/modules/manage_network_components_form_network.php,
include/help/en/help_meta_access.php,
include/help/es/help_meta_access.php: Added meta_access help in
user editor and module network creation.
*godmode/modules/manage_network_components_form_network.php: Added
help tips in module network creation
2013-04-12 Sancho Lerena <slerena@artica.es> 2013-04-12 Sancho Lerena <slerena@artica.es>
* include/functions.php: Added a new function to detect * include/functions.php: Added a new function to detect

14
pandora_console/godmode/modules/manage_network_components_form_common.php
View File

@ -56,7 +56,7 @@ if (enterprise_installed()) {
$table->data[0][2] = __('Wizard level'); $table->data[0][2] = __('Wizard level');
$wizard_levels = array('basic' => __('Basic'), $wizard_levels = array('basic' => __('Basic'),
'advanced' => __('Advanced')); 'advanced' => __('Advanced'));
$table->data[0][3] = html_print_select($wizard_levels,'wizard_level',$wizard_level,'','',-1,true, false, false); $table->data[0][3] = html_print_select($wizard_levels,'wizard_level',$wizard_level,'','',-1,true, false, false). ' ' .ui_print_help_icon ('meta_access', true);
} }
else { else {
$table->data[0][2] = ''; $table->data[0][2] = '';
@ -64,7 +64,7 @@ if (enterprise_installed()) {
} }
} }
$table->data[1][0] = __('Type') . ' ' . ui_print_help_icon ('module_type', true, ui_get_full_url(false, false, false, false)); $table->data[1][0] = __('Type') . ' ' . ui_print_help_icon ('module_type', true);
$sql = sprintf ('SELECT id_tipo, descripcion $sql = sprintf ('SELECT id_tipo, descripcion
FROM ttipo_modulo FROM ttipo_modulo
WHERE categoria IN (%s) WHERE categoria IN (%s)
@ -103,7 +103,7 @@ $table->data[2][2] = __('Interval');
$table->data[2][3] = html_print_extended_select_for_time ('module_interval' , $module_interval, '', '', '0', false, true); $table->data[2][3] = html_print_extended_select_for_time ('module_interval' , $module_interval, '', '', '0', false, true);
$table->data[3][0] = __('Warning status'); $table->data[3][0] = __('Warning status') . ' ' . ui_print_help_icon ('warning_status', true);
$table->data[3][1] = '<span id="minmax_warning"><em>'.__('Min.').'&nbsp;</em>&nbsp;'; $table->data[3][1] = '<span id="minmax_warning"><em>'.__('Min.').'&nbsp;</em>&nbsp;';
$table->data[3][1] .= html_print_input_text ('min_warning', $min_warning, $table->data[3][1] .= html_print_input_text ('min_warning', $min_warning,
'', 5, 15, true); '', 5, 15, true);
@ -116,7 +116,7 @@ $table->data[3][1] .= html_print_input_text ('str_warning', $str_warning,
$table->data[3][1] .= '<br /><em>'.__('Inverse interval').'</em>'; $table->data[3][1] .= '<br /><em>'.__('Inverse interval').'</em>';
$table->data[3][1] .= html_print_checkbox ("warning_inverse", 1, $warning_inverse, true); $table->data[3][1] .= html_print_checkbox ("warning_inverse", 1, $warning_inverse, true);
$table->data[3][2] = __('Critical status'); $table->data[3][2] = __('Critical status'). ' ' . ui_print_help_icon ('critical_status', true);
$table->data[3][3] = '<span id="minmax_critical"><em>'.__('Min.').'&nbsp;</em>&nbsp;'; $table->data[3][3] = '<span id="minmax_critical"><em>'.__('Min.').'&nbsp;</em>&nbsp;';
$table->data[3][3] .= html_print_input_text ('min_critical', $min_critical, $table->data[3][3] .= html_print_input_text ('min_critical', $min_critical,
'', 5, 15, true); '', 5, 15, true);
@ -129,16 +129,16 @@ $table->data[3][3] .= html_print_input_text ('str_critical', $str_critical,
$table->data[3][3] .= '<br /><em>'.__('Inverse interval').'</em>'; $table->data[3][3] .= '<br /><em>'.__('Inverse interval').'</em>';
$table->data[3][3] .= html_print_checkbox ("critical_inverse", 1, $critical_inverse, true); $table->data[3][3] .= html_print_checkbox ("critical_inverse", 1, $critical_inverse, true);
$table->data[4][0] = __('FF threshold') . ' ' . ui_print_help_icon ('ff_threshold', true, ui_get_full_url(false, false, false, false)); $table->data[4][0] = __('FF threshold') . ' ' . ui_print_help_icon ('ff_threshold', true);
$table->data[4][1] = html_print_input_text ('ff_event', $ff_event, $table->data[4][1] = html_print_input_text ('ff_event', $ff_event,
'', 5, 15, true); '', 5, 15, true);
$table->data[4][2] = __('Historical data'); $table->data[4][2] = __('Historical data');
$table->data[4][3] = html_print_checkbox ("history_data", 1, $history_data, true); $table->data[4][3] = html_print_checkbox ("history_data", 1, $history_data, true);
$table->data[5][0] = __('Min. Value'); $table->data[5][0] = __('Min. Value');
$table->data[5][1] = html_print_input_text ('min', $min, '', 5, 15, true); $table->data[5][1] = html_print_input_text ('min', $min, '', 5, 15, true). ' ' . ui_print_help_tip (__('Any value below this number is discarted'), true);
$table->data[5][2] = __('Max. Value'); $table->data[5][2] = __('Max. Value');
$table->data[5][3] = html_print_input_text ('max', $max, '', 5, 15, true); $table->data[5][3] = html_print_input_text ('max', $max, '', 5, 15, true) . ' ' . ui_print_help_tip (__('Any value over this number is discarted'), true);
$table->data[6][0] = __('Unit'); $table->data[6][0] = __('Unit');
$table->data[6][1] = html_print_input_text ('unit', $unit, '', 12, 25, true); $table->data[6][1] = html_print_input_text ('unit', $unit, '', 12, 25, true);
$table->data[6][2] = $table->data[6][3] = ''; $table->data[6][2] = $table->data[6][3] = '';

4
pandora_console/godmode/modules/manage_network_components_form_network.php
View File

@ -77,7 +77,7 @@ $data[3] = html_print_select(array('noAuthNoPriv' => __('Not auth and not privac
push_table_row($data, 'field_snmpv3_row3'); push_table_row($data, 'field_snmpv3_row3');
$data = array(); $data = array();
$data[0] = __('Post process') . ' ' . ui_print_help_icon ('postprocess', true, ui_get_full_url(false, false, false, false)); $data[0] = __('Post process') . ' ' . ui_print_help_icon ('postprocess', true );
$data[1] = html_print_input_text ('post_process', $post_process, '', 12, 25, true); $data[1] = html_print_input_text ('post_process', $post_process, '', 12, 25, true);
$data[2] = $data[3] = ''; $data[2] = $data[3] = '';
push_table_row($data, 'field_process'); push_table_row($data, 'field_process');
@ -86,7 +86,7 @@ push_table_row($data, 'field_process');
/* Advanced stuff */ /* Advanced stuff */
$data = array (); $data = array ();
$data[0] = __('TCP send') . ' ' . ui_print_help_icon ("tcp_send", true, ui_get_full_url(false, false, false, false)); $data[0] = __('TCP send') . ' ' . ui_print_help_icon ("tcp_send", true);
$data[1] = html_print_textarea ('tcp_send', 2, 65, $tcp_send, '', true); $data[1] = html_print_textarea ('tcp_send', 2, 65, $tcp_send, '', true);
$table->colspan['tcp_send'][1] = 3; $table->colspan['tcp_send'][1] = 3;

2
pandora_console/godmode/users/configure_user.php
View File

@ -462,7 +462,7 @@ if (enterprise_installed() && defined('METACONSOLE')) {
if (isset($user_info["metaconsole_access"])) { if (isset($user_info["metaconsole_access"])) {
$user_info_metaconsole_access = $user_info["metaconsole_access"]; $user_info_metaconsole_access = $user_info["metaconsole_access"];
} }
$table->data[12][0] = __('Metaconsole access'); $table->data[12][0] = __('Metaconsole access'). ' ' .ui_print_help_icon ('meta_access', true);
$metaconsole_accesses = array('basic' => __('Basic'), $metaconsole_accesses = array('basic' => __('Basic'),
'advanced' => __('Advanced')); 'advanced' => __('Advanced'));
$table->data[12][1] = html_print_select($metaconsole_accesses, $table->data[12][1] = html_print_select($metaconsole_accesses,

14
pandora_console/include/help/en/help_meta_access.php Normal file
View File

@ -0,0 +1,14 @@
<?php
/* Include package help/en
*/
?>
<p> Users have assigned a level of access for the Wizard of metaconsole. This level can be Basic or Advanced.
<ol>
<li><b>Basic Access</b></li>
Basic access users may only see the Wizard alerts for alert templates with Basic level and modules created from components with Basic level.
<li><b>Advanced Access</b></li>
Advanced users will see, in Wizard, modules and alerts modules in basic and advanced level.
</ol>
</p>

14
pandora_console/include/help/es/help_meta_access.php Normal file
View File

@ -0,0 +1,14 @@
<?php
/**
* @package Include/help/en
*/
?>
<p> Los usuarios tienen asignado un un nivel de acceso respecto al Wizard de la Metaconsola. Este nivel puede ser Básico o Avanzado.
<ol>
<li><b>Acceso Básico</b></li>
Los usuarios de acceso Básico, solo podrán ver en el Wizard las alertas correspondientes a las plantillas de alerta con nivel Básico y los módulos creados desde componentes de nivel Básico.
<li><b>Acceso Avanzado </b></li>
Los usuarios de acceso Avanzado verán en el Wizard las alertas y módulos tanto de nivel Básico como Avanzado.
</ol>
</p>