2006-12-15 Sancho Lerena <slerena@artica.es>

* include/styles/op.css: Added new op8. FIXME: There is a little
	problem i cannot fix before commit. TODO.
	
	* include/languages/language_en.php: Added new report strings.
	
	* include/config.php: Officially are 1.3 devel version. Updated.
	
	* operation/menu.php: CODE CLEANUP. FIXME: There is a little
	problem I cannot fix before commit. TODO

	* images/op8.gif: Added.
	


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@323 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2006-12-15 17:39:11 +00:00
parent 80bccca21d
commit 705db6e48a
6 changed files with 198 additions and 141 deletions

View File

@ -1,3 +1,17 @@
2006-12-15 Sancho Lerena <slerena@artica.es>
* include/styles/op.css: Added new op8. FIXME: There is a little
problem i cannot fix before commit. TODO.
* include/languages/language_en.php: Added new report strings.
* include/config.php: Officially are 1.3 devel version. Updated.
* operation/menu.php: CODE CLEANUP. FIXME: There is a little
problem I cannot fix before commit. TODO
* images/op8.gif: Added.
2006-12-15 Esteban Sanchez <estebans@artica.es>
* operation/agentes/estado_grupo.php: Huge style correction. There is

Binary file not shown.

After

Width:  |  Height:  |  Size: 664 B

View File

@ -20,8 +20,8 @@
// This is the base config file
//Pandora Version
$build_version="PC061208"; //PCyymmdd
$pandora_version="v1.3 Beta 1";
$build_version="PC061215"; //PCyymmdd
$pandora_version="v1.3 devel";
// Database configuration
$dbname="pandora"; // MySQL DataBase

View File

@ -654,6 +654,10 @@ $lang_label["background_image"]="Background image";
$lang_label["help"]="Help";
$lang_label["no_monitors_g"]="This group doesn't have any monitor";
// 15 dev, new for 1.3 dev
$lang_label["reporting"]="Reporting";
$lang_label["agent_general_reporting"]="Agent overview";
global $lang_label;
global $help_label;
?>

View File

@ -10,12 +10,12 @@
border-bottom: 1px solid #d4d4d4;
border-top: 1px solid #eee;
}
#op1 li, #op2 li, #op3 li, #op4 li, #op5 li, #op6 li, #op7 li,
#op1s li, #op2s li, #op3s li, #op4s li, #op5s li, #op6s li, #op7s li {
#op1 li, #op2 li, #op3 li, #op4 li, #op5 li, #op6 li, #op7 li, #op8 li,
#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#op1s>ul, div#op2s>ul, div#op3s>ul, div#op4s>ul, div#op5s>ul, div#op6s>ul, div#op7s>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 {
@ -39,6 +39,9 @@ div#op1s>ul, div#op2s>ul, div#op3s>ul, div#op4s>ul, div#op5s>ul, div#op6s>ul, di
#op7 li, #op7 li:hover, #op7s li {
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;
@ -66,7 +69,7 @@ div#menuop {
margin-bottom: 15px;
}
#op a:hover ,
#op1 li:hover, #op1s li , #op2 li:hover, #op2s li , #op3 li:hover, #op3s li ,
#op1 li:hover, #op1s li , #op2 li:hover, #op2s li , #op3 li:hover, #op3s li , #op8 li:hover, #op8s 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,

View File

@ -19,7 +19,11 @@
?>
<?php
if (isset($_SESSION["id_usuario"])) {
if (! isset($_SESSION["id_usuario"])) {
return;
}
?>
<div class="bg">
<div class="imgl"><img src="images/upper-left-corner.gif" width="5" height="5" alt=""></div>
@ -28,59 +32,64 @@ if (isset($_SESSION["id_usuario"])) {
</div>
<div id="menuop">
<div id="op">
<?php
// 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 '<div id="op1s">';
}
else echo '<div id="op1">';
else
echo '<div id="op1">';
echo '<ul class="mn"><li><a href="index.php?sec=estado&amp;sec2=operation/agentes/estado_grupo&amp;refr=60" class="mn">'.$lang_label["view_agents"].'</a></li></ul></div>';
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 "<div id='arrows1'>";
}
else echo "<div id='arrow1'>";
else
echo "<div id='arrow1'>";
echo "<ul class='mn'><li><a href='index.php?sec=estado&amp;sec2=operation/agentes/estado_agente&amp;refr=60' class='mn'>".$lang_label["agent_detail"]."</a></li></ul></div>";
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/estado_alertas") {
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/estado_alertas")
echo "<div id='arrows2'>";
}
else echo "<div id='arrow2'>";
else
echo "<div id='arrow2'>";
echo "<ul class='mn'><li><a href='index.php?sec=estado&amp;sec2=operation/agentes/estado_alertas&amp;refr=60' class='mn'>".$lang_label["alert_detail"]."</a></li></ul></div>";
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/status_monitor") {
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/status_monitor")
echo "<div id='arrows3'>";
}
else echo "<div id='arrow3'>";
else
echo "<div id='arrow3'>";
echo "<ul class='mn'><li><a href='index.php?sec=estado&amp;sec2=operation/agentes/status_monitor&amp;refr=60' class='mn'>".$lang_label["detailed_monitoragent_state"]."</a></li></ul></div>";
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/exportdata") {
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/exportdata")
echo "<div id='arrows4'>";
}
else echo "<div id='arrow4'>";
else
echo "<div id='arrow4'>";
echo "<ul class='mn'><li><a href='index.php?sec=estado&amp;sec2=operation/agentes/exportdata' class='mn'>".$lang_label["export_data"]."</a></li></ul></div>";
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/estadisticas") {
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/agentes/estadisticas")
echo "<div id='arrows5'>";
}
else echo "<div id='arrow5'>";
else
echo "<div id='arrow5'>";
echo "<ul class='mn'><li><a href='index.php?sec=estado&amp;sec2=operation/agentes/estadisticas' class='mn'>". $lang_label["statistics"]. "</a></li></ul></div>";
}
}
if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) {
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/servers/view_server") {
if ( isset($_GET["sec2"]) && $_GET["sec2"] == "operation/servers/view_server")
echo '<div id="op2s">';
else
echo '<div id="op2">';
echo '<ul class="mn"><li>';
echo '<a href="index.php?sec=estado_server&amp;sec2=operation/servers/view_server&amp;refr=60" class="mn">'.$lang_label["view_servers"].'</a></li></ul></div>';
}
else echo '<div id="op2">';
echo '<ul class="mn"><li><a href="index.php?sec=estado_server&amp;sec2=operation/servers/view_server&amp;refr=60" class="mn">'.$lang_label["view_servers"].'</a></li></ul></div>';
}
// 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 '<div id="op3s">';
}
else echo '<div id="op3">';
else
echo '<div id="op3">';
echo '<ul class="mn"><li><a href="index.php?sec=incidencias&amp;sec2=operation/incidents/incident" class="mn">'.$lang_label["manage_incidents"].'</a></li></ul></div>';
if (isset($_GET["sec"]) && $_GET["sec"] == "incidencias"){
@ -97,71 +106,98 @@ if (isset($_SESSION["id_usuario"])) {
echo "<ul class='mn'><li><a href='index.php?sec=incidencias&amp;sec2=operation/incidents/incident_statistics' class='mn'>".$lang_label["statistics"]."</a></li></ul></div>";
}
}
if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) {
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/events/events") {
echo '<div id="op4s">';
}
else echo '<div id="op4">';
echo '<ul class="mn"><li><a href="index.php?sec=eventos&amp;sec2=operation/events/events" class="mn">'.$lang_label["view_events"].'</a></li></ul></div>';
// Rest of options, all with AR privilege
if (give_acl($_SESSION["id_usuario"], 0, "AR")==1) {
// Events
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/events/events")
echo '<div id="op4s">';
else
echo '<div id="op4">';
echo '<ul class="mn"><li><a href="index.php?sec=eventos&amp;sec2=operation/events/events" class="mn">'.$lang_label["view_events"].'</a></li></ul></div>';
// 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 "<div id='arrows1'>";
}
else echo "<div id='arrow1'>";
else
echo "<div id='arrow1'>";
echo "<ul class='mn'><li><a href='index.php?sec=eventos&amp;sec2=operation/events/event_statistics' class='mn'>".$lang_label["statistics"]."</a></li></ul></div>";
}
}
if(isset($_GET["sec2"]) && ($_GET["sec2"] == "operation/users/user" || $_GET["sec2"] == "operation/users/user_edit" )) {
// Users
if(isset($_GET["sec2"]) && ($_GET["sec2"] == "operation/users/user" || $_GET["sec2"] == "operation/users/user_edit" ))
echo '<div id="op5s">';
}
else echo '<div id="op5">';
else
echo '<div id="op5">';
echo '<ul class="mn"><li><a href="index.php?sec=usuarios&amp;sec2=operation/users/user" class="mn">'.$lang_label["view_users"].'</a></li></ul></div>';
// 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 "<div id='arrows1'>";
}
else echo "<div id='arrow1'>";
else
echo "<div id='arrow1'>";
echo "<ul class='mn'><li><a href='index.php?sec=usuarios&amp;sec2=operation/users/user_edit&amp;ver=".$_SESSION["id_usuario"]."' class='mn'>".$lang_label["index_myuser"]."</a></li></ul></div>";
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/users/user_statistics") {
// User statistic
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/users/user_statistics")
echo "<div id='arrows1'>";
}
else echo "<div id='arrow1'>";
else
echo "<div id='arrow1'>";
echo "<ul class='mn'><li><a href='index.php?sec=usuarios&amp;sec2=operation/users/user_statistics' class='mn'>".$lang_label["statistics"]."</a></li></ul></div>";
}
}
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/snmpconsole/snmp_view") {
// SNMP console
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/snmpconsole/snmp_view")
echo '<div id="op6s">';
}
else echo '<div id="op6">';
else
echo '<div id="op6">';
echo '<ul class="mn"><li><a href="index.php?sec=snmpconsole&amp;sec2=operation/snmpconsole/snmp_view&amp;refr=30" class="mn">'.$lang_label["SNMP_console"].'</a></li></ul></div>';
// 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 "<div id='arrows1'>";
}
else echo "<div id='arrow1'>";
else
echo "<div id='arrow1'>";
echo "<ul class='mn'><li><a href='index.php?sec=snmpconsole&amp;sec2=operation/snmpconsole/snmp_alert' class='mn'>".$lang_label["snmp_console_alert"]."</a></li></ul></div>";
}
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/messages/message" && !isset($_GET["nuevo_g"])) {
// Messages
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/messages/message" && !isset($_GET["nuevo_g"]))
echo '<div id="op7s">';
}
else echo '<div id="op7">';
else
echo '<div id="op7">';
echo '<ul class="mn"><li><a href="index.php?sec=messages&amp;sec2=operation/messages/message" class="mn">'. $lang_label["messages"].'</a></li></ul></div>';
// 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 "<div id='arrows1'>";
}
else echo "<div id='arrow1'>";
else
echo "<div id='arrow1'>";
echo "<ul class='mn'><li><a href='index.php?sec=messages&amp;sec2=operation/messages/message&amp;nuevo_g' class='mn'>".$lang_label["messages_g"]."</a></li></ul></div>";
}
?>
</div>
</div>
<?php
// Reporing
if(isset($_GET["sec2"]) && $_GET["sec2"] == "operation/reporting/reporting" && !isset($_GET["nuevo_g"]))
echo '<div id="op8s">';
else
echo '<div id="op8">';
echo '<ul class="mn"><li><a href="index.php?sec=reporting&sec2=operation/reporting/reporting" class="mn">'. $lang_label["reporting"].'</a></li></ul></div>';
// New message (reporting)
if (isset($_GET["sec"]) && $_GET["sec"] == "reporting"){
if(isset($_GET["sec2"]) && isset($_GET["nuevo_g"]))
echo "<div id='arrows1'>";
else
echo "<div id='arrow1'>";
echo "<ul class='mn'><li><a href='index.php?sec=reporting&sec2=operation/reporting/reporting' class='mn'>".$lang_label["agent_general_reporting"]."</a></li></ul></div>";
}
}
?>
</div>
</div>