From c2112861457f8c4c9da1f081b9de2d9c012388af Mon Sep 17 00:00:00 2001 From: vgilc Date: Thu, 13 Mar 2014 07:32:10 +0000 Subject: [PATCH] 2014-03-13 Vanessa Gil * godmode/menu.php godmode/groups/configure_modu_group.php godmode/groups/modu_group_list.php: Moved 'Module groups' to 'Manage modules'. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9574 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/godmode/groups/configure_modu_group.php | 2 +- pandora_console/godmode/groups/modu_group_list.php | 6 +++--- pandora_console/godmode/menu.php | 5 ++++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index f5fe566058..94d3d8c6b8 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2014-03-13 Vanessa Gil + + * godmode/menu.php + godmode/groups/configure_modu_group.php + godmode/groups/modu_group_list.php: Moved 'Module groups' + to 'Manage modules'. + 2014-03-12 Miguel de Dios * godmode/agentes/configurar_agente.php: fixed for opensource diff --git a/pandora_console/godmode/groups/configure_modu_group.php b/pandora_console/godmode/groups/configure_modu_group.php index 5a70111a09..e9027c4f3c 100644 --- a/pandora_console/godmode/groups/configure_modu_group.php +++ b/pandora_console/godmode/groups/configure_modu_group.php @@ -65,7 +65,7 @@ $table->data[0][1] = html_print_input_text ('name', $name, '', 35, 100, true); echo''; -echo '
'; +echo ''; html_print_table ($table); echo '
'; if ($id_group) { diff --git a/pandora_console/godmode/groups/modu_group_list.php b/pandora_console/godmode/groups/modu_group_list.php index 96fd194386..0e48eca8f5 100644 --- a/pandora_console/godmode/groups/modu_group_list.php +++ b/pandora_console/godmode/groups/modu_group_list.php @@ -188,9 +188,9 @@ if (!empty($groups)) { foreach ($groups as $id_group ) { $data = array (); $data[0] = $id_group["id_mg"]; - $data[1] = '' . + $data[1] = '' . ui_print_truncate_text($id_group["name"], GENERIC_SIZE_TEXT).''; - $data[2] = '' . html_print_image("images/cross.png", true, array("border" => '0')) . ''; + $data[2] = '' . html_print_image("images/cross.png", true, array("border" => '0')) . ''; array_push ($table->data, $data); } @@ -201,7 +201,7 @@ else { echo "
".__('There are no defined module groups')."
"; } -echo ''; +echo ''; echo '
'; html_print_submit_button (__('Create module group'), 'crt', false, 'class="sub next"'); echo '
'; diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 11aa179259..e02993ee3b 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -41,7 +41,6 @@ if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, $sub["godmode/agentes/planned_downtime.list"]["text"] = __('Scheduled downtime'); if (check_acl ($config["id_user"], 0, "PM")) { - $sub["godmode/groups/modu_group_list"]["text"] = __('Module groups'); $sub["godmode/agentes/fields_manager"]["text"] = __('Manage custom fields'); } enterprise_hook('agents_submenu'); @@ -97,6 +96,10 @@ if (check_acl ($config['id_user'], 0, "PM")) { $sub["godmode/modules/module_list"]["text"] = __('Module types'); + if (check_acl ($config["id_user"], 0, "PM")) { + $sub["godmode/groups/modu_group_list"]["text"] = __('Module groups'); + } + $menu_godmode["gmodules"]["sub"] = $sub; }