From 130b095b61183cdd308d0cb6362fc1b84ced3f92 Mon Sep 17 00:00:00 2001 From: vgilc Date: Wed, 2 Apr 2014 11:11:06 +0000 Subject: [PATCH] 2014-04-02 Vanessa Gil * godmode/menu.php godmode/agentes/planned_downtime.editor.php operation/menu.php: Changed 'Scheduled downtime' from Administration to Operation. Added help in scheduled downtime form. Changed 'Update manager' from Operation->Extensions to Administration->Setup. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9701 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 ++++++++++ .../godmode/agentes/planned_downtime.editor.php | 4 +++- pandora_console/godmode/menu.php | 4 ++++ pandora_console/operation/menu.php | 5 +++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 91f0adb2ab..33f7b97c45 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2014-04-02 Vanessa Gil + + * godmode/menu.php + godmode/agentes/planned_downtime.editor.php + operation/menu.php: Changed 'Scheduled downtime' + from Administration to Operation. + Added help in scheduled downtime form. + Changed 'Update manager' from Operation->Extensions + to Administration->Setup. + 2014-04-02 Miguel de Dios * godmode/modules/manage_network_components.php, diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php index 61c6aaea26..0a9accbfa0 100755 --- a/pandora_console/godmode/agentes/planned_downtime.editor.php +++ b/pandora_console/godmode/agentes/planned_downtime.editor.php @@ -313,7 +313,9 @@ $table->data[1][1] = html_print_select_groups(false, "AW", true, 'id_group', $id $table->data[2][0] = __('Description'); $table->data[2][1] = html_print_textarea ('description', 3, 35, $description, '', true); -$table->data[3][0] = __('Type'); +$table->data[3][0] = __('Type').ui_print_help_tip(__("Quiet: Disable modules that we indicate below.").'
'. +__("Disable Agents: Disables the selected agents.").'
'. +__("Disable Alerts: Disable alerts for the selected agents."), true); $table->data[3][1] = html_print_select(array('quiet' => __('Quiet'), 'disable_agents' => __('Disabled Agents'), 'disable_agents_alerts' => __('Disabled only Alerts')), diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index e02993ee3b..7967c2c4c7 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -38,7 +38,9 @@ if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, enterprise_hook("duplicate_confi_submenu"); $sub["godmode/groups/group_list"]["text"] = __('Manage groups'); +/* $sub["godmode/agentes/planned_downtime.list"]["text"] = __('Scheduled downtime'); +*/ if (check_acl ($config["id_user"], 0, "PM")) { $sub["godmode/agentes/fields_manager"]["text"] = __('Manage custom fields'); @@ -218,6 +220,8 @@ if (check_acl ($config['id_user'], 0, "PM")) { enterprise_hook ('skins_submenu'); $sub["extras/pandora_diag"]["text"] = __('Diagnostic info'); + $sub["extensions/update_manager"]["text"] = __('Update manager'); + $menu_godmode["gsetup"]["sub"] = $sub; } diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 23f8d29da0..17fafe5490 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -64,6 +64,8 @@ if (check_acl ($config['id_user'], 0, "AR")) { if ($config['log_collector'] == 1) { enterprise_hook ('log_collector_menu'); } + + $sub["godmode/agentes/planned_downtime.list"]["text"] = __('Scheduled downtime'); $menu_operation["estado"]["sub"] = $sub; //End of view agents @@ -366,6 +368,9 @@ if (check_acl ($config['id_user'], 0, "AR")) { //Check if was displayed inside other menu if ($extension["operation_menu"]["fatherId"] == '') { + if ($extension_menu['name'] == 'Update manager') { + continue; + } $sub[$extension_menu["sec2"]]["text"] = $extension_menu["name"]; $sub[$extension_menu["sec2"]]["refr"] = 0; }