diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a4b7ab1099..ad7ebfcacb 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,65 @@ +2013-04-15 Sergio Martin + + * include/functions_html.php + include/styles/pandora.css + include/functions_ui.php + include/functions_graph.php + include/functions_events.php + include/graphs/functions_flot.php + include/graphs/flot/pandora.flot.js + include/graphs/fgraph.php + operation/events/events_list.php + operation/agentes/estado_generalagente.php + operation/agentes/stat_win.php + images/file.png + images/collection_col.png + images/input_update.disabled.png + images/input_wand.disabled.png + images/heart_col.png + images/calendar_view_day.png + images/reporting.png + images/input_tick.png + images/input_zoom.disabled.png + images/input_tick.disabled.png + images/input_go.disabled.png + images/clock.png + images/input_pdf.disabled.png + images/tree.png + images/groups_small/transmit.png + images/groups_small/drive_network.png + images/groups_small/eye.png + images/groups_small/printer.png + images/groups_small/lightning.png + images/groups_small/clock.png + images/groups_small/bricks.png + images/groups_small/chart_organisation.png + images/groups_small/world.png + images/groups_small/lock.png + images/groups_small/network.png + images/groups_small/plugin.png + images/groups_small/images.png + images/groups_small/without_group.png + images/groups_small/mail.png + images/groups_small/house.png + images/groups_small/application_osx_terminal.png + images/groups_small/server_database.png + images/groups_small/computer.png + images/groups_small/database_gear.png + images/groups_small/heart.png + images/groups_small/firewall.png + images/groups_small/applications.png + images/input_delete.disabled.png + images/input_filter.disabled.png + images/category_col.png + images/input_cog.disabled.png + images/input_add.disabled.png + images/input_cross.disabled.png + images/recon.png + images/pandora_header_logo.png + images/dashboard_col.png + images/input_config.disabled.png: Change groups icons, + change more icons and images and fix some layout bugs + 2013-04-13 Junichi Satoh * include/help/ja/help_meta_access.php: Added a new help file. diff --git a/pandora_console/images/calendar_view_day.png b/pandora_console/images/calendar_view_day.png index 945af71e33..1fb83613e0 100644 Binary files a/pandora_console/images/calendar_view_day.png and b/pandora_console/images/calendar_view_day.png differ diff --git a/pandora_console/images/category_col.png b/pandora_console/images/category_col.png new file mode 100644 index 0000000000..89b5ffab7d Binary files /dev/null and b/pandora_console/images/category_col.png differ diff --git a/pandora_console/images/clock.png b/pandora_console/images/clock.png index 9906fb26f9..bb410c8a53 100644 Binary files a/pandora_console/images/clock.png and b/pandora_console/images/clock.png differ diff --git a/pandora_console/images/collection_col.png b/pandora_console/images/collection_col.png new file mode 100644 index 0000000000..1da83176aa Binary files /dev/null and b/pandora_console/images/collection_col.png differ diff --git a/pandora_console/images/dashboard_col.png b/pandora_console/images/dashboard_col.png new file mode 100644 index 0000000000..4a19f4dee9 Binary files /dev/null and b/pandora_console/images/dashboard_col.png differ diff --git a/pandora_console/images/file.png b/pandora_console/images/file.png index d0d400ec64..7a56880d80 100644 Binary files a/pandora_console/images/file.png and b/pandora_console/images/file.png differ diff --git a/pandora_console/images/groups_small/application_osx_terminal.png b/pandora_console/images/groups_small/application_osx_terminal.png index c5b797a7df..82287eb336 100644 Binary files a/pandora_console/images/groups_small/application_osx_terminal.png and b/pandora_console/images/groups_small/application_osx_terminal.png differ diff --git a/pandora_console/images/groups_small/applications.png b/pandora_console/images/groups_small/applications.png index 971897f1b3..94b4d6980f 100644 Binary files a/pandora_console/images/groups_small/applications.png and b/pandora_console/images/groups_small/applications.png differ diff --git a/pandora_console/images/groups_small/bricks.png b/pandora_console/images/groups_small/bricks.png index 678cb4d957..c234efafb6 100644 Binary files a/pandora_console/images/groups_small/bricks.png and b/pandora_console/images/groups_small/bricks.png differ diff --git a/pandora_console/images/groups_small/chart_organisation.png b/pandora_console/images/groups_small/chart_organisation.png index 55595a7de5..5e86e49933 100644 Binary files a/pandora_console/images/groups_small/chart_organisation.png and b/pandora_console/images/groups_small/chart_organisation.png differ diff --git a/pandora_console/images/groups_small/clock.png b/pandora_console/images/groups_small/clock.png index 9906fb26f9..4efbcbb0e6 100644 Binary files a/pandora_console/images/groups_small/clock.png and b/pandora_console/images/groups_small/clock.png differ diff --git a/pandora_console/images/groups_small/computer.png b/pandora_console/images/groups_small/computer.png index d07d5fde68..6fe184d031 100644 Binary files a/pandora_console/images/groups_small/computer.png and b/pandora_console/images/groups_small/computer.png differ diff --git a/pandora_console/images/groups_small/database_gear.png b/pandora_console/images/groups_small/database_gear.png index 1cb5d576ee..ca91e8ba31 100644 Binary files a/pandora_console/images/groups_small/database_gear.png and b/pandora_console/images/groups_small/database_gear.png differ diff --git a/pandora_console/images/groups_small/drive_network.png b/pandora_console/images/groups_small/drive_network.png index c9c79e2529..952cf5352c 100644 Binary files a/pandora_console/images/groups_small/drive_network.png and b/pandora_console/images/groups_small/drive_network.png differ diff --git a/pandora_console/images/groups_small/eye.png b/pandora_console/images/groups_small/eye.png index 564a1a9714..f0945b8477 100644 Binary files a/pandora_console/images/groups_small/eye.png and b/pandora_console/images/groups_small/eye.png differ diff --git a/pandora_console/images/groups_small/firewall.png b/pandora_console/images/groups_small/firewall.png index e48dab6e2e..968829e9a5 100644 Binary files a/pandora_console/images/groups_small/firewall.png and b/pandora_console/images/groups_small/firewall.png differ diff --git a/pandora_console/images/groups_small/heart.png b/pandora_console/images/groups_small/heart.png index 3acb57dc97..4f9f837200 100644 Binary files a/pandora_console/images/groups_small/heart.png and b/pandora_console/images/groups_small/heart.png differ diff --git a/pandora_console/images/groups_small/house.png b/pandora_console/images/groups_small/house.png index a46fb22206..f39a857f36 100644 Binary files a/pandora_console/images/groups_small/house.png and b/pandora_console/images/groups_small/house.png differ diff --git a/pandora_console/images/groups_small/images.png b/pandora_console/images/groups_small/images.png index 184860d1e0..99d51bac03 100644 Binary files a/pandora_console/images/groups_small/images.png and b/pandora_console/images/groups_small/images.png differ diff --git a/pandora_console/images/groups_small/lightning.png b/pandora_console/images/groups_small/lightning.png index cdc9e4904f..779f868627 100644 Binary files a/pandora_console/images/groups_small/lightning.png and b/pandora_console/images/groups_small/lightning.png differ diff --git a/pandora_console/images/groups_small/lock.png b/pandora_console/images/groups_small/lock.png index 0bd7647132..b9287acacc 100644 Binary files a/pandora_console/images/groups_small/lock.png and b/pandora_console/images/groups_small/lock.png differ diff --git a/pandora_console/images/groups_small/mail.png b/pandora_console/images/groups_small/mail.png new file mode 100644 index 0000000000..20ff18e9b8 Binary files /dev/null and b/pandora_console/images/groups_small/mail.png differ diff --git a/pandora_console/images/groups_small/network.png b/pandora_console/images/groups_small/network.png index 5c140d838d..fe220ca354 100644 Binary files a/pandora_console/images/groups_small/network.png and b/pandora_console/images/groups_small/network.png differ diff --git a/pandora_console/images/groups_small/plugin.png b/pandora_console/images/groups_small/plugin.png index 2de742d0e5..ca47bb56cd 100644 Binary files a/pandora_console/images/groups_small/plugin.png and b/pandora_console/images/groups_small/plugin.png differ diff --git a/pandora_console/images/groups_small/printer.png b/pandora_console/images/groups_small/printer.png index 12a4e39dd3..e428d42697 100644 Binary files a/pandora_console/images/groups_small/printer.png and b/pandora_console/images/groups_small/printer.png differ diff --git a/pandora_console/images/groups_small/server_database.png b/pandora_console/images/groups_small/server_database.png index 3bf1440e71..4ac6bcae76 100644 Binary files a/pandora_console/images/groups_small/server_database.png and b/pandora_console/images/groups_small/server_database.png differ diff --git a/pandora_console/images/groups_small/transmit.png b/pandora_console/images/groups_small/transmit.png index f54bf736cd..75ae52e14c 100644 Binary files a/pandora_console/images/groups_small/transmit.png and b/pandora_console/images/groups_small/transmit.png differ diff --git a/pandora_console/images/groups_small/without_group.png b/pandora_console/images/groups_small/without_group.png index 5877331319..5cc0e51dfb 100644 Binary files a/pandora_console/images/groups_small/without_group.png and b/pandora_console/images/groups_small/without_group.png differ diff --git a/pandora_console/images/groups_small/world.png b/pandora_console/images/groups_small/world.png index 8ec6efe8db..12b348a26b 100644 Binary files a/pandora_console/images/groups_small/world.png and b/pandora_console/images/groups_small/world.png differ diff --git a/pandora_console/images/heart_col.png b/pandora_console/images/heart_col.png new file mode 100644 index 0000000000..3687b42a2e Binary files /dev/null and b/pandora_console/images/heart_col.png differ diff --git a/pandora_console/images/input_add.disabled.png b/pandora_console/images/input_add.disabled.png new file mode 100644 index 0000000000..d6f86609db Binary files /dev/null and b/pandora_console/images/input_add.disabled.png differ diff --git a/pandora_console/images/input_cog.disabled.png b/pandora_console/images/input_cog.disabled.png new file mode 100644 index 0000000000..d8f75228ca Binary files /dev/null and b/pandora_console/images/input_cog.disabled.png differ diff --git a/pandora_console/images/input_config.disabled.png b/pandora_console/images/input_config.disabled.png new file mode 100644 index 0000000000..13886a8f20 Binary files /dev/null and b/pandora_console/images/input_config.disabled.png differ diff --git a/pandora_console/images/input_cross.disabled.png b/pandora_console/images/input_cross.disabled.png new file mode 100644 index 0000000000..fc44da554b Binary files /dev/null and b/pandora_console/images/input_cross.disabled.png differ diff --git a/pandora_console/images/input_delete.disabled.png b/pandora_console/images/input_delete.disabled.png new file mode 100644 index 0000000000..6761109a9f Binary files /dev/null and b/pandora_console/images/input_delete.disabled.png differ diff --git a/pandora_console/images/input_filter.disabled.png b/pandora_console/images/input_filter.disabled.png new file mode 100644 index 0000000000..53de15ff60 Binary files /dev/null and b/pandora_console/images/input_filter.disabled.png differ diff --git a/pandora_console/images/input_go.disabled.png b/pandora_console/images/input_go.disabled.png new file mode 100644 index 0000000000..fdedc947d8 Binary files /dev/null and b/pandora_console/images/input_go.disabled.png differ diff --git a/pandora_console/images/input_pdf.disabled.png b/pandora_console/images/input_pdf.disabled.png new file mode 100644 index 0000000000..3435dc8769 Binary files /dev/null and b/pandora_console/images/input_pdf.disabled.png differ diff --git a/pandora_console/images/input_tick.disabled.png b/pandora_console/images/input_tick.disabled.png new file mode 100644 index 0000000000..9e6ec99c2e Binary files /dev/null and b/pandora_console/images/input_tick.disabled.png differ diff --git a/pandora_console/images/input_tick.png b/pandora_console/images/input_tick.png index 5b683ac92e..ad67b4471e 100644 Binary files a/pandora_console/images/input_tick.png and b/pandora_console/images/input_tick.png differ diff --git a/pandora_console/images/input_update.disabled.png b/pandora_console/images/input_update.disabled.png new file mode 100644 index 0000000000..980339559e Binary files /dev/null and b/pandora_console/images/input_update.disabled.png differ diff --git a/pandora_console/images/input_wand.disabled.png b/pandora_console/images/input_wand.disabled.png new file mode 100644 index 0000000000..2c0ea531df Binary files /dev/null and b/pandora_console/images/input_wand.disabled.png differ diff --git a/pandora_console/images/input_zoom.disabled.png b/pandora_console/images/input_zoom.disabled.png new file mode 100644 index 0000000000..89cfd2c41d Binary files /dev/null and b/pandora_console/images/input_zoom.disabled.png differ diff --git a/pandora_console/images/pandora_header_logo.png b/pandora_console/images/pandora_header_logo.png index 39e8e7d380..2f5b60fb37 100644 Binary files a/pandora_console/images/pandora_header_logo.png and b/pandora_console/images/pandora_header_logo.png differ diff --git a/pandora_console/images/recon.png b/pandora_console/images/recon.png index 7735227c8f..9c11c5bf15 100755 Binary files a/pandora_console/images/recon.png and b/pandora_console/images/recon.png differ diff --git a/pandora_console/images/reporting.png b/pandora_console/images/reporting.png index a6b1268d35..4a871497e0 100644 Binary files a/pandora_console/images/reporting.png and b/pandora_console/images/reporting.png differ diff --git a/pandora_console/images/tree.png b/pandora_console/images/tree.png index bd5bbf5edd..df648aa4b4 100644 Binary files a/pandora_console/images/tree.png and b/pandora_console/images/tree.png differ diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php index 64e48a5c89..5bb250a9a1 100644 --- a/pandora_console/include/functions_events.php +++ b/pandora_console/include/functions_events.php @@ -964,118 +964,55 @@ function events_print_type_img ($type, $return = false, $only_url = false) { switch ($type) { case "alert_recovered": - if ($only_url) { - $output = $urlImage . "/" . "images/error.png"; - } - else { - $output .= html_print_image ("images/error.png", true, - array ("title" => events_print_type_description($type, true))); - } + $icon = "bell.png"; break; case "alert_manual_validation": - if ($only_url) { - $output = $urlImage . "/" . "images/eye.png"; - } - else { - $output .= html_print_image ("images/eye.png", true, - array ("title" => events_print_type_description($type, true))); - } - break; - case "going_up_warning": - if ($only_url) { - $output = $urlImage . "/" . "images/b_yellow.png"; - } - else { - $output .= html_print_image ("images/b_yellow.png", true, - array ("title" => events_print_type_description($type, true))); - } + $icon = "ok.png"; break; case "going_down_critical": case "going_up_critical": //This is to be backwards compatible - if ($only_url) { - $output = $urlImage . "/" . "images/b_red.png"; - } - else { - $output .= html_print_image ("images/b_red.png", true, - array ("title" => events_print_type_description($type, true))); - } + $icon = "module_critical.png"; break; case "going_up_normal": case "going_down_normal": //This is to be backwards compatible - if ($only_url) { - $output = $urlImage . "/" . "images/b_green.png"; - } - else { - $output .= html_print_image ("images/b_green.png", true, - array ("title" => events_print_type_description($type, true))); - } + $icon = "module_ok.png"; break; + case "going_up_warning": case "going_down_warning": - if ($only_url) { - $output = $urlImage . "/" . "images/b_yellow.png"; - } - else { - $output .= html_print_image ("images/b_yellow.png", true, - array ("title" => events_print_type_description($type, true))); - } + $icon = "module_warning.png"; break; case "going_unknown": - if ($only_url) { - $output = $urlImage . "/" . "images/b_blue.png"; - } - else { - $output .= html_print_image ("images/b_blue.png", true, - array ("title" => events_print_type_description($type, true))); - } + $icon = "module_unknown.png"; break; case "alert_fired": - if ($only_url) { - $output = $urlImage . "/" . "images/bell.png"; - } - else { - $output .= html_print_image ("images/bell.png", true, - array ("title" => events_print_type_description($type, true))); - } + $icon = "bell_error.png"; break; case "system": - if ($only_url) { - $output = $urlImage . "/" . "images/cog.png"; - } - else { - $output .= html_print_image ("images/cog.png", true, - array ("title" => events_print_type_description($type, true))); - } + $icon = "cog.png"; break; case "recon_host_detected": - if ($only_url) { - $output = $urlImage . "/" . "images/network.png"; - } - else { - $output .= html_print_image ("images/network.png", true, - array ("title" => events_print_type_description($type, true))); - } + $icon = "recon.png"; break; case "new_agent": - if ($only_url) { - $output = $urlImage . "/" . "images/wand.png"; - } - else { - $output .= html_print_image ("images/wand.png", true, - array ("title" => events_print_type_description($type, true))); - } + $icon = "agent.png"; + break; + case "configuration_change": + $icon = "config.png"; break; case "unknown": default: - if ($only_url) { - $output = $urlImage . "/" . "images/err.png"; - } - else { - $output .= html_print_image ("images/err.png", true, - array ("title" => events_print_type_description($type, true))); - } + $icon = "lightning_go.png"; break; } + if ($only_url) { + $output = $urlImage . "/" . "images/" . $icon; + } + else { + $output .= html_print_image ("images/" . $icon, true, + array ("title" => events_print_type_description($type, true))); + } + if ($return) return $output; echo $output; diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index d4e7904a4a..c4ae1acc71 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1328,7 +1328,7 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0, $return = $out = area_graph($config['flash_charts'], $data, $width, $height, null, null, null, ui_get_full_url("images/image_problem.opaque.png"), "", "", ui_get_full_url(false, false, false, false), $water_mark, - $config['fontpath'], $config['font_size'], ""); + $config['fontpath'], $config['font_size'], "", 1, array(), array(), 0, 0, '', false, '', false); } if($return) { diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 3e61cba3ec..49eb50f223 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -161,7 +161,7 @@ function html_print_side_layer ($params) { break; } - $out_html = '