diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 725f1e3fd3..4bffb07a1b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,17 @@ +2009-12-09 Raul Mateos + + * images/god9.png: New image. + + * include/styles/menu.css: Added style for new menu item. + + * godmode/menu.php: New menu item. + + * godmode/reporting/map_builder.php: Updated internal links and title + because it will be a new entry in the menu. + + * operation/visual_console/render_view.php: Updated internal link for + setup. + 2009-12-09 Raul Mateos * godmode/reporting/map_builder.php: Changed H1 to H3, to maintain coherence. diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index a18b0e7f5b..6807b40c62 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -114,11 +114,14 @@ if (give_acl ($config['id_user'], 0, "IW")) { // Custom graph builder $sub["godmode/reporting/graphs"]["text"] = __('Graph builder'); - // Custom map builder - $sub["godmode/reporting/map_builder"]["text"] = __('Map builder'); - $menu["greporting"]["sub"] = $sub; } +if (give_acl ($config['id_user'], 0, "IW")) { + // Custom map builder + $menu["gmap"]["text"] = __('Map builder'); + $menu["gmap"]["sec2"] = "godmode/reporting/map_builder"; + $menu["gmap"]["id"] = "god-map"; +} if (give_acl ($config['id_user'], 0, "PM")) { // Manage profiles diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index 88b53087d1..5873798793 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -299,7 +299,7 @@ if ($id_layout) { $height = $layout['height']; } -echo "

".__('Reporting')." » ".__('Map builder'); +echo "

".__('Maps')." » ".__('Map builder'); print_help_icon ("map_builder"); echo "

"; @@ -323,14 +323,14 @@ if (! $edit_layout && ! $id_layout) { foreach ($maps as $map) { if (give_acl ($config['id_user'], $map['id_group'], "AW")){ $data = array (); - $data[0] = ''.$map['name'].''; + $data[0] = ''.$map['name'].''; $data[1] = print_group_icon ($map['id_group'], true).' '; $data[1] .= get_group_name ($map['id_group']); $data[2] = get_db_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']); - $data[3] = ''.print_image ("images/pill.png", true).''; + $data[3] = ''.print_image ("images/pill.png", true).''; - $data[4] = ''.print_image ("images/cross.png", true).''; + $data[4] = ''.print_image ("images/cross.png", true).''; array_push ($table->data, $data); } } @@ -338,7 +338,7 @@ if (! $edit_layout && ! $id_layout) { } echo '
'; - echo '
'; + echo ''; print_input_hidden ('edit_layout', 1); print_submit_button (__('Create'), '', false, 'class="sub next"'); echo '
'; @@ -354,7 +354,7 @@ if (! $edit_layout && ! $id_layout) { $table->data[0][1] = print_input_text ('name', $name, '', 15, 50, true); if ($id_layout){ - $table->data[0][1] .= '  '.print_image ("images/pill.png", true).''; + $table->data[0][1] .= '  '.print_image ("images/pill.png", true).''; $table->data[0][1] .= '  '.print_image ("images/eye.png", true).''; } @@ -370,7 +370,7 @@ if (! $edit_layout && ! $id_layout) { $table->data[4][0] = __('Height'); $table->data[4][1] = print_input_text ('height', $height, '', 3, 5, true); } - echo '
'; + echo ''; print_table ($table); echo '
'; @@ -498,7 +498,7 @@ if (! $edit_layout && ! $id_layout) { $table->data[10][1] = print_select_from_sql ('SELECT id, name FROM tlayout WHERE id != '.$id_layout, 'map_linked', '', '', 'None', '', true); - echo ''; + echo ''; print_table ($table); print_input_hidden ('create_layout_data', 1); print_input_hidden ('update_layout_data', 0); diff --git a/pandora_console/images/god9.png b/pandora_console/images/god9.png new file mode 100755 index 0000000000..e8c442f662 Binary files /dev/null and b/pandora_console/images/god9.png differ diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index b3f1a45b19..f15235301a 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -143,6 +143,9 @@ #icon_god-reporting { background-image: url(../../images/reporting_edit.png); } +#icon_god-map { + background-image: url(../../images/god9.png); +} #icon_god-profiles { background-image: url(../../images/god4.png); } diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php index 251c3f04e2..9288d749fe 100644 --- a/pandora_console/operation/visual_console/render_view.php +++ b/pandora_console/operation/visual_console/render_view.php @@ -66,7 +66,7 @@ if ($config["pure"] == 0) { } if (give_acl ($config["id_user"], $id_group, "AW")) - echo ''.print_image ("images/setup.png", true, array ("title" => __('Setup'))).''; + echo ''.print_image ("images/setup.png", true, array ("title" => __('Setup'))).''; echo '';