From 705db6e48a4356e200ef72a33ffe2dbe0d6d1f9c Mon Sep 17 00:00:00 2001 From: slerena Date: Fri, 15 Dec 2006 17:39:11 +0000 Subject: [PATCH] 2006-12-15 Sancho Lerena * 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 --- pandora_console/ChangeLog | 14 + pandora_console/images/op8.gif | Bin 0 -> 664 bytes pandora_console/include/config.php | 4 +- .../include/languages/language_en.php | 4 + pandora_console/include/styles/op.css | 17 +- pandora_console/operation/menu.php | 300 ++++++++++-------- 6 files changed, 198 insertions(+), 141 deletions(-) create mode 100644 pandora_console/images/op8.gif diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b5b6f52172..cd586b7fb4 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,17 @@ +2006-12-15 Sancho Lerena + + * 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 * operation/agentes/estado_grupo.php: Huge style correction. There is diff --git a/pandora_console/images/op8.gif b/pandora_console/images/op8.gif new file mode 100644 index 0000000000000000000000000000000000000000..ba49b4834484c5c4f2f815bf6745eea19ea2f24a GIT binary patch literal 664 zcmZ?wbhEHb6k-r!I9AGFVx(_s3`7Q|CWdAv24*IP=B9>1foxV*R*sI2o}Qk5-mZS$ zZvH-Q0lw~mejY*oo72A%S$sj0@@N+vzZ7X9j$6EtlmYvSH#axOO_>t0%rk!K z)Trg&(JOosr%#Vv<(D#ZX58w4v{|zf)&!={o}IKdxVN`Ad0lAsym>kE=cjLo%v-P^ zb7NH2rkH|7i*h!{O`STmc*&B|rAza-CKYZ=DPO+4V#SK$?P*mjSJtdrRlX~0-n@Br zYt~fk&Z%F!wrWpa?=*TdmrL$J7T(B-kcjNMsyx?FT zAMXr{kRV^Rof<`%{z-`m9vMafUhc{#3X6Tt#kpkYdbv3$F6CLCTkIJh7i*WH=45Xr zcOs|QH7+K~Iz!ps!bEz)+L^*F++sSW7aBGwK6Y&j67ZWl^YG(@sS+6$2Qn5Oa$3p0 z{M4D9flIwa#4=2_coZ%=bUZla*_n=qO{`u#Vp=bBo<88`jB-#kjR<+(HCfRztm8#N mV-pK2r@)oS59v+;3uZC!NF*#^Xk4Gb%EI6vc3{2(gEatHeM3M1 literal 0 HcmV?d00001 diff --git a/pandora_console/include/config.php b/pandora_console/include/config.php index 5a199faa35..1b508d0f04 100644 --- a/pandora_console/include/config.php +++ b/pandora_console/include/config.php @@ -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 diff --git a/pandora_console/include/languages/language_en.php b/pandora_console/include/languages/language_en.php index 651add2aaf..d09f90f8a4 100644 --- a/pandora_console/include/languages/language_en.php +++ b/pandora_console/include/languages/language_en.php @@ -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; ?> \ No newline at end of file diff --git a/pandora_console/include/styles/op.css b/pandora_console/include/styles/op.css index 6738cbdf32..3c9374c161 100644 --- a/pandora_console/include/styles/op.css +++ b/pandora_console/include/styles/op.css @@ -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,11 +69,11 @@ div#menuop { margin-bottom: 15px; } #op a:hover , -#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 , +#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, #arrow5 li:hover, #arrows5 li { background-color: #d4ddc6; -} \ No newline at end of file +} diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 2387a0ac92..915dd6a363 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -19,7 +19,11 @@ ?>
@@ -27,141 +31,173 @@ if (isset($_SESSION["id_usuario"])) {