From cd7d77a2247fd5663705bcd8400121b30e761687 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Wed, 18 Apr 2012 16:08:48 +0000 Subject: [PATCH] 2012-04-18 Juan Manuel Ramon * include/styles/pandora_minimal.css include/javascript/pandora.js operation/agentes/stat_win.php: Changed layout of interactive graph menu. * images/graphmenu_arrow.png images/graphmenu_arrow_hide.png: Added images for interactive graph menu. Merged from branches. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6024 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 13 ++++ pandora_console/images/graphmenu_arrow.png | Bin 0 -> 1226 bytes .../images/graphmenu_arrow_hide.png | Bin 0 -> 1182 bytes pandora_console/include/javascript/pandora.js | 2 +- .../include/styles/pandora_minimal.css | 32 +++++++-- .../operation/agentes/stat_win.php | 68 ++++++++++++++---- 6 files changed, 97 insertions(+), 18 deletions(-) create mode 100644 pandora_console/images/graphmenu_arrow.png create mode 100644 pandora_console/images/graphmenu_arrow_hide.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 0212458998..5521a9bb3b 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,16 @@ +2012-04-18 Juan Manuel Ramon + + * include/styles/pandora_minimal.css + include/javascript/pandora.js + operation/agentes/stat_win.php: Changed layout of interactive graph + menu. + + * images/graphmenu_arrow.png + images/graphmenu_arrow_hide.png: Added images for interactive + graph menu. + + Merged from branches. + 2012-04-18 Miguel de Dios * include/functions_agents.php: into the function diff --git a/pandora_console/images/graphmenu_arrow.png b/pandora_console/images/graphmenu_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..f1054005f6832cd6b9f1543b3fb929db1bdd7f06 GIT binary patch literal 1226 zcmV;*1U37KP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb_ z4KFq7&mcVj00c@&L_t(&-tC!DY8y!qhX3jo7RU(Z!Ny>)(Het{UgDe}$^|mBCrEsP z&7Q#76J&jYWKWQpTp->Pto>j=$;cpV5PlgUFj$`M+6Q$@qtPfDX{230%n!{BHtO!L ztGc?Y1}IdhP@zJFmKUw6qrmrT06YM1h^Ps`AsTnj%m8r9%ohOu2H?A%cl%;M0^e@} zI3=Pc5h31&BM>lz05gLDu-3zOW*@+r>v`w@8;G&M7b0p3AwWVvSO_5u!<0pa00u;l zpFV&S*Ym>v6eRHd4@C4?2;qPBgoq{~Vohre)*5=)LT3JTS?kb}5MP9pkU~I6 z2_hPS*k{rrNsyQ|pp}Bw8cHcJ^NH(uU)Ks^A*7TLQbGs;X`XS2i9M19#K0&6q_tic zh8BSEi0GSzkUs&5t6VPQ>FFsINRQoW1finHTIRLuc^4}M34GrnqP7sik)_fUgf#Az zrh2`Oe!q|V`}m*Rb0GjgN;&a zK{huxaddRF^eMcvvx922ikq98Q6Pv%I}4?S0JMIe1w_odeh`sEiLfe!KwecU6*L+R zIF2)(OyXcQH-%c@`^R}VdlQM%I*U7Hm36hfy}c=`5D{WyH}itLA`=nT1!G;!Mm0)b zI43WN6JMFMYsac&U2SV?YjUjN`w@X``)IXVP)bcN-0=M}FUTdE zRY@jAt5T=aLATpYz3Rut%6&ySM|#J(H5d%gYPInA_&5_HHul`Cac)rf9t3SEWlfe! zD49#6y=%=AGh=^$AC*dF;_qP?qTOzfTq(X!;w_3Is3^L4=en2mIx|-Mzv$Di^F@l-@Sb5I=JqZ30LL4ue>Q*Y1RDcYr z?)f{{eVcWDnNN0RKG9l-@oGo>ImPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyb_ z4KW|(HP$o$00bUML_t(&-tC!DYU4-{hX1NI378o468vCHZ17X^kn9OIdje}uu$dEN z=LAVku(Kyf<^(Ix1vYbn&AgaA1SVhzgajfmF&NTa`(U-)Ry2-e$=Q8SLDTkwRQ;){ zOI^Q!$||d@vdSu3-Kgvv4uYUVL_UCh03D*a3lRZ;TL9lgsg5ZFe|F%(JrD6yd zCM_a%HpVQ@T0)JR^ zb+Q|qQx=d0pp-(d*F(GAUiNTa-OKtQqJu#YoR$hgL?`aXehZ>ruVZg-51!{`x%aCS zbyD?s5CmQ+AYTT9BO>aMv!UHRk+f#BiQU~@Y;0`gN!xS~W)HycZ(U!@=;xSHHgpm~ zDTQvg`zi`bDQsD}eJ8Ma+w3D(s7m3JM+X&ek zK0ZETI2>X!nXDgT?mH|B5+<7=5y5mi#c(*p{r!FE5DR0T5#I`dh{&b;WZVG&qtOUA zH#g8)uMH;Z_b&^9^nL$IL~cz=LllQB3`x{41^gL$Zc({jYcDk$76K6 z-MFf0tuY>t--OV!&M*cs(Qg1}r5xiURpZRPx!ay5OJm+tbJI0BMC2lis=_%o;3s3u zts@XDg|Vr2cXyXL63J+YNC@ELI>d(qBKk)ug*@WJ=H@1*(`jDu0g=WPlnxTX95M5G zLMT{S4oZSJ5Fh%!f3a?X?udxa<7oUqpi6>e6zFn86qQU5tvpnsWEzUd$Gi}QMeIo3 zIA>;mAsS0WYykEp=Ze@6kxKv{R?&US{H$;oeNymakZhk7EWp`YZ|-*iafJ#1K7gNz w=m6;-dctV&UjYQGMxe6FDyyur%F48V0nV*!{Zuo>kpKVy07*qoM6N<$g4|#Zx&QzG literal 0 HcmV?d00001 diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index d378c0c0ca..f17a6b287e 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -11,7 +11,7 @@ function toggleDiv (divid){ function winopeng (url, wid) { open (url, wid,"width=650,height=410,status=no,toolbar=no,menubar=no,scrollbar=no"); - // WARNING !! Internet Explorer DOESNT SUPPORT "-" CHARACTERS IN WINDOW HANDLE VARIABLE + // WARNING !! Internet Explorer DOESNT SUPPORT "-" CARACTERS IN WINDOW HANDLE VARIABLE status =wid; } diff --git a/pandora_console/include/styles/pandora_minimal.css b/pandora_console/include/styles/pandora_minimal.css index a15e9e398e..ea37e357df 100644 --- a/pandora_console/include/styles/pandora_minimal.css +++ b/pandora_console/include/styles/pandora_minimal.css @@ -76,7 +76,8 @@ table, img { } .menu { color:#000; - background:#ddd; + background:#cccacb url('../../images/login_background.png') right center no-repeat; + margin-left: 10px; padding-left: 10px; padding-top: 10px; @@ -89,10 +90,24 @@ table, img { width:400px; height:260px; visibility:hidden; - filter:alpha(opacity=90); - -moz-opacity: 0.90; - opacity: 0.90; + + -moz-box-shadow: 0px 6px 6px #010E1B !important; + -webkit-box-shadow: 0px 6px 6px #010E1B !important; + box-shadow: 0px 6px 6px #010E1B !important; + + -moz-border-top-right-radius: 10px; + -webkit-border-top-right-radius: 10px; + border-top-right-radius: 10px; + + filter:alpha(opacity=97); + -moz-opacity: 0.97; + opacity: 0.97; } + +#show_menu { + background:#cccacb; +} + #loading { position:fixed; width: 200px; @@ -158,3 +173,12 @@ tfoot.scwFoot { color: #FFA500 !important; } +input.next { + background: #e5e5e5 url(../../images/go.png) no-repeat 98% 2px; +} + +input.next { + padding-right: 21px; +} + + diff --git a/pandora_console/operation/agentes/stat_win.php b/pandora_console/operation/agentes/stat_win.php index 0eb05beb3d..5ef32f93df 100644 --- a/pandora_console/operation/agentes/stat_win.php +++ b/pandora_console/operation/agentes/stat_win.php @@ -61,23 +61,66 @@ if ($refresh > 0) { - +