From bd0ab883574344477a6b5b6fe652700ca1bdac4f Mon Sep 17 00:00:00 2001 From: darode Date: Tue, 3 Apr 2012 13:57:25 +0000 Subject: [PATCH] 2012-04-03 Dario Rodriguez * godmode/menu.php, godmode/tag/tag.php, godmode/tag/edit_tag.php: Moved tag menu inside Manage modules. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5885 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/godmode/menu.php | 11 +++++------ pandora_console/godmode/tag/edit_tag.php | 6 +++--- pandora_console/godmode/tag/tag.php | 12 ++++++------ 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d57e07c894..727f266714 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2012-04-03 Dario Rodriguez + + * godmode/menu.php, + godmode/tag/tag.php, + godmode/tag/edit_tag.php: Moved tag menu inside Manage modules. + 2012-04-03 Dario Rodriguez * include/functions_menu.php: Deleted extension icon on menus. diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 634cb63bed..5d79e7bdb1 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -76,7 +76,11 @@ if (check_acl ($config['id_user'], 0, "PM")) { enterprise_hook ('components_submenu'); $sub["godmode/modules/manage_network_templates"]["text"] = __('Module templates'); enterprise_hook ('inventory_submenu'); - + + // Tag + $sub["godmode/tag/tag"]["text"] = __('Manage tags'); + $sub["godmode/tag/tag"]["subsecs"] = "godmode/tag/edit_tag"; + $menu["gmodules"]["sub"] = $sub; } @@ -175,11 +179,6 @@ if (check_acl ($config['id_user'], 0, "PM")) { $menu["glog"]["sec2"] = "godmode/admin_access_logs"; $menu["glog"]["id"] = "god-audit"; - // Tag - $menu["gtag"]["text"] = __('Manage tags'); - $menu["gtag"]["sec2"] = "godmode/tag/tag"; - $menu["gtag"]["id"] = "god-tag"; - // Setup $menu["gsetup"]["text"] = __('Setup'); $menu["gsetup"]["sec2"] = "godmode/setup/setup"; diff --git a/pandora_console/godmode/tag/edit_tag.php b/pandora_console/godmode/tag/edit_tag.php index 79c3e4257d..858b74d473 100644 --- a/pandora_console/godmode/tag/edit_tag.php +++ b/pandora_console/godmode/tag/edit_tag.php @@ -39,13 +39,13 @@ $tab = (string) get_parameter ("tab", "list"); $buttons = array( 'list' => array( 'active' => false, - 'text' => '' . + 'text' => '' . html_print_image ("images/god6.png", true, array ("title" => __('List tags'))) .'')); $buttons[$tab]['active'] = true; // Header -ui_print_page_header (__('Tags configuration'), "images/tag_red.png", false, "", true, $buttons); +ui_print_page_header (__('Tags configuration'), "images/setup.png", false, "", true, $buttons); // Two actions can performed in this page: update and create tags // Update tag: update an existing tag @@ -118,7 +118,7 @@ else { } // Create/Update tag form -echo '
'; +echo ''; echo '
'; diff --git a/pandora_console/godmode/tag/tag.php b/pandora_console/godmode/tag/tag.php index ef260a6a99..216d414f1d 100644 --- a/pandora_console/godmode/tag/tag.php +++ b/pandora_console/godmode/tag/tag.php @@ -65,7 +65,7 @@ $buttons = array( $buttons[$tab]['active'] = true; // Header -ui_print_page_header (__('Tags configuration'), "images/tag_red.png", false, "", true, $buttons); +ui_print_page_header (__('Tags configuration'), "images/setup.png", false, "", true, $buttons); // Two actions can performed in this page: search and delete tags @@ -104,14 +104,14 @@ echo ""; echo ""; echo '' . __("Name") . "/" . __("Description") . ''; echo ""; - echo ''; + echo ''; html_print_input_hidden ("search_tag", "1"); html_print_input_text ('tag_name', $tag_name, '', 30, 255, false); echo "   "; html_print_submit_button (__('Filter'), 'filter_button', false, 'class="sub search"'); echo ""; echo ""; - echo '
'; + echo ''; html_print_input_hidden ("create_tag", "1", true); html_print_submit_button (__('Create tag'), 'create_button', false, 'class="sub next"'); echo "
"; @@ -152,7 +152,7 @@ if (!empty($result)){ $data = array (); - $data[0] = "" . $tag["name"] . ""; + $data[0] = "" . $tag["name"] . ""; $data[1] = ui_print_truncate_text($tag["description"], 25, false); $data[2] = '' . $tag["url"] . ''; $data[3] = ' " . html_print_image("images/config.png", true, array("title" => "Edit")) . "  "; - $data[4] .= '' . html_print_image("images/cross.png", true, array("title" => "Delete")) . ''; + $data[4] = "" . html_print_image("images/config.png", true, array("title" => "Edit")) . "  "; + $data[4] .= '' . html_print_image("images/cross.png", true, array("title" => "Delete")) . ''; array_push ($table->data, $data); }