hummypkg/webif
5
3
Fork 4
Code Issues Pull Requests Releases1 Activity

fix bugs

Browse Source 
git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1944 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2014-06-06 23:24:32 +00:00
parent b4bd45566e
commit de2035e1e0
4 changed files with 11 additions and 5 deletions
CONTROL
control
webif
cgi-bin
status.jim
html/lib/jquery.plugin/confirmAction
jconfirmaction.jquery.js
lib
system.class

2
CONTROL/control

@ -1,7 +1,7 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 1.0.14-3 Version: 1.0.14-4
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk Maintainer: af123@hummypkg.org.uk
Depends: webif-channelicons(>=1.1.11),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,epg(>=1.0.13),hmt(>=1.1.19),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),mongoose Depends: webif-channelicons(>=1.1.11),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,epg(>=1.0.13),hmt(>=1.1.19),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),mongoose

1
webif/cgi-bin/status.jim

@ -34,6 +34,7 @@ proc get_data {} {
} else { } else {
foreach line [split $data "\n"] { foreach line [split $data "\n"] {
regsub -all -- {[[:space:]]+} $line " " line regsub -all -- {[[:space:]]+} $line " " line
regsub -- { \([^\)]+\)$} $line "" line
set name [file rootname [file tail $line]] set name [file rootname [file tail $line]]
if {[dict exists $ret $name]} { if {[dict exists $ret $name]} {
set ret($name) -1 set ret($name) -1

4
webif/html/lib/jquery.plugin/confirmAction/jconfirmaction.jquery.js

@ -29,11 +29,11 @@
o.animate({opacity: 1}, 300); o.animate({opacity: 1}, 300);
o.find('.jcayes').on('click', function() { o.find('.jcayes').on('click', function() {
o.animate({opacity: 0}, 300); o.fadeOut(300, function() { $(this).remove(); });
callback(obj); callback(obj);
}); });
o.find('.jcacancel').on('click', function() { o.find('.jcacancel').on('click', function() {
o.animate({opacity: 0}, 300); o.fadeOut(300, function() { $(this).remove(); });
}); });
} }

9
webif/lib/system.class

@ -181,9 +181,14 @@ proc {system diskspace} {{raw 0}} {
set perc $($used * 100 / $size) set perc $($used * 100 / $size)
set fperc $(100 - $perc) set fperc $(100 - $perc)
if {[file isdirectory /mnt/hd2/Tsr]} { switch [system model] {
HDR { set tsrdir "/mnt/hd2/Tsr" }
HD { set tsrdir "/media/drive1/.tsr" }
}
if {[file isdirectory $tsrdir]} {
set tsrbuf 21474836480 set tsrbuf 21474836480
lassign [exec du -ks /mnt/hd2/Tsr] tsrused lassign [exec du -ks $tsrdir] tsrused
set tsrused $($tsrused * 1024) set tsrused $($tsrused * 1024)
} else { } else {
set tsrbuf 0 set tsrbuf 0