From e287a5bda2a3ecf7d508fae6fb1261c6d0e72158 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Tue, 9 Jan 2007 11:18:41 +0000 Subject: [PATCH] 2007-01-09 Raul Mateos * operation/menu.php: Style correction (not enough). * include/op.css: Solve small bug with hover in reporting icon. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@356 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +- pandora_console/include/styles/op.css | 2 +- pandora_console/operation/menu.php | 101 +++++++++++++++----------- 3 files changed, 67 insertions(+), 43 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 6c24937e6b..f6139fe46e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2007-01-09 Raul Mateos + + * operation/menu.php: Style correction (not enough). + + * include/op.css: Solve small bug with hover in reporting icon. + 2007-01-08 Manuel Arostegui * pandora_console.spec: Changed group. @@ -8,7 +14,6 @@ chaotic :-). Almost all code it's break apart, so no problems should not be generated. New graphical console will be called "Active console", as temporal name. - * pandora_graphical_console.sql: New SQL for active console. diff --git a/pandora_console/include/styles/op.css b/pandora_console/include/styles/op.css index d8e8aeeb06..f2ba9816f3 100644 --- a/pandora_console/include/styles/op.css +++ b/pandora_console/include/styles/op.css @@ -42,7 +42,7 @@ div#op7s>ul, div#op8s>ul, div#op9s>ul { #op8 li, #op8 li:hover, #op8s li { background: url(../../images/op8.gif) no-repeat 4px 3px; } -#op9 li, #op8 li:hover, #op9s li { +#op9 li, #op9 li:hover, #op9s li { background: url(../../images/op9.gif) no-repeat 4px 3px; } div.arrow>ul, div.arrows>ul { diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index b2ba99c68e..60fd36014b 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -35,42 +35,47 @@ if (! isset($_SESSION["id_usuario"])) { // Agent read, Server read if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/estado_grupo") + if (isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/estado_grupo") { echo '
'; - else + } else { echo ''; if (isset($_GET["sec"]) && $_GET["sec"] == "estado"){ - if(isset($_GET["sec2"]) && ($_GET["sec2"] == "operation/agentes/estado_agente" || $_GET["sec2"] == "operation/agentes/ver_agente" || $_GET["sec2"] == "operation/agentes/datos_agente")) + if (isset($_GET["sec2"]) && ($_GET["sec2"] == "operation/agentes/estado_agente" || $_GET["sec2"] == "operation/agentes/ver_agente" || $_GET["sec2"] == "operation/agentes/datos_agente")) { echo "
"; - else + } else { echo ""; - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/estado_alertas") + if (isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/estado_alertas"){ echo "
"; - else + } else { echo ""; - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/status_monitor") + if (isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/status_monitor") { echo "
"; - else + } else { echo ""; - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/exportdata") + if (isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/exportdata") { echo "
"; - else + } else { echo ""; - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/estadisticas") + if (isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/estadisticas") { echo "
"; - else + } else { echo ""; } @@ -80,10 +85,11 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { echo ''.$lang_label["active_console"].'
'; // Server view - if ( isset($_GET["sec2"]) && $_GET["sec2"] == "operation/servers/view_server") + if ( isset($_GET["sec2"]) && $_GET["sec2"] == "operation/servers/view_server") { echo '
'; - else + } else { echo '
'; + } echo '
'; } @@ -91,23 +97,26 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { // Check access for incident if (give_acl($_SESSION["id_usuario"], 0, "IR")==1) { - if(isset($_GET["sec2"]) && ($_GET["sec2"] == "operation/incidents/incident" || $_GET["sec2"] == "operation/incidents/incident_detail"|| $_GET["sec2"] == "operation/incidents/incident_note")) + if(isset($_GET["sec2"]) && ($_GET["sec2"] == "operation/incidents/incident" || $_GET["sec2"] == "operation/incidents/incident_detail"|| $_GET["sec2"] == "operation/incidents/incident_note")) { echo '
'; - else + } else { echo ''; if (isset($_GET["sec"]) && $_GET["sec"] == "incidencias"){ if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/incidents/incident_search") { echo "
"; + } else { + echo "
"; } - else echo ""; - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/incidents/incident_statistics") { + if (isset($_GET["sec2"]) && $_GET["sec2"] == "operation/incidents/incident_statistics") { echo "
"; + } else { + echo "
"; } - else echo ""; } } @@ -117,80 +126,90 @@ if (give_acl($_SESSION["id_usuario"], 0, "IR")==1) { if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { // Events - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/events/events") + if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/events/events") { echo '
'; - else + } else { echo ''; // Event statistics submenu if (isset($_GET["sec"]) && $_GET["sec"] == "eventos"){ - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/events/event_statistics") + if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/events/event_statistics") { echo "
"; - else + } else { echo ""; } // Users - if(isset($_GET["sec2"]) && ($_GET["sec2"] == "operation/users/user" || $_GET["sec2"] == "operation/users/user_edit" )) + if(isset($_GET["sec2"]) && ($_GET["sec2"] == "operation/users/user" || $_GET["sec2"] == "operation/users/user_edit" )) { echo '
'; - else + } else { echo ''; // User edit (submenu) if (isset($_GET["sec"]) && $_GET["sec"] == "usuarios"){ - if(isset($_GET["ver"]) && $_GET["ver"] == $_SESSION["id_usuario"]) + if(isset($_GET["ver"]) && $_GET["ver"] == $_SESSION["id_usuario"]) { echo "
"; - else + } else { echo ""; // User statistic - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/users/user_statistics") + if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/users/user_statistics") { echo "
"; - else + } else { echo ""; } // SNMP console - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/snmpconsole/snmp_view") + if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/snmpconsole/snmp_view") { echo '
'; - else + } else { echo ''; // SNMP Console alert (submenu) if (isset($_GET["sec"]) && $_GET["sec"] == "snmpconsole"){ - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/snmpconsole/snmp_alert") + if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/snmpconsole/snmp_alert") { echo "
"; - else + } else { echo ""; } // Messages - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/messages/message" && !isset($_GET["nuevo_g"])) + if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/messages/message" && !isset($_GET["nuevo_g"])) { echo '
'; - else + } else { echo ''; // New message (submenu) if (isset($_GET["sec"]) && $_GET["sec"] == "messages"){ - if(isset($_GET["sec2"]) && isset($_GET["nuevo_g"])) + if(isset($_GET["sec2"]) && isset($_GET["nuevo_g"])) { echo "
"; - else + } else { echo ""; } - // Reporing - if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/reporting/reporting" && !isset($_GET["nuevo_g"])) + // Reporting + if (isset($_GET["sec2"]) && $_GET["sec2"] == "operation/reporting/reporting") { echo '
'; - else + } else { echo ''; // New message (reporting)