add Humax version to main screen, fix shtml footer;

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1029 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2012-06-03 20:12:31 +00:00
parent 895dda6dee
commit 7d1331f1aa
4 changed files with 25 additions and 6 deletions

View File

@ -1,9 +1,9 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 0.9.10 Version: 0.9.10-1
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk Maintainer: af123@hummypkg.org.uk
Depends: webif-channelicons(>=1.0.1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.1) Depends: webif-channelicons(>=1.0.1),mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2)
Suggests: ffmpeg,webif-iphone Suggests: ffmpeg,webif-iphone
Description: An evolving web interface for the Humax. Description: An evolving web interface for the Humax.

View File

@ -5,9 +5,11 @@ puts {
<div class=footer> <div class=footer>
} }
set rendertime [expr [expr [clock milliseconds] - $renderstart] / 1000.0] if {![catch {
set rendertime [expr [expr [clock milliseconds] - $renderstart] / 1000.0]
puts "<font class=footnote>Rendered in: $rendertime seconds</font>" }]} {
puts "<font class=footnote>Rendered in: $rendertime seconds</font>"
}
puts { puts {
</div> </div>

View File

@ -3,8 +3,13 @@
source /mod/webif/lib/setup source /mod/webif/lib/setup
require system.class require system.class
puts "<font class=blood style=\"font-size: 0.9em; float: right; clear: right\"> puts "<font class=blood style=\"font-size: 0.9em; float: right; clear: right\">
Web interface version: [system pkgver webif]<br> Web interface version: [system pkgver webif]<br>
Custom firmware version: [system modversion] Custom firmware version: [system modversion]
</font>" "
if {![catch {set fhtcpversion [system fhtcpversion]}]} {
puts "<br>Humax Version: $fhtcpversion"
}
puts "</font>"

View File

@ -33,6 +33,18 @@ proc {system modversion} {{short 0}} {
return [format "%d.%d%d" $a $b $c] return [format "%d.%d%d" $a $b $c]
} }
proc {system fhtcpversion} {} {
set file "/etc/fhtcpversion"
if {![file exists $file]} { set file "/root/fhtcpversion" }
if {[catch {set fp [open $file r]}]} {
set ver "?.??.??"
} else {
set ver [string trim [read $fp]]
close $fp
}
return $ver
}
proc {system pkgver} {{pkg webif}} { proc {system pkgver} {{pkg webif}} {
return [lrange [split [exec opkg list-installed $pkg] " "] 2 end] return [lrange [split [exec opkg list-installed $pkg] " "] 2 end]
} }