From ddde3ecc4efde0e1e4ba494cdb6917d50f4400f0 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Thu, 1 Sep 2016 16:49:01 +0000 Subject: [PATCH] 1.3.2-5 git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3246 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 4 ++-- webif/html/epg/service.jim | 8 +++++-- webif/html/img/aractive.gif | Bin 0 -> 11121 bytes webif/html/lib/header.jim | 5 ++++- webif/html/lib/topbar.jim | 2 +- webif/html/sched/list/index.jim | 10 +-------- webif/include/model.jim | 3 --- webif/lib/findhsvc | 16 ++++++++++++++ webif/lib/rsv.class | 3 +++ webif/lib/setup | 38 ++++++++++++++++++++++++++++++++ 10 files changed, 71 insertions(+), 18 deletions(-) create mode 100644 webif/html/img/aractive.gif delete mode 100755 webif/include/model.jim 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 0000000000000000000000000000000000000000..91478d60a76f38133cd9358a1923bccf42d1da83 GIT binary patch literal 11121 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 literal 0 HcmV?d00001 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 }