diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index cd586b7fb4..b1ef8354e2 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2006-12-15 Raul Mateos + + * include/styles/op.css, god.css: Solved detected problem, + more style simplification. + + * godmode/menu.php, operation/menu.php: Updated files to + styles. + 2006-12-15 Sancho Lerena * include/styles/op.css: Added new op8. FIXME: There is a little diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index 4812f4a851..fb74a8b63d 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -41,15 +41,15 @@ if (comprueba_login() == 0){ if (isset($_GET["sec"]) && $_GET["sec"] == "gagente"){ if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/agentes/manage_config"){ - echo "
"; + echo "
"; } - else echo "
"; + else echo "
"; echo "
"; if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/grupos/lista_grupos" || $_GET["sec2"] == "godmode/grupos/configurar_grupo")){ - echo "
"; + echo "
"; } - else echo "
"; + else echo "
"; echo "
"; } } @@ -94,9 +94,9 @@ if (comprueba_login() == 0){ if (isset($_GET["sec"]) && $_GET["sec"] == "gsetup"){ if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/setup/links"){ - echo "
"; + echo "
"; } - else echo "
"; + else echo "
"; echo "
"; } } @@ -109,33 +109,33 @@ if (comprueba_login() == 0){ if (isset($_GET["sec"]) && $_GET["sec"] == "gdbman"){ if (isset($_GET["sec2"]) && ($_GET["sec2"] == "godmode/db/db_info" || $_GET["sec2"] == "godmode/db/db_info_data")){ - echo "
"; + echo "
"; } - else echo "
"; + else echo "
"; echo "
"; if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/db/db_purge"){ - echo "
"; + echo "
"; } - else echo "
"; + else echo "
"; echo "
"; if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/db/db_refine"){ - echo "
"; + echo "
"; } - else echo "
"; + else echo "
"; echo "
"; if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/db/db_audit"){ - echo "
"; + echo "
"; } - else echo "
"; + else echo "
"; echo "
"; if (isset($_GET["sec2"]) && $_GET["sec2"] == "godmode/db/db_event"){ - echo "
"; + echo "
"; } - else echo "
"; + else echo "
"; echo "
"; } } diff --git a/pandora_console/include/styles/god.css b/pandora_console/include/styles/god.css index bd983ac89a..86d39f39c2 100644 --- a/pandora_console/include/styles/god.css +++ b/pandora_console/include/styles/god.css @@ -43,25 +43,13 @@ div#god5s>ul, div#god6s>ul, div#god7s>ul, div#god8s>ul { #god8 li, #god8 li:hover, #god8s li { background: url(../../images/god8.gif) no-repeat 5px 3px; } -#arrowg1 ul, #arrowg2 ul, #arrowg3 ul, #arrowg4 ul, #arrowg5 ul { - padding: 0px 0px 0px 0px; - list-style: none; - } -#arrowg1 li, #arrowg2 li, #arrowg3 li, #arrowg4 li, #arrowg5 li, #arrowgs1 li, -#arrowgs2 li, #arrowgs3 li, #arrowgs4 li, #arrowgs5 li { - padding: 0px 0px 0px 15px; - position: relative; - left: 30px; - width: 80%; +div.arrowg>ul, div.arrowgs>ul { + width: 74%; } -div#arrowg1>ul, div#arrowg2>ul, div#arrowg3>ul, div#arrowg4>ul, div#arrowg5>ul, -div#arrowgs1>ul, div#arrowgs2>ul, div#arrowgs3>ul,div#arrowgs4>ul, div#arrowgs5>ul { - width: 88%; - } -#arrowg1 li, #arrowg1 li:hover, #arrowgs1 li, #arrowg2 li, #arrowg2 li:hover, #arrowgs2 li, -#arrowg3 li, #arrowg3 li:hover, #arrowgs3 li, #arrowg4 li, #arrowg4 li:hover, #arrowgs4 li, -#arrowg5 li, #arrowg5 li:hover, #arrowgs5 li { +.arrowg li, .arrowg li:hover, .arrowgs li { background: url(../../images/arrow.gif) no-repeat 2px 4px; + margin-left: 26px; + padding: 0px 0px 0px 14px; } div#menug { background-color: #f5f5dc; @@ -72,8 +60,8 @@ div#menug { #god a:hover, #god1 li:hover, #god1s li, #god2 li:hover, #god2s li, #god3 li:hover, #god3s li, #god4 li:hover, #god4s li, #god5 li:hover, #god5s li, #god6 li:hover, #god6s li, -#god7 li:hover, #god7s li, #god8 li:hover, #god8s li, -#arrowg1 li:hover, #arrowg2 li:hover, #arrowg3 li:hover, #arrowg4 li:hover, -#arrowg5 li:hover, #arrowgs1 li, #arrowgs2 li, #arrowgs3 li, #arrowgs4 li, #arrowgs5 li { +#god7 li:hover, #god7s li, #god8 li:hover, #god8s li, +.arrowg li:hover, .arrowgs li + { background-color: #efefbd; } \ No newline at end of file diff --git a/pandora_console/include/styles/op.css b/pandora_console/include/styles/op.css index 3c9374c161..403af3aafb 100644 --- a/pandora_console/include/styles/op.css +++ b/pandora_console/include/styles/op.css @@ -14,8 +14,9 @@ #op1s li, #op2s li, #op3s li, #op4s li, #op5s li, #op6s li, #op7s li, #op8s li { padding: 0px 0px 0px 28px; } -div#op1>ul, div#op2>ul, div#op3>ul, div#op4>ul, div#op5>ul, div#op6>ul, div#op7>ul, div#op8>ul -div#op1s>ul, div#op2s>ul, div#op3s>ul, div#op4s>ul, div#op5s>ul, div#op6s>ul, div#op7s>ul, div#op8s>ul { +div#op1>ul, div#op2>ul, div#op3>ul, div#op4>ul, div#op5>ul, div#op6>ul, div#op7>ul, +div#op8>ul, div#op1s>ul, div#op2s>ul, div#op3s>ul, div#op4s>ul, div#op5s>ul, div#op6s>ul, +div#op7s>ul, div#op8s>ul { width: 126px; } #op1 li , #op1 li:hover, #op1s li { @@ -40,27 +41,15 @@ div#op1s>ul, div#op2s>ul, div#op3s>ul, div#op4s>ul, div#op5s>ul, div#op6s>ul, di background: url(../../images/op7.gif) no-repeat 1px 0px; } #op8 li, #op8 li:hover, #op8s li { - background: url(../../images/op8.gif) no-repeat 4px 3px; - } -#arrow1 ul, #arrow2 ul, #arrow3 ul, #arrow4 ul, #arrow5 ul { - padding: 0px 0px 0px 0px; - list-style: none; - } -#arrow1 li, #arrows1 li, #arrow2 li, #arrows2 li, #arrow3 li, #arrows3 li, -#arrow4 li, #arrows4 li, #arrow5 li, #arrows5 li { - padding: 0px 0px 0px 15px; - position: relative; - left: 26px; - width: 82%; + background: url(../../images/op8.gif) no-repeat 4px 3px; } -div#arrow1>ul, div#arrows1>ul, div#arrow2>ul, div#arrows2>ul, div#arrow3>ul, -div#arrows3>ul, div#arrow4>ul, div#arrows4>ul, div#arrow5>ul, div#arrows5>ul { - width: 89%; +div.arrow>ul, div.arrows>ul { + width: 74%; } -#arrow1 li, #arrow1 li:hover, #arrows1 li, #arrow2 li, #arrow2 li:hover, #arrows2 li, -#arrow3 li, #arrow3 li:hover, #arrows3 li, #arrow4 li, #arrow4 li:hover, #arrows4 li, -#arrow5 li, #arrow5 li:hover, #arrows5 li { +.arrow li, .arrow li:hover, .arrows li { background: url(../../images/arrow.gif) no-repeat 2px 4px; + margin-left: 26px; + padding: 0px 0px 0px 14px; } div#menuop { background-color: #e6e9cd; @@ -69,11 +58,10 @@ div#menuop { margin-bottom: 15px; } #op a:hover , -#op1 li:hover, #op1s li , #op2 li:hover, #op2s li , #op3 li:hover, #op3s li , #op8 li:hover, #op8s li, +#op1 li:hover, #op1s li , #op2 li:hover, #op2s li , #op3 li:hover, #op3s li , #op4 li:hover, #op4s li , #op5 li:hover, #op5s li , #op6 li:hover, #op6s li , -#arrow1 li:hover, #arrows1 li, #arrow2 li:hover, #arrows2 li, -#arrow3 li:hover, #arrows3 li, #arrow4 li:hover, #arrows4 li, -#arrow5 li:hover, #arrows5 li +#op7 li:hover, #op7s li , #op8 li:hover, #op8s li, +.arrow li:hover, .arrows li { background-color: #d4ddc6; } diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 915dd6a363..27abf226eb 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -44,34 +44,34 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { 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")) - echo "
"; + echo "
"; else - echo "
"; + echo "
"; echo "
"; if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/estado_alertas") - echo "
"; + echo "
"; else - echo "
"; + echo "
"; echo "
"; if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/status_monitor") - echo "
"; + echo "
"; else - echo "
"; + echo "
"; echo "
"; if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/exportdata") - echo "
"; + echo "
"; else - echo "
"; + echo "
"; echo "
"; if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/estadisticas") - echo "
"; + echo "
"; else - echo "
"; + echo "
"; echo "
"; } @@ -94,15 +94,15 @@ if (give_acl($_SESSION["id_usuario"], 0, "IR")==1) { if (isset($_GET["sec"]) && $_GET["sec"] == "incidencias"){ if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/incidents/incident_search") { - echo "
"; + echo "
"; } - else echo "
"; + else echo "
"; echo "
"; if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/incidents/incident_statistics") { - echo "
"; + echo "
"; } - else echo "
"; + else echo "
"; echo "
"; } } @@ -120,9 +120,9 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { // Event statistics submenu if (isset($_GET["sec"]) && $_GET["sec"] == "eventos"){ if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/events/event_statistics") - echo "
"; + echo "
"; else - echo "
"; + echo "
"; echo "
"; } @@ -136,16 +136,16 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { // User edit (submenu) if (isset($_GET["sec"]) && $_GET["sec"] == "usuarios"){ if(isset($_GET["ver"]) && $_GET["ver"] == $_SESSION["id_usuario"]) - echo "
"; + echo "
"; else - echo "
"; + echo "
"; echo "
"; // User statistic if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/users/user_statistics") - echo "
"; + echo "
"; else - echo "
"; + echo "
"; echo "
"; } @@ -159,9 +159,9 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { // SNMP Console alert (submenu) if (isset($_GET["sec"]) && $_GET["sec"] == "snmpconsole"){ if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/snmpconsole/snmp_alert") - echo "
"; + echo "
"; else - echo "
"; + echo "
"; echo "
"; } @@ -175,9 +175,9 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { // New message (submenu) if (isset($_GET["sec"]) && $_GET["sec"] == "messages"){ if(isset($_GET["sec2"]) && isset($_GET["nuevo_g"])) - echo "
"; + echo "
"; else - echo "
"; + echo "
"; echo "
"; } @@ -191,9 +191,9 @@ if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) { // New message (reporting) if (isset($_GET["sec"]) && $_GET["sec"] == "reporting"){ if(isset($_GET["sec2"]) && isset($_GET["nuevo_g"])) - echo "
"; + echo "
"; else - echo "