diff --git a/CONTROL/control b/CONTROL/control index a4fbfe3..50991d5 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,10 +1,10 @@ Package: webif Priority: optional Section: web -Version: 1.3.2-4 +Version: 1.3.2-5 Architecture: mipsel Maintainer: af123@hpkg.tv -Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.6),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.94) +Depends: tcpfix,webif-channelicons(>=1.1.24),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.3),hmt(>=2.0.10),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.1.8),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.94) Suggests: Description: An evolving web interface for the Humax. Tags: http://hummy.tv/forum/threads/7116/ diff --git a/webif/html/epg/service.jim b/webif/html/epg/service.jim index 4a25a60..47589f6 100755 --- a/webif/html/epg/service.jim +++ b/webif/html/epg/service.jim @@ -2,10 +2,15 @@ package require cgi source /mod/webif/lib/setup -require epg.class spinner.class altrow +require epg.class spinner.class altrow findhsvc jqplugin iphone-style-checkboxes freezeheader scrollto jscss service.js service.css + +set service [cgi_get service 4170] +set chname [system strip [get_channel_attr_bysvc $service szSvcName]] +setpagetag "EPG - $chname" + header require totop @@ -18,7 +23,6 @@ require totop require epg_popup -set service [cgi_get service 4170] set records [epg dbfetch dump \ -service $service \ -sort "strftime('%%H%%J', start, 'unixepoch', 'localtime'), strftime('%%M', start, 'unixepoch')" \ diff --git a/webif/html/img/aractive.gif b/webif/html/img/aractive.gif new file mode 100644 index 0000000..91478d6 Binary files /dev/null and b/webif/html/img/aractive.gif differ diff --git a/webif/html/lib/header.jim b/webif/html/lib/header.jim index a89429c..6a1cfcb 100755 --- a/webif/html/lib/header.jim +++ b/webif/html/lib/header.jim @@ -10,8 +10,11 @@ puts { } -source /mod/webif/include/model.jim + +puts $::mws::pagetitle + incr ::mws::headerdone + puts { diff --git a/webif/html/lib/topbar.jim b/webif/html/lib/topbar.jim index 340db6d..ceae77f 100644 --- a/webif/html/lib/topbar.jim +++ b/webif/html/lib/topbar.jim @@ -17,7 +17,7 @@ puts { } -source /mod/webif/include/model.jim +puts $::mws::pagetitle source /mod/webif/include/upgrade.jim puts { diff --git a/webif/html/sched/list/index.jim b/webif/html/sched/list/index.jim index 5ed8ec6..280b673 100755 --- a/webif/html/sched/list/index.jim +++ b/webif/html/sched/list/index.jim @@ -207,15 +207,7 @@ proc eventrow {event {table TBL_RESERVATION}} { puts "$ds" } - if {$showing == 2} { - # AR watch - puts " - - - - - " - } elseif {$showing} { + if {$showing == 1} { set perc $(($n - ($s - $sp)) * 100 / \ ($d + $sp + $ep)) puts "
" diff --git a/webif/include/model.jim b/webif/include/model.jim deleted file mode 100755 index c99cafb..0000000 --- a/webif/include/model.jim +++ /dev/null @@ -1,3 +0,0 @@ - -puts "Humax [system model] Fox T2 ([system hostname])" - diff --git a/webif/lib/findhsvc b/webif/lib/findhsvc index 337c2c7..d2421ad 100755 --- a/webif/lib/findhsvc +++ b/webif/lib/findhsvc @@ -67,5 +67,21 @@ if {![exists -proc get_channel_attr]} { } return 0 } + + proc get_channel_attr_bysvc {svc {field usLcn}} { + global rsvdb + + set ff [$rsvdb query " + select $field + from channel.TBL_SVC + where usSvcId = $svc + limit 1 + "] + + if {[llength $ff] == 1} { + return [lindex [lindex $ff 0] 1] + } + return 0 + } } diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class index fd9b3a8..1e01dbb 100755 --- a/webif/lib/rsv.class +++ b/webif/lib/rsv.class @@ -236,6 +236,9 @@ rsv method iconset {{height 20}} { lappend iconlist \ "\"$padding\"" + } elseif {[$self status] eq "arwatch"} { + lappend iconlist \ + "" } else { lappend iconlist \ "" diff --git a/webif/lib/setup b/webif/lib/setup index 2ffaf92..c27c462 100644 --- a/webif/lib/setup +++ b/webif/lib/setup @@ -48,8 +48,46 @@ if {![exists -proc require]} { set done 1 } + proc setpagetag {name} { + set ::mws::pagetag $name + } + + proc ::mws::setpagetitle {} { + global env + if {[info exists ::mws::pagetitle]} return + if {![dict exists $env REQUEST_URI]} return + if {![info exists ::mws::pagetag]} { + switch -glob -- $env(REQUEST_URI) { + "/sched/*" { set ::mws::pagetag "Schedule" } + "/diag/*" { set ::mws::pagetag "Diagnostics" } + "/browse/*" { set ::mws::pagetag "Browse Files" } + "/xepg/*" { set ::mws::pagetag "EPG" } + "/settings/*" { set ::mws::pagetag "Settings" } + "/services/*" { set ::mws::pagetag "Services" } + "/pkg/*" { set ::mws::pagetag "Packages" } + "/cgi-bin/*" { set ::mws::pagetag "" } + default { + set _xpath [split $env(REQUEST_URI) /] + if {[llength $_xpath] > 2} { + set ::mws::pagetag [string totitle [\ + lindex $_xpath 1]] + } else { + set ::mws::pagetag "" + } + } + } + } + + set ::mws::pagetitle "Humax [system model] Fox T2 ([\ + system hostname])" + if {$::mws::pagetag ne ""} { + append ::mws::pagetitle " - $::mws::pagetag" + } + } + proc header {{type "text/html"} {cache 0}} { httpheader $type $cache + ::mws::setpagetitle uplevel source /mod/webif/html/lib/header.jim incr ::mws::headerdone }