diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 85f37c198e..b95ddb9983 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2013-04-12 Mario Pulido + + * 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 * include/functions.php: Added a new function to detect diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php index afc30b3fcb..0c7ca50a81 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_common.php +++ b/pandora_console/godmode/modules/manage_network_components_form_common.php @@ -56,7 +56,7 @@ if (enterprise_installed()) { $table->data[0][2] = __('Wizard level'); $wizard_levels = array('basic' => __('Basic'), '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 { $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 FROM ttipo_modulo 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[3][0] = __('Warning status'); +$table->data[3][0] = __('Warning status') . ' ' . ui_print_help_icon ('warning_status', true); $table->data[3][1] = ''.__('Min.').'  '; $table->data[3][1] .= html_print_input_text ('min_warning', $min_warning, '', 5, 15, true); @@ -116,7 +116,7 @@ $table->data[3][1] .= html_print_input_text ('str_warning', $str_warning, $table->data[3][1] .= '
'.__('Inverse interval').''; $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] = ''.__('Min.').'  '; $table->data[3][3] .= html_print_input_text ('min_critical', $min_critical, '', 5, 15, true); @@ -129,16 +129,16 @@ $table->data[3][3] .= html_print_input_text ('str_critical', $str_critical, $table->data[3][3] .= '
'.__('Inverse interval').''; $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, '', 5, 15, true); $table->data[4][2] = __('Historical data'); $table->data[4][3] = html_print_checkbox ("history_data", 1, $history_data, true); $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][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][1] = html_print_input_text ('unit', $unit, '', 12, 25, true); $table->data[6][2] = $table->data[6][3] = ''; diff --git a/pandora_console/godmode/modules/manage_network_components_form_network.php b/pandora_console/godmode/modules/manage_network_components_form_network.php index c1544e6043..84c0869ed6 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_network.php +++ b/pandora_console/godmode/modules/manage_network_components_form_network.php @@ -77,7 +77,7 @@ $data[3] = html_print_select(array('noAuthNoPriv' => __('Not auth and not privac push_table_row($data, 'field_snmpv3_row3'); $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[2] = $data[3] = ''; push_table_row($data, 'field_process'); @@ -86,7 +86,7 @@ push_table_row($data, 'field_process'); /* Advanced stuff */ $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); $table->colspan['tcp_send'][1] = 3; diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 1b78eb0fa7..8054feac04 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -462,7 +462,7 @@ if (enterprise_installed() && defined('METACONSOLE')) { if (isset($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'), 'advanced' => __('Advanced')); $table->data[12][1] = html_print_select($metaconsole_accesses, diff --git a/pandora_console/include/help/en/help_meta_access.php b/pandora_console/include/help/en/help_meta_access.php new file mode 100644 index 0000000000..0129af6377 --- /dev/null +++ b/pandora_console/include/help/en/help_meta_access.php @@ -0,0 +1,14 @@ + + +

Users have assigned a level of access for the Wizard of metaconsole. This level can be Basic or Advanced. +

    +
  1. Basic Access
  2. +Basic access users may only see the Wizard alerts for alert templates with Basic level and modules created from components with Basic level. +
  3. Advanced Access
  4. +Advanced users will see, in Wizard, modules and alerts modules in basic and advanced level. +
+

+ diff --git a/pandora_console/include/help/es/help_meta_access.php b/pandora_console/include/help/es/help_meta_access.php new file mode 100644 index 0000000000..8678065cf3 --- /dev/null +++ b/pandora_console/include/help/es/help_meta_access.php @@ -0,0 +1,14 @@ + +

Los usuarios tienen asignado un un nivel de acceso respecto al Wizard de la Metaconsola. Este nivel puede ser Básico o Avanzado. +

    +
  1. Acceso Básico
  2. +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. +
  3. Acceso Avanzado
  4. +Los usuarios de acceso Avanzado verán en el Wizard las alertas y módulos tanto de nivel Básico como Avanzado. +
+

+