From 67ffdc81053e23914533d06294b2b6d47948d510 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Wed, 15 Oct 2014 19:31:43 +0000 Subject: [PATCH] new pie chart git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@2055 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 2 +- webif/html/css/style.css | 19 ++++++++ webif/html/diskspace/diskspace.jim | 71 +++++++++++++++++++++++++++++ webif/html/diskspace/diskspace.js | 59 ++++++++++++++++++++++++ webif/html/img/pie-blue.png | Bin 0 -> 6866 bytes webif/html/img/pie-grey.png | Bin 0 -> 6871 bytes webif/html/img/pie-yellow.png | Bin 0 -> 6845 bytes webif/html/lib/header.jim | 1 + webif/html/lib/topbar.jim | 3 +- 9 files changed, 153 insertions(+), 2 deletions(-) create mode 100755 webif/html/diskspace/diskspace.jim create mode 100644 webif/html/diskspace/diskspace.js create mode 100644 webif/html/img/pie-blue.png create mode 100644 webif/html/img/pie-grey.png create mode 100644 webif/html/img/pie-yellow.png diff --git a/CONTROL/control b/CONTROL/control index 35f1c96..e9282c4 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.0.17-3 +Version: 1.0.17-5 Architecture: mipsel Maintainer: af123@hummypkg.org.uk Depends: webif-channelicons(>=1.1.13),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.0.13),hmt(>=1.1.21),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),mongoose diff --git a/webif/html/css/style.css b/webif/html/css/style.css index 3f3c422..29fa0af 100644 --- a/webif/html/css/style.css +++ b/webif/html/css/style.css @@ -394,6 +394,11 @@ div.toolbar padding: 6px; } +#status +{ + width: 60%; +} + span.toolbarcell { float: left; @@ -501,3 +506,17 @@ span.foldernum padding-top: 1.2em; } +#tbdiskpie +{ + float: right; + width: 150px; + height: 150px; + margin-left: 10px; +} + +.tbdiskpie +{ + top: -10px !important; +} + + diff --git a/webif/html/diskspace/diskspace.jim b/webif/html/diskspace/diskspace.jim new file mode 100755 index 0000000..fade8e6 --- /dev/null +++ b/webif/html/diskspace/diskspace.jim @@ -0,0 +1,71 @@ +#!/mod/bin/jimsh + +source /mod/webif/lib/setup +require system.class pretty_size + +lassign [system diskspace 1] size used perc free fperc tsrbuf tsrused + +# Calculate the TSR reserve +set tsrreserve $($tsrbuf - $tsrused) +# Adjust values to account for the TSR reserve +set free $($free - $tsrreserve) +set used $($size - $free) + +set dbs 0 +if {[system pkginst undelete]} { + set dbs [system dustbinsize] + set used $($used - $dbs) +} + +set uperc $($used * 100 / $size) +set dperc $($dbs * 100 / $size) +set fperc $(100 - $uperc - $dperc) + +set usedstr [pretty_size $used] +set freestr [pretty_size $free] +set dbsstr [pretty_size $dbs] + +puts " + + +" + +puts " + + Total space: [pretty_size $size]
+ + Used: $usedstr ($uperc%)
+ + Free: $freestr ($fperc%) +" +if {$dbs} { + puts "
+ + Dustbin: $dbsstr ($dperc%)" +} +puts " +
+ +" + diff --git a/webif/html/diskspace/diskspace.js b/webif/html/diskspace/diskspace.js new file mode 100644 index 0000000..2eeed16 --- /dev/null +++ b/webif/html/diskspace/diskspace.js @@ -0,0 +1,59 @@ +//$(function () { + +$('#tbdiskpie') + .hover(function(e) { e.stopPropagation(); $(this).stop(true, true); }) + .highcharts({ + chart: { + plotBackgroundColor: null, + plotBorderWidth: null, + backgroundColor: 'transparent', + plotShadow: false, + spacing: [0, 0, 0, 0], + className: 'tbdiskpie', +// height: 150, width: 150, + events: { + click: function(e) { + window.location = '/diag/dspace/index.jim'; + } + } + }, + colors: + Highcharts.map(['#7cb5ec', '#e4d354', '#cccccc'], function(color) { + return { + radialGradient: { cx: 0.5, cy: 0.3, r: 0.7 }, + stops: [ + [0, color], + [1, Highcharts.Color(color).brighten(-0.3).get('rgb')] + ] + }; + }), + title: { text: '' }, + credits: false, + plotOptions: { + pie: { + animation: { duration: 300 }, + allowPointSelect: false, + cursor: 'pointer', + dataLabels: { + enabled: false + }, + shadow: false, + borderWidth: 0, + states: { hover: false } + } + }, + tooltip: { + enabled: true, + formatter: function() { + return this.point.name + ': ' + this.point.pretty; + } + }, + series: [{ + type: 'pie', + name: 'Disk Space', + data: diskspace_data + }] + }); + +//}); + diff --git a/webif/html/img/pie-blue.png b/webif/html/img/pie-blue.png new file mode 100644 index 0000000000000000000000000000000000000000..cdd62de69f71e261c34e9d75665d3d987867a5b3 GIT binary patch literal 6866 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 Thi$|DxmIuFlp&QeCISBk^^7rU literal 0 HcmV?d00001 diff --git a/webif/html/img/pie-grey.png b/webif/html/img/pie-grey.png new file mode 100644 index 0000000000000000000000000000000000000000..1dbd32b71c8602eba55d0e80c98837294f0e566d GIT binary patch literal 6871 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 atH-y9Vt^)t5A8p9>y4Z;q)f)d@BaWZ5j0r< literal 0 HcmV?d00001 diff --git a/webif/html/img/pie-yellow.png b/webif/html/img/pie-yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..9b9b9ee888d550d2e21f9b411890dc48c775b4b4 GIT binary patch literal 6845 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�Ct*;L z@H0K8lrex~s9}lwE#;1|8OO1QhBpLT$$AHf7(csW(|fG+w{kPJCEzTE-BD;7VMJ>* zRrzuTYfqJ$d+3Q9*(FVRz;LHe7Cg5%FNtxB(YodRwmgcs?^B-|CY0>Axz*d99~0vO z?*$fXZfXXdJ-1V~T(-n0Z7AfT2b|;C)3w8|Df{U)ET*gkIlmF_DN{ouNZ%_Cy(uHG zGo`i4P+n^EvUI&ZvBs~!^CItz6cK`1unR=W=m)}!}P%f<7aW0r%FvxYovg1ih{ zCiYIfFur$%Xf5bfZE*CD8fA;oZJ0qfZdW&Ts_;R&Wa>=v^Mr6kk>o%~yjLJ&^J_-P z_$%Gbrn$$p;987$=~2$DoF3+<`P9?2361K!ixj0ct&>ic$1MtjqYajX0-qZO*Am9Q z%@XYwxHXtHoO;4;$+24q6Wbcag0eUm4v20`O!XJ(4|QBv9E=fn=#3P}8>r=irN=0EW^71j%A#{s*?+Zp{TD(bxFxxyx7pj{S7C?&RfjY8*Z<7hdDQ}xBMA-?_-U%Yv$=J*?Rmpa*lwAP?j zplY*0stV{V>(baO*5uUY9Xhqk)VasMAbYs8k);uIE_%V=vISHC3ZlP@IIe!~+8UTY zI{til9DAg8Ct$_0!gw=Y`5k0<)+#qh?j?3Feiw8QxgM|^wh>mI=#`L=z?fj^({Q(^ zJ*r)##atFxa#7A+vR>w`E2IO`F`TbhtiQ(pvwpSP%~FG?LwQ@@%QUZ<)s+(mzoh~U z%xr8B(*x``0W-Zb3woS$3kz&=F`tD10yukjb=BU}BN$N+uJ|sYgx&YI5(y6&g7O1u z+1-pU0DwoS2sJHdEky-UQ=~1Au^H0DoX6eP{_mdx004Fu{Y%=KI~&uv+uGPUiMoq3 z{7XahFZ~Z2#6b5i6=!R41}#N6oea{^obEM`01qz%1doo64(w=VA*uqE`w#r@N}S1B#Tgj>arEEz?|quPBmT#eozs89`WqnV9|`Cc4=?Dyw*NxG|8Pa& z2zPTEEhxg)+|KE*56G+6;D4$AKZ5^p_`iVK|3BdW68r}U2K}@B{}s-^bM-Io-(*4X zz@Yyo9)eeog5Uo=i=sDBDK$2-fT&%C>r#9Ej!Ai-qh8)c$q&v$dk~j9rc&z=Ox1`6Pr-5;UcpHNv;n^Kzt};^u zjGuV8QeS;UgXlMDg*bzw=_A%_5m(KsBO+GU{T5iu&cE}*mWdNm?*#`SYUgNPK_-i~ zbDHi>IfbK$59=0`B$9zNKmN>NEd(E=S)m?UJbxb3Hc;~XbA#T + } if {[info exists _mws_js]} { foreach js $::_mws_js { diff --git a/webif/html/lib/topbar.jim b/webif/html/lib/topbar.jim index b8a4b74..048aac7 100644 --- a/webif/html/lib/topbar.jim +++ b/webif/html/lib/topbar.jim @@ -8,7 +8,8 @@ puts {
} -source /mod/webif/include/diskspace.jim +#source /mod/webif/include/diskspace.jim +source /mod/webif/html/diskspace/diskspace.jim puts {