2011-09-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

* include/help/en/help_gis_tab.php
        include/help/en/help_local_component.php
        include/help/en/help_component_groups.php
        include/help/en/help_collection_tab.php
        include/help/en/help_inventory_tab.php
        include/help/en/help_snmp_explorer.php
        include/help/en/help_collections.php
        include/help/en/help_template_tab.php
        include/help/en/help_service_management_edit.php
        include/help/es/help_service_elements_management.php
        include/help/es/help_gis_tab.php
        include/help/es/help_view_services_detail.php
        include/help/es/help_component_groups.php
        include/help/es/help_collection_tab.php
        include/help/es/help_inventory_tab.php
        include/help/es/help_snmp_explorer.php
        include/help/es/help_collections.php
        include/help/es/help_template_tab.php
        include/help/es/help_service_management_edit.php
        include/help/es/help_view_services.php
        include/help/es/help_services_management.php: Added new contextual helps.

        * include/help/en/help_service_elements_management.php
        include/help/en/help_view_services_detail.php
        include/help/en/help_services_management.php: Modified contextual helps.

        * include/help/en/help_service_elements_management.php
        include/help/en/help_view_services_detail.php
        include/help/en/help_services_management.php
        godmode/agentes/planned_downtime.php
        godmode/agentes/agent_manager.php
        godmode/modules/manage_network_components.php: Added contextual helps.

        * godmode/modules/manage_nc_groups.php: Fixed delete action over component groups when they
        have child components groups.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4952 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-09-14 14:44:55 +00:00
parent 0e8ca9437e
commit f3fd180ecc
30 changed files with 280 additions and 20 deletions

View File

@ -1,3 +1,41 @@
2011-09-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/help/en/help_gis_tab.php
include/help/en/help_local_component.php
include/help/en/help_component_groups.php
include/help/en/help_collection_tab.php
include/help/en/help_inventory_tab.php
include/help/en/help_snmp_explorer.php
include/help/en/help_collections.php
include/help/en/help_template_tab.php
include/help/en/help_service_management_edit.php
include/help/es/help_service_elements_management.php
include/help/es/help_gis_tab.php
include/help/es/help_view_services_detail.php
include/help/es/help_component_groups.php
include/help/es/help_collection_tab.php
include/help/es/help_inventory_tab.php
include/help/es/help_snmp_explorer.php
include/help/es/help_collections.php
include/help/es/help_template_tab.php
include/help/es/help_service_management_edit.php
include/help/es/help_view_services.php
include/help/es/help_services_management.php: Added new contextual helps.
* include/help/en/help_service_elements_management.php
include/help/en/help_view_services_detail.php
include/help/en/help_services_management.php: Modified contextual helps.
* include/help/en/help_service_elements_management.php
include/help/en/help_view_services_detail.php
include/help/en/help_services_management.php
godmode/agentes/planned_downtime.php
godmode/agentes/agent_manager.php
godmode/modules/manage_network_components.php: Added contextual helps.
* godmode/modules/manage_nc_groups.php: Fixed delete action over component groups when they
have child components groups.
2011-09-08 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed output of api without html entities.

View File

@ -274,7 +274,7 @@ $arraySelectIcon = array();
foreach ($listIcons as $index => $value) $arraySelectIcon[$index] = $index;
$path = 'images/gis_map/icons/'; //TODO set better method the path
$table->data[4][0] = __('Agent icon');
$table->data[4][0] = __('Agent icon') . ui_print_help_tip(__('Agent icon for GIS Maps.'), true);
if($icon_path == '') {
$display_icons = 'none';
// Hack to show no icon. Use any given image to fix not found image errors

View File

@ -321,24 +321,29 @@ if ($id_agente) {
$tab_description = '- '. __('Setup');
break;
case "collection":
$tab_description = '- ' . __('Collection');
$tab_description = '- ' . __('Collection') . ui_print_help_icon('collection_tab', true);
break;
case "inventory":
$tab_description = '- ' . __('Inventory');
$tab_description = '- ' . __('Inventory') . ui_print_help_icon('inventory_tab', true);
break;
case "module":
$tab_description = '- '. __('Modules');
break;
case "alert":
$tab_description = '- ' . __('Alert');
$tab_description = '- ' . __('Alert') . ui_print_help_icon('manage_alert_list', true);
break;
case "template":
$tab_description = '- ' . __('Templates');
$tab_description = '- ' . __('Templates') . ui_print_help_icon('template_tab', true);
break;
case "gis":
$tab_description = '- ' . __('Gis');
$tab_description = '- ' . __('Gis') . ui_print_help_icon('gis_tab', true);
break;
case "extension":
$id_extension = get_parameter('id_extension', '');
switch ($id_extension){
case "snmp_explorer":
$tab_description = '- ' . __('SNMP explorer') . ui_print_help_icon('snmp_explorer', true);
}
break;
default:

View File

@ -54,7 +54,7 @@ $groups = users_get_groups ();
$only_alerts = (bool) get_parameter ('only_alerts', 0);
// Header
ui_print_page_header (__("Planned Downtime"), "images/god1.png", false, "", true, "");
ui_print_page_header (__("Planned Downtime") . ui_print_help_icon ('planned_downtime', true), "images/god1.png", false, "", true, "");
// INSERT A NEW DOWNTIME_AGENT ASSOCIATION
if ($insert_downtime_agent == 1){
@ -231,7 +231,6 @@ if ($create_downtime || $update_downtime) {
}
//Editor form
echo '<h3>'.__('Planned Downtime Form').' '.ui_print_help_icon ('planned_downtime', true).'</h3>';
html_print_table ($table);
html_print_input_hidden ('id_agent', $id_agent);
@ -252,7 +251,7 @@ if ($create_downtime || $update_downtime) {
echo "<td valign=top>";
// Show available agents to include into downtime
echo '<h3>'.__('Available agents').':</h3>';
echo '<h4>'.__('Available agents').':</h4>';
$filter_group = get_parameter("filter_group", 0);
@ -300,7 +299,7 @@ if ($create_downtime || $update_downtime) {
echo "</table>";
//Start Overview of existing planned downtime
echo '<h3>'.__('Agents planned for this downtime').':</h3>';
echo '<h4>'.__('Agents planned for this downtime').':</h4>';
$sql = sprintf ("SELECT tagente.nombre, tplanned_downtime_agents.id,
tagente.id_os, tagente.id_agente, tagente.id_grupo,

View File

@ -26,7 +26,7 @@ if (! check_acl ($config['id_user'], 0, "PM")) {
}
// Header
ui_print_page_header (__('Module management').' &raquo; '. __('Component group management'), "", false, "", true);
ui_print_page_header (__('Module management').' &raquo; '. __('Component group management'), "", false, "component_groups", true);
require_once ('include/functions_network_components.php');
@ -76,8 +76,11 @@ if ($update) {
if ($delete) {
$result = db_process_sql_delete ('tnetwork_component_group',
array ('id_sg' => $id));
$result1 = db_process_sql_update('tnetwork_component_group', array('parent' => 0), array('parent' => $id));
if ($result !== false) $result = true;
if (($result !== false) and ($result1 !== false)) $result = true;
else $result = false;
ui_print_result_message ($result,
@ -93,8 +96,10 @@ if ($multiple_delete) {
foreach ($ids as $id) {
$result = db_process_sql_delete ('tnetwork_component_group',
array ('id_sg' => $id));
if ($result === false) {
$result1 = db_process_sql_update('tnetwork_component_group', array('parent' => 0), array('parent' => $id));
if (($result === false) or ($result1 === false)) {
db_process_sql_rollback();
break;
}
@ -201,4 +206,4 @@ function check_all_checkboxes() {
$(".check_delete").attr('checked', false);
}
}
</script>
</script>

View File

@ -26,7 +26,7 @@ if (! check_acl ($config['id_user'], 0, "PM")) {
}
// Header
ui_print_page_header (__('Module management').' &raquo; '.__('Network component management'), "", false, "", true);
ui_print_page_header (__('Module management').' &raquo; '.__('Network component management'), "", false, "network_component", true);
require_once ('include/functions_network_components.php');
@ -417,4 +417,4 @@ function check_all_checkboxes() {
$(".check_delete").attr('checked', false);
}
}
</script>
</script>

View File

@ -0,0 +1,8 @@
<?php
/* Include Package help/en
*/
?>
<h1>Agent's collections</h1>
<p>A collection is group of files (executables or scripts) that are copied to a specific agent directory. With this you can transfer remotely software to agent's machine in a easy way.</p>

View File

@ -0,0 +1,10 @@
<?php
/* Include package help/en/
*/
?>
<h3>Collections</h3>
<p>
A collection is group of files (executables or scripts) that are copied to a specific agent directory. With this you can transfer remotely software to agent's machine in a easy way.
</p>

View File

@ -0,0 +1,9 @@
<?php
/*
* @package Include/help/en
*/
?>
<h1>Component groups</h1>
<p>Components are generic modules that you can apply repeatly to agents like a template. With this view you can create groups for this components.</p>

View File

@ -0,0 +1,15 @@
<?php
/* Package Include/help/en
*/
?>
<h1>Agent GIS view</h1>
<p>
This page allow users to view agent's GIS data in a graphical way.
</p>
<p>
With GIS you can see positional data of agents inside interactive maps. It is also possible to update agent position (longitude, latitude, altitude).
</p>

View File

@ -0,0 +1,8 @@
<?php
/* Include package help/en
*/
?>
<p>
Inventory allow you to have a complete list of devices of the monitored servers. With this you can have information of CPU, RAM memory, patches, software, etc. of your servers.
</p>

View File

@ -0,0 +1,9 @@
<?php
/*
* @package Include/help/en
*/
?>
<h1>Local Component</h1>
<p>Local Components are elements that can be applied to agents like templates. With Pandora FMS Enterprise, this can be applied authomatically and remotely with policies or one by one.</p>

View File

@ -5,3 +5,4 @@
?>
<h1>Manage Service Elements</h1>
<p> This view shows modules inside the current service.</p>

View File

@ -0,0 +1,9 @@
<?php
/*
* @package Include help/en/
*/
?>
<h1>Service edit</h1>
<p>This view show configuration form in order to edit services.</p>

View File

@ -5,3 +5,4 @@
?>
<h1>Manage Services</h1>
<p>This view list all services available to be managed. Also shows critical and warning value, group, etc. of the service.</p>

View File

@ -0,0 +1,10 @@
<?php
/* Package Include/help/en
*/
?>
<h1>SNMP explorer</h1>
<p>
SNMP explorer is an extension that allow users to do a SNMP Walk in an easy way. SNMP Walk do a serie of <i>getnexts</i> commands automatically in order to retrieve information of the target machine.
</p>

View File

@ -0,0 +1,9 @@
<?php
/* Include package help/en
*/
?>
<p>
Module template are an agrupation which contain network check modules. This templates can be applied directly to agents, avoiding add modules one by one.
</p>

View File

@ -1,6 +1,11 @@
<?php
/**
* @package Include/help/en
*/
/* Include Package help/en/
*/
?>
<h1>View Service Detail</h1>
<p>
This view shows service general parameters like critical and warning values or service status. Also shows the complete list of modules of the service.
</p>

View File

@ -0,0 +1,9 @@
<?php
/* Include Package help/es
*/
?>
<h1>Colecciones del agente</h1>
<p>Una coleccion es un grupo de ficheros (ejecutables o scripts) que son copiados a la maquina del agente en un diretorio especifico. Con esto se puede transferir remotamente software a la maquina del agente de una manera sencilla.</p>

View File

@ -0,0 +1,11 @@
<?php
/* Include package help/en/
*/
?>
<h3>Collections</h3>
<p>
A collection is group of files (executables or scripts) that are copied to a specific agent directory. With this you can transfer remotely software to agent's machine in a easy way.
</p>

View File

@ -0,0 +1,10 @@
<?php
/*
* @package Include/help/es
*/
?>
<h1>Grupos de componentes</h1>
<p>Un componente es un modulo generico que puede aplicarse a agentes de forma repetida como si fuera una plantilla. Con esta vista puedes crear grupos para estos componentes.</p>

View File

@ -0,0 +1,14 @@
<?php
/* Package Include/help/en
*/
?>
<h1>Agent GIS view</h1>
<p>
Esta vista permite a los usuarios ver la informacion GIS del agente de una manera grafica.
</p>
<p>
Con GIS se puede ver la informacion posicional del agente dentro de mapas interactivos. Ademas, es posible actualizar la informacion posicional del agente (longitud, latitud, altitud).
</p>

View File

@ -0,0 +1,8 @@
<?php
/* Include package help/es
*/
?>
<p>El inventario te permite tener una lista completa de todos los dispositivos de los servidores monitorizados. Con esto se puede tener informacion de CPU, memoria RAM, parches, software, etc. de tus servidores.
</p>

View File

@ -0,0 +1,9 @@
<?php
/**
* @package Include/help/es
*/
?>
<h1>Gestion de elementos de servicio</h1>
<p>Esta vista muestra los modulos dentro del servicio actual.</p>

View File

@ -0,0 +1,9 @@
<?php
/*
* @package Include help/es/
*/
?>
<h1>Edición de servicios</h1>
<p>Esta vista muestra el formulario de configuracion para editar servicios.</p>

View File

@ -0,0 +1,9 @@
<?php
/**
* @package Include/help/es
*/
?>
<h1>Gestion de servicios</h1>
<p>Esta vista muestra todos los servicios disponibles para ser administrados. Tambien muestra los valores de estado critico, aviso, grupo, etc. de los servicios.</p>

View File

@ -0,0 +1,12 @@
<?php
/* Include Package help/es
*/
?>
<h1>SNMP Explorer</h1>
<p>
SNMP explorer es una extension que permite de una forma facil usar el comando SNMP Walk a los usuarios. SNMP Walk realiza una serie de comandos <i>getnexts</i> para poder recuperar informacion de la maquina objetivo de manera automatica.
</p>

View File

@ -0,0 +1,8 @@
<?php
/* Include package help/en
*/
?>
<p>
Las plantillas de modulos son agrupaciones de modulos de comprobaciones de red. Las plantillas pueden aplicarse directamente a los agentes, evitando tener que añrlos uno a uno.
</p>

View File

@ -0,0 +1,9 @@
<?php
/**
* @package Include/help/es
*/
?>
<h1>Vista de servicios</h1>
<p>Esta es la vista de servicios con sus estados.</p>

View File

@ -0,0 +1,11 @@
<?php
/* Include Package help/es/
*/
?>
<h1>Vista de detalle de servicio</h1>
<p>
Esta vista muestra parametros generales del servicio como los valores de estado critico o aviso y el estado de este. Tambien se muestra un lista completa de los modulos del agente.
</p>