From 3697ee4c57c429e806eadb19abf5a260c2d5d9b3 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Fri, 8 Jun 2007 09:28:47 +0000 Subject: [PATCH] 2007-06-08 Raul Mateos * include/styles/god.css: Updated god51. * include/languages/language_en.php: Updated. * operation/reporting/custom_reporting, operation/users/user.php, godmode/agentes/module_manager.php, godmode/users/configure_user.php, godmode/reporting/reporting_builder.php: Updated with new table style. * images/reporting_edit.png: Added icon for creating reports in administration mode. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@495 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 19 +++ .../godmode/agentes/module_manager.php | 16 +-- .../godmode/reporting/reporting_builder.php | 118 ++++++++++-------- .../godmode/users/configure_user.php | 9 +- pandora_console/images/reporting_edit.png | Bin 0 -> 986 bytes .../include/languages/language_en.php | 9 +- pandora_console/include/styles/god.css | 5 +- .../operation/reporting/custom_reporting.php | 17 ++- pandora_console/operation/users/user.php | 66 ++++++---- 9 files changed, 164 insertions(+), 95 deletions(-) create mode 100644 pandora_console/images/reporting_edit.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 9c7eeb4545..29dfba44ad 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,22 @@ +2007-06-08 Raul Mateos + + * include/styles/god.css: Updated god51. + + * include/languages/language_en.php: Updated. + + * operation/reporting/custom_reporting, operation/users/user.php, + godmode/agentes/module_manager.php, godmode/users/configure_user.php, + godmode/reporting/reporting_builder.php: Updated with new table style. + + * images/reporting_edit.png: Added icon for creating reports in + administration mode. + +2007-06-07 Raul Mateos + + * operation/agentes/status_monitor.php, estado_alertas.php, + operation/incidents/*.php, operation/events/events.php: Closed html + tags. Updated with new table style. + 2007-06-07 Sancho Lerena * include/styles/god.css: Added god51 (reporting). diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 780385831b..e2f8c0b755 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -173,13 +173,13 @@ echo "

".$lang_label["assigned_modules"]." if ($row=mysql_num_rows($result)){ echo ''; echo ''; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; $color=1;$last_modulegroup = "0"; while ($row=mysql_fetch_array($result)){ if ($color == 1){ @@ -368,7 +368,7 @@ if (isset($_POST["oid"])){ // y el cabron de PHP me devuelve indices a partir de 1 !!!!!!! //echo "$i: $a[$i]
\n"; $snmp_output = substr($i,0,35)." - ".substr($snmpwalk[$i],0,20); - echo ""; } } ?> diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index b8348f52e2..091bcca43c 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -41,9 +41,9 @@ if (isset($_GET["delete"])){ $id_content = $_GET["delete"]; $sql = "DELETE FROM treport_content WHERE id_rc = $id_content"; if ($res=mysql_query($sql)) - $result = "

".$lang_label["delete_ok"]."

"; + $result = "

".$lang_label["delete_ok"]."

"; else - $result = "

".$lang_label["delete_no"]."

"; + $result = "

".$lang_label["delete_no"]."

"; echo $result; } @@ -55,9 +55,9 @@ if (isset($_GET["delete_report"])){ $res=mysql_query($sql); $res2=mysql_query($sql2); if ($res AND $res2) - $result = "

".$lang_label["delete_ok"]."

"; + $result = "

".$lang_label["delete_reporting_ok"]."

"; else - $result = "

".$lang_label["delete_no"]."

"; + $result = "

".$lang_label["delete_reporting_no"]."

"; echo $result; } @@ -86,9 +86,9 @@ if (isset($_GET["add_module"])){ $sql = "INSERT INTO treport_content (id_report, id_gs, id_agent_module, type, sla_max, sla_min, sla_limit, period) VALUES ('$id_report', '$my_cg', '$my_id_module', '$my_type', '$my_slamax', '$my_slamin', '$my_slalimit', '$my_period')"; if ($res=mysql_query($sql)) - $result = "

".$lang_label["create_ok"]."

"; + $result = "

".$lang_label["create_reporting_ok"]."

"; else - $result = "

".$lang_label["create_no"]."

"; + $result = "

".$lang_label["create_reporting_no"]."

"; echo $result; } @@ -107,9 +107,9 @@ if (isset($_POST["createmode"])){ $form_id_user = $id_user; $sql = "INSERT INTO treport (name, description, id_user, private) VALUES ('$form_report_name', '$form_report_description', '$form_id_user', '$form_report_private')"; if ($res=mysql_query($sql)) - $result = "

".$lang_label["create_ok"]."

"; + $result = "

".$lang_label["create_reporting_ok"]."

"; else - $result = "

".$lang_label["create_no"]."

"; + $result = "

".$lang_label["create_reporting_no"]."

"; $id_report = mysql_insert_id(); // UPDATE REPORT DATA } else { @@ -159,8 +159,8 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { $form_id_user = $id_user; $createmode = 1; } - - echo "

".$lang_label["custom_reporting_builder"]."

"; + echo "

".$lang_label["reporting"]." > "; + echo $lang_label["custom_reporting_builder"]."

"; echo ""; echo ""; if ($createmode == 0){ @@ -215,7 +215,7 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo ""; echo ""; echo "'; - - echo ""; // Modules combo // ----------------------- @@ -242,13 +242,13 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo "".$lang_label["modules"].""; echo ""; echo ""; // SLA Min echo ""; // SLA limit echo ""; echo "
".$lang_label["module_name"]; - echo "".$lang_label["type"]; - echo "".$lang_label["interval"]; - echo "".$lang_label["description"]; - echo "".$lang_label["module_group"]; - echo "".$lang_label["max_min"]; - echo "".$lang_label["action"]; + echo "".$lang_label["module_name"]."".$lang_label["type"]."".$lang_label["interval"]."".$lang_label["description"]."".$lang_label["module_group"]."".$lang_label["max_min"]."".$lang_label["action"]."
".$lang_label["source_agent"]; - echo ""; + echo "'; + echo '"; - echo ""; + echo " + "; + echo ""; echo ""; @@ -258,15 +258,15 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo "".$lang_label["reporting_type"].""; echo ""; echo ""; // Custom graph @@ -288,39 +288,39 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo "".$lang_label["period"].""; echo ""; echo ""; // SLA Max echo "
"; - echo "".$lang_label["sla_max"].""; + echo "".$lang_label["sla_max"].""; - echo ""; + echo ""; echo "".$lang_label["sla_min"].""; echo ""; - echo ""; + echo "
"; echo "".$lang_label["sla_limit"].""; echo ""; - echo ""; + echo "
"; - echo ""; + echo "
"; echo "
"; echo ""; echo "
"; @@ -332,7 +332,12 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo "

".$lang_label["report_items"]."

"; echo ""; - echo " + + + + + "; $sql = "SELECT * FROM treport_content WHERE id_report = $id_report"; $res=mysql_query($sql); $color = 0; @@ -374,7 +379,7 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo "
".$lang_label["type"]."".$lang_label["agent_name"]."".$lang_label["module_name"]."".$lang_label["period"]."".$lang_label["delete"]; + echo "
".$lang_label["type"]."".$lang_label["agent_name"]."".$lang_label["module_name"]."".$lang_label["period"]."".$lang_label["delete"]."".$period; echo ""; if ($form_id_user == $id_user){ - echo ""; + echo ""; } } echo "
"; @@ -384,9 +389,14 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { // Report LIST // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - echo "

".$lang_label["custom_reporting"]."

"; + echo "

".$lang_label["reporting"]." > "; + echo $lang_label["custom_reporting"]."

"; echo ""; - echo " + + + + "; $color=1; $sql="SELECT * FROM treport"; $res=mysql_query($sql); @@ -405,15 +415,19 @@ if ($createmode==2 OR isset($_GET["id"]) OR (isset($_POST["id_report"]))) { echo ""; + echo ""; } } echo "
".$lang_label["report_name"]."".$lang_label["description"]."".$lang_label["Manage"]."".$lang_label["delete"]; + echo "
".$lang_label["report_name"]."".$lang_label["description"]."".$lang_label["Manage"]."".$lang_label["delete"]."".$row["name"]; echo "".$row["description"]; $id_report = $row["id_report"]; - echo ""; - echo ""; + echo " + + + +
"; echo ""; echo ""; echo "
"; - echo ""; + echo ""; echo ""; echo "
"; } diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index be24387591..2d14a0beda 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -229,9 +229,9 @@ if (comprueba_login() == 0) $result=mysql_query($sql1); echo '

'.$lang_label["listGroupUser"].' '.$lang_label["help"].'

'; - echo ""; + echo "
"; if (mysql_num_rows($result)){ - echo ''; $color=1; while ($row=mysql_fetch_array($result)){ if ($color == 1){ @@ -247,9 +247,10 @@ if (comprueba_login() == 0) echo "".dame_grupo($row["id_grupo"]).""; echo ''; } - echo ""; } - else { echo '';} + else { + echo '
'.$lang_label["no_profile"].'
'; + } } ?> diff --git a/pandora_console/images/reporting_edit.png b/pandora_console/images/reporting_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..3debc12d5ee0b8454165cf2ef52c976c414a16a4 GIT binary patch literal 986 zcmV<0110>4P)jsHp9U>bEUr=&5Gt!&3TRri2n1-U zTm;cl1%x@3A|OLSg|^f}FF-+{1yod0sQpVz1#)bOntA(hlJ~=VemUpK^H2a#-YZ+5 z>UBn&kdmt8w((kz%*HfD%pO)S+QMpr`3J9NE{MJIWa0n+d-UOvsY~$@YEBN_9;ij5 zr3s4R26VjC;)=E$gp4MQDIeuJ;f|#dW&KxiT+0XdQ7UTs z{>9!)JFSe8;vXYR&DPS^ad0mWf)MF~J^)0W$%{{`Pms;S%@7$SV5y@Ku8PL_o>E9# z#MmL-#$jI=l4jSAL17?KaOVYRX&vNt-owT70C!)3qW>0(Oqan_Mg z#Xg;^LgUY2;=b9NIy~ovh$~egSD-cx? z32ORpTMp!z?q@5Wp;}{ur1Ba}@(?_}Aw*Y+KXm!tVU(lw;jSB&I>cy_Akycdvabf` z>P6Tj__c(Q+e>%%byO-RQCwYyv1T4@`dWZ|ib;Jn+A{;5Q^K#)ZOZ3rTA; z?@OPI4RMNCV&ycGndA(nTc>DyR`W7)%vK{GbB+ga3?75kJ*Qq-1eDT)GwQscpD4SE z{J4I(RJI|W^}UPzSJrfBC`qOy<8{bBjAnXsCJYIfbGBn@fC=Xa1NNRo=<{hH7zxGm zL!9~h#G*IHjuyIDEZ1wH0FxCmSmk9HWNyJ&2k)IZ49?;Gcx6mNw#aC-<>w{Ej2yhi??9k?7RKdx(!2B zqCWt;1*Reb&56tLupkh%{LQXE>D=?*P=#J!JtmJPR;}?89P*xXwM*bqN7bJfg$X9H)NvVL#5#asQu*UTQh1&55X+otlN8~^|S07*qo IM6N<$f|4H26951J literal 0 HcmV?d00001 diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php index f481d74761..d61c19d238 100644 --- a/pandora_console/include/languages/language_en.php +++ b/pandora_console/include/languages/language_en.php @@ -802,8 +802,7 @@ $lang_label["period"]="Period"; $lang_label["reporting_item_add"]="Add item to report"; $lang_label["template"]="Template"; -$lang_label["add_mod_ok"]="Modules added successfully"; - +$lang_label["add_mod_ok"]="Modules successfully added "; $lang_label["simple_graph"] = "Simple graph"; $lang_label["custom_graph"] = "Custom graph"; @@ -821,6 +820,12 @@ $lang_label["sla_min"] = "SLA Min. (value)"; $lang_label["sla_limit"] = "SLA Limit (%)"; $lang_label["up"]="Up"; $lang_label["down"]="Down"; + +$lang_label["create_reporting_ok"]="Reporting successfully created"; +$lang_label["create_reporting_no"]="There was a problem creating reporting"; +$lang_label["delete_reporting_ok"]="Reporting successfully deleted"; +$lang_label["delete_reporting_no"]="There was a problem deleting reporting"; + global $lang_label; global $help_label; ?> diff --git a/pandora_console/include/styles/god.css b/pandora_console/include/styles/god.css index b966408605..3f1c8e0766 100644 --- a/pandora_console/include/styles/god.css +++ b/pandora_console/include/styles/god.css @@ -37,7 +37,7 @@ div#god1>ul, div#god2>ul, div#god3>ul, div#god4>ul, div#god5>ul, div#god51>ul, d background: url(../../images/god5.gif) no-repeat 3px 3px; } #god51 li, #god51 li:hover, #god51s li { - background: url(../../images/reporting.png) no-repeat 4px 4px; + background: url(../../images/reporting_edit.png) no-repeat 4px 4px; } #god6 li, #god6 li:hover, #god6s li { background: url(../../images/god6.gif) no-repeat 4px 3px; @@ -62,7 +62,8 @@ div.arrowg>ul, div.arrowgs>ul { #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, #god_module li:hover, #god_module_sel li, #god51 li:hover, #god51s li, +#god7 li:hover, #god7s li, #god8 li:hover, #god8s li, +#god_module li:hover, #god_module_sel li, #god51 li:hover, #god51s li, .arrowg li:hover, .arrowgs li { background-color: #efefbd; diff --git a/pandora_console/operation/reporting/custom_reporting.php b/pandora_console/operation/reporting/custom_reporting.php index 3dc51e6eea..bf7c12f401 100644 --- a/pandora_console/operation/reporting/custom_reporting.php +++ b/pandora_console/operation/reporting/custom_reporting.php @@ -29,9 +29,13 @@ if (comprueba_login() != 0) { //echo "SLA for Tato: %".return_module_SLA (50, 604800, 1, 1); -echo "

".$lang_label["custom_reporting"]."

"; +echo "

".$lang_label["reporting"]." > "; +echo $lang_label["custom_reporting"]."

"; echo "
'; + echo '
'.$lang_label["no_profile"].'
"; -echo " + + +"; $color=1; $sql="SELECT * FROM treport"; $res=mysql_query($sql); @@ -47,10 +51,13 @@ while ($row = mysql_fetch_array($res)){ $color = 1; } echo ""; - echo ""; + echo ""; $id_report = $row["id_report"]; - echo ""; } } echo "
".$lang_label["report_name"]."".$lang_label["description"]."".$lang_label["view"]; +echo "
".$lang_label["report_name"]."".$lang_label["description"]."".$lang_label["view"]."
".$row["name"]; - echo "".$row["description"]; + echo "".$row["name"]."".$row["description"].""; + echo " + + +
"; diff --git a/pandora_console/operation/users/user.php b/pandora_console/operation/users/user.php index 58cdf7d18e..2a837cbcb5 100644 --- a/pandora_console/operation/users/user.php +++ b/pandora_console/operation/users/user.php @@ -24,15 +24,15 @@ if (comprueba_login() == 0) { ?> -

-

 

+

> + 

- -
- - - - + + + + + +"; echo ""; echo ""; + echo ""; } -echo "
".substr($real_name,0,16)."".$comments."

"; +echo "

"; ?>

 

- +
"; - echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; $color = 1; while ($rowdup=mysql_fetch_array($resq1)){ $id_perfil = $rowdup["id_perfil"]; @@ -157,4 +179,4 @@ echo "
".$lang_label["profiles"]; - echo "IR ".$help_label["IR"].""; - echo "IW ".$help_label["IW"].""; - echo "IM ".$help_label["IM"].""; - echo "AR ".$help_label["AR"].""; - echo "AW ".$help_label["AW"].""; - echo "LW ".$help_label["LW"].""; - echo "UM ".$help_label["UM"].""; - echo "DM ".$help_label["DM"].""; - echo "LM ".$help_label["LM"].""; - echo "PM ".$help_label["PM"].""; + echo " + ".$lang_label["profiles"]." + IR ".$help_label["IR"]." + + IW ".$help_label["IW"]." + + IM ".$help_label["IM"]." + + AR ".$help_label["AR"]." + + AW ".$help_label["AW"]." + + LW ".$help_label["LW"]." + + UM ".$help_label["UM"]." + + DM ".$help_label["DM"]." + + LM ".$help_label["LM"]." + + PM ".$help_label["PM"]." +

"; } } //end of page ?> -
\ No newline at end of file + \ No newline at end of file