diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 1dfd0294fc..0e1b39b6bf 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -27,7 +27,7 @@ $menu_godmode['class'] = 'godmode'; if (check_acl ($config['id_user'], 0, "AW") || check_acl ($config['id_user'], 0, "AD")) { $menu_godmode["gagente"]["text"] = __('Resources'); $menu_godmode["gagente"]["sec2"] = "godmode/agentes/modificar_agente"; - $menu_godmode["gagente"]["id"] = "god-agents"; + $menu_godmode["gagente"]["id"] = "god-resources"; if (check_acl ($config['id_user'], 0, "AW")) { $sub = array (); @@ -86,7 +86,7 @@ if (check_acl ($config['id_user'], 0, "UM")) { if (check_acl ($config['id_user'], 0, "PM")) { $menu_godmode["gmodules"]["text"] = __('Configuration'); $menu_godmode["gmodules"]["sec2"] = "godmode/modules/manage_network_templates"; - $menu_godmode["gmodules"]["id"] = "god-modules"; + $menu_godmode["gmodules"]["id"] = "god-configuration"; $sub = array (); diff --git a/pandora_console/images/add_mc.png b/pandora_console/images/add_mc.png old mode 100755 new mode 100644 index 8493a83124..02864d72da Binary files a/pandora_console/images/add_mc.png and b/pandora_console/images/add_mc.png differ diff --git a/pandora_console/images/brick.png b/pandora_console/images/brick.png index d60f7104ca..a141d6b258 100644 Binary files a/pandora_console/images/brick.png and b/pandora_console/images/brick.png differ diff --git a/pandora_console/images/builder.menu.png b/pandora_console/images/builder.menu.png new file mode 100644 index 0000000000..e2f22e94a3 Binary files /dev/null and b/pandora_console/images/builder.menu.png differ diff --git a/pandora_console/images/extensions.menu.png b/pandora_console/images/extensions.menu.png new file mode 100644 index 0000000000..2dabb00740 Binary files /dev/null and b/pandora_console/images/extensions.menu.png differ diff --git a/pandora_console/images/gm_alerts.menu.png b/pandora_console/images/gm_alerts.menu.png new file mode 100644 index 0000000000..09a2a525df Binary files /dev/null and b/pandora_console/images/gm_alerts.menu.png differ diff --git a/pandora_console/images/gm_configuration.menu.png b/pandora_console/images/gm_configuration.menu.png new file mode 100644 index 0000000000..9f8ed00cd8 Binary files /dev/null and b/pandora_console/images/gm_configuration.menu.png differ diff --git a/pandora_console/images/gm_events.menu.png b/pandora_console/images/gm_events.menu.png new file mode 100644 index 0000000000..f1e69a0ff1 Binary files /dev/null and b/pandora_console/images/gm_events.menu.png differ diff --git a/pandora_console/images/gm_monitoring.menu.png b/pandora_console/images/gm_monitoring.menu.png new file mode 100644 index 0000000000..9af2c14e97 Binary files /dev/null and b/pandora_console/images/gm_monitoring.menu.png differ diff --git a/pandora_console/images/gm_resources.menu.png b/pandora_console/images/gm_resources.menu.png new file mode 100644 index 0000000000..9af2c14e97 Binary files /dev/null and b/pandora_console/images/gm_resources.menu.png differ diff --git a/pandora_console/images/gm_servers.menu.png b/pandora_console/images/gm_servers.menu.png new file mode 100644 index 0000000000..9e91271bff Binary files /dev/null and b/pandora_console/images/gm_servers.menu.png differ diff --git a/pandora_console/images/gm_setup.menu.png b/pandora_console/images/gm_setup.menu.png new file mode 100644 index 0000000000..9af2c14e97 Binary files /dev/null and b/pandora_console/images/gm_setup.menu.png differ diff --git a/pandora_console/images/gm_users.menu.png b/pandora_console/images/gm_users.menu.png new file mode 100644 index 0000000000..007d9e63e8 Binary files /dev/null and b/pandora_console/images/gm_users.menu.png differ diff --git a/pandora_console/images/heart_col.png b/pandora_console/images/heart_col.png index 00b2578f3c..91e8cdc9f6 100644 Binary files a/pandora_console/images/heart_col.png and b/pandora_console/images/heart_col.png differ diff --git a/pandora_console/images/house.png b/pandora_console/images/house.png index 4e97921523..d5eb255092 100644 Binary files a/pandora_console/images/house.png and b/pandora_console/images/house.png differ diff --git a/pandora_console/images/op_alerts.menu.png b/pandora_console/images/op_alerts.menu.png new file mode 100644 index 0000000000..6ab2f2cbc4 Binary files /dev/null and b/pandora_console/images/op_alerts.menu.png differ diff --git a/pandora_console/images/op_alerts.png b/pandora_console/images/op_alerts.png old mode 100755 new mode 100644 index 6ab2f2cbc4..0bd9134501 Binary files a/pandora_console/images/op_alerts.png and b/pandora_console/images/op_alerts.png differ diff --git a/pandora_console/images/op_events.menu.png b/pandora_console/images/op_events.menu.png new file mode 100644 index 0000000000..0a30299eed Binary files /dev/null and b/pandora_console/images/op_events.menu.png differ diff --git a/pandora_console/images/op_events.png b/pandora_console/images/op_events.png old mode 100755 new mode 100644 index 6cbce9639c..076cace0e8 Binary files a/pandora_console/images/op_events.png and b/pandora_console/images/op_events.png differ diff --git a/pandora_console/images/op_gis.menu.png b/pandora_console/images/op_gis.menu.png new file mode 100644 index 0000000000..a526f77779 Binary files /dev/null and b/pandora_console/images/op_gis.menu.png differ diff --git a/pandora_console/images/op_gis.png b/pandora_console/images/op_gis.png old mode 100755 new mode 100644 index affca8ea73..e3603ce3a1 Binary files a/pandora_console/images/op_gis.png and b/pandora_console/images/op_gis.png differ diff --git a/pandora_console/images/op_inventory.menu.png b/pandora_console/images/op_inventory.menu.png new file mode 100644 index 0000000000..c32c745f8c Binary files /dev/null and b/pandora_console/images/op_inventory.menu.png differ diff --git a/pandora_console/images/op_inventory.png b/pandora_console/images/op_inventory.png old mode 100755 new mode 100644 index e108cc444a..de544f9ada Binary files a/pandora_console/images/op_inventory.png and b/pandora_console/images/op_inventory.png differ diff --git a/pandora_console/images/op_monitoring.menu.png b/pandora_console/images/op_monitoring.menu.png new file mode 100644 index 0000000000..e67807bce2 Binary files /dev/null and b/pandora_console/images/op_monitoring.menu.png differ diff --git a/pandora_console/images/op_monitoring.png b/pandora_console/images/op_monitoring.png old mode 100755 new mode 100644 index f964c68fb2..68365946c3 Binary files a/pandora_console/images/op_monitoring.png and b/pandora_console/images/op_monitoring.png differ diff --git a/pandora_console/images/op_netflow.menu.png b/pandora_console/images/op_netflow.menu.png new file mode 100644 index 0000000000..72deabbf26 Binary files /dev/null and b/pandora_console/images/op_netflow.menu.png differ diff --git a/pandora_console/images/op_network.menu.png b/pandora_console/images/op_network.menu.png new file mode 100644 index 0000000000..61c6e915c5 Binary files /dev/null and b/pandora_console/images/op_network.menu.png differ diff --git a/pandora_console/images/op_recon.menu.png b/pandora_console/images/op_recon.menu.png new file mode 100644 index 0000000000..c148f5d81b Binary files /dev/null and b/pandora_console/images/op_recon.menu.png differ diff --git a/pandora_console/images/op_recon.png b/pandora_console/images/op_recon.png old mode 100755 new mode 100644 index a2971d8ed3..631665baf6 Binary files a/pandora_console/images/op_recon.png and b/pandora_console/images/op_recon.png differ diff --git a/pandora_console/images/op_reporting.menu.png b/pandora_console/images/op_reporting.menu.png new file mode 100644 index 0000000000..8929df8db4 Binary files /dev/null and b/pandora_console/images/op_reporting.menu.png differ diff --git a/pandora_console/images/op_reporting.png b/pandora_console/images/op_reporting.png old mode 100755 new mode 100644 index 8929df8db4..a0cde2d12d Binary files a/pandora_console/images/op_reporting.png and b/pandora_console/images/op_reporting.png differ diff --git a/pandora_console/images/op_satellite.menu.png b/pandora_console/images/op_satellite.menu.png new file mode 100644 index 0000000000..e948e21bae Binary files /dev/null and b/pandora_console/images/op_satellite.menu.png differ diff --git a/pandora_console/images/op_satellite.png b/pandora_console/images/op_satellite.png old mode 100755 new mode 100644 index 4912a49998..e948e21bae Binary files a/pandora_console/images/op_satellite.png and b/pandora_console/images/op_satellite.png differ diff --git a/pandora_console/images/op_snmp.menu.png b/pandora_console/images/op_snmp.menu.png new file mode 100644 index 0000000000..b43951c9fd Binary files /dev/null and b/pandora_console/images/op_snmp.menu.png differ diff --git a/pandora_console/images/op_workspace.menu.png b/pandora_console/images/op_workspace.menu.png new file mode 100644 index 0000000000..b2abde99b4 Binary files /dev/null and b/pandora_console/images/op_workspace.menu.png differ diff --git a/pandora_console/images/op_workspace.png b/pandora_console/images/op_workspace.png old mode 100755 new mode 100644 index 7a383a1687..b2abde99b4 Binary files a/pandora_console/images/op_workspace.png and b/pandora_console/images/op_workspace.png differ diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css index 572cffae6f..542fd824fd 100644 --- a/pandora_console/include/styles/menu.css +++ b/pandora_console/include/styles/menu.css @@ -135,90 +135,66 @@ li:hover ul { display: block; } /* Icons specified here */ #icon_oper-networkconsole { - background: url(../../images/op_network.png) no-repeat 50% 50%; + background: url(../../images/op_network.menu.png) no-repeat 50% 50%; } #icon_oper-agents { border-top-right-radius: 5px; border-right-style: solid; border-right-width: 0px; - background: url(../../images/op_monitoring.png) no-repeat 50% 50%; + background: url(../../images/op_monitoring.menu.png) no-repeat 50% 50%; } #icon_oper-events { - background: url(../../images/op_events.png) no-repeat 50% 50%; + background: url(../../images/op_events.menu.png) no-repeat 50% 50%; } /* users */ #icon_oper-users { - background: url(../../images/op_workspace.png) no-repeat 50% 50%; + background: url(../../images/op_workspace.menu.png) no-repeat 50% 50%; } /* trap console */ #icon_oper-snmpc, #icon_god-snmpc { - background: url(../../images/op_snmp.png) no-repeat 50% 50%; + background: url(../../images/op_snmp.menu.png) no-repeat 50% 50%; } #icon_oper-reporting { - background: url(../../images/op_reporting.png) no-repeat 50% 50%; + background: url(../../images/op_reporting.menu.png) no-repeat 50% 50%; } #icon_oper-gismaps { - background: url(../../images/op_gis.png) no-repeat 50% 50%; + background: url(../../images/op_gis.menu.png) no-repeat 50% 50%; } #icon_oper-netflow { - background: url(../../images/op_netflow.png) no-repeat 50% 50%; + background: url(../../images/op_netflow.menu.png) no-repeat 50% 50%; } -#icon_oper-extensions, #icon_god-extensions { - background: url(../../images/extensions.png) no-repeat 50% 50%; +#icon_oper-extensions { + background: url(../../images/extensions.menu.png) no-repeat 50% 50%; } /* Godmode images */ -#icon_god-gismaps { - background: url(../../images/gm_gis.png) no-repeat 50% 50%; +#icon_god-resources { + background: url(../../images/gm_resources.menu.png) no-repeat 50% 50%; } -#icon_god-agents { - background: url(../../images/gm_monitoring.png) no-repeat 50% 50%; -} -#icon_god-massive { - background: url(../../images/gm_massive_operations.png) no-repeat 50% 50%; -} -#icon_god-services { - background: url(../../images/box.png) no-repeat 50% 50%; -} -#icon_god-modules { - background: url(../../images/gm_modules.png) no-repeat 50% 50%; +#icon_god-configuration { + background: url(../../images/gm_configuration.menu.png) no-repeat 50% 50%; } #icon_god-alerts { - background: url(../../images/gm_alerts.png) no-repeat 50% 50%; -} -#icon_god-dbmaint { - background: url(../../images/gm_db.png) no-repeat 50% 50%; + background: url(../../images/gm_alerts.menu.png) no-repeat 50% 50%; } #icon_god-users { - background: url(../../images/gm_users.png) no-repeat 50% 50%; + background: url(../../images/gm_users.menu.png) no-repeat 50% 50%; } #icon_god-reporting { - background: url(../../images/reporting_edit.png) no-repeat 50% 50%; + background: url(../../images/reporting_edit.menu.png) no-repeat 50% 50%; } #icon_god-servers { - background: url(../../images/gm_servers.png) no-repeat 50% 50%; -} -#icon_god-audit { - background: url(../../images/gm_log.png) no-repeat 50% 50%; -} -#icon_god-netflow { - background: url(../../images/gm_netflow.png) no-repeat 50% 50%; + background: url(../../images/gm_servers.menu.png) no-repeat 50% 50%; } #icon_god-setup { - background: url(../../images/gm_setup.png) no-repeat 50% 50%; -} -#icon_god-policies { - background: url(../../images/gm_policies.png) no-repeat 50% 50%; -} -#icon_oper-inventory { - background: url(../../images/page_white_text.png) no-repeat 50% 50%; -} -#icon_god-tag { - background: url(../../images/tag_red.png) no-repeat 50% 50%; + background: url(../../images/gm_setup.menu.png) no-repeat 50% 50%; } #icon_god-events { - background: url(../../images/gm_events.png) no-repeat 50% 50%; + background: url(../../images/gm_events.menu.png) no-repeat 50% 50%; +} +#icon_god-extensions { + background: url(../../images/builder.menu.png) no-repeat 50% 50%; } #menu_container { diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 976b14b0cb..9c8568b32a 100755 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -2953,6 +2953,10 @@ table#policy_modules td * { .godmode{ border-top: 4px solid !important; + padding-bottom: 4px !important; + border-bottom-right-radius: 5px; + border-right-style: solid; + border-right-width: 0px; } /* The items with the class 'spinner' will rotate */ /* Not supported on IE9 and below */