diff --git a/CONTROL/control b/CONTROL/control index e07bfc86..35454f6a 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.4.0-13 +Version: 1.4.0-14 Architecture: mipsel Maintainer: af123@hpkg.tv Depends: tcpfix,webif-channelicons(>=1.1.25),lighttpd(>=1.4.39-1),jim(>=0.77),jim-oo(>=0.77),jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.3),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.5),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.10),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.21-2),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7),hwctl,nugget(>=0.95),sqlite3(>=3.15.1) diff --git a/webif/cgi-bin/status.jim b/webif/cgi-bin/status.jim index c3864cde..509ff176 100755 --- a/webif/cgi-bin/status.jim +++ b/webif/cgi-bin/status.jim @@ -352,7 +352,9 @@ foreach event $events { # VFD if {[file exists /tmp/.vfd] && $runmode ne "cgi"} { - lappend output "VFD: [file read /tmp/.vfd]" + lappend output "VFD: [string map { + \13 ">" + } [file read /tmp/.vfd]]" } ###################################################################### diff --git a/webif/cgi-bin/vfd.jim b/webif/cgi-bin/vfd.jim new file mode 100755 index 00000000..0baffe04 --- /dev/null +++ b/webif/cgi-bin/vfd.jim @@ -0,0 +1,14 @@ +#!/mod/bin/jimsh + +source /mod/webif/lib/setup + +httpheader + +if {[file exists /tmp/.vfd]} { + puts [string map { + \13 ► + } [file read /tmp/.vfd]] +} else { + puts "" +} + diff --git a/webif/html/css/EXTRA.css b/webif/html/css/EXTRA.css index fcbdff71..6f71622c 100644 --- a/webif/html/css/EXTRA.css +++ b/webif/html/css/EXTRA.css @@ -3,3 +3,13 @@ * It will not be overwritten on webif updates. */ +/* The examples below can be uncommented if required. */ + +/* Hide the VFD display */ + +/* #vfd { display: none; } */ + +/* Hide the Idle time */ + +/* #idletime { display: none; } */ + diff --git a/webif/html/css/style.css b/webif/html/css/style.css index c23339f0..194853bd 100644 --- a/webif/html/css/style.css +++ b/webif/html/css/style.css @@ -1,3 +1,9 @@ +@font-face +{ + font-family: vfd; + src: url(/lib/font/vfd.ttf); +} + html body { line-height: 1.55em; @@ -75,6 +81,21 @@ div.container .usb top: 8px; } +div.container .vfd +{ + position: absolute; + left: 200px; + top: 55px; +} + +#vfd div +{ + background: #444; + color: #1bd1b0; + font-size: 20px; + padding: 5px; +} + #idletime { position: absolute; @@ -677,3 +698,9 @@ a.breadcrumb:hover color: #008080; } +.vfd +{ + font-family: vfd, 'Lucida Console', Monaco, monospace; + color: #1bd1b0; +} + diff --git a/webif/html/js/topbar.js b/webif/html/js/topbar.js index c7d4ec04..564092d9 100644 --- a/webif/html/js/topbar.js +++ b/webif/html/js/topbar.js @@ -20,5 +20,19 @@ function updateidle() updateidle(); setInterval(updateidle, 60000); +if ($('#vfd').length) +{ + + function updatevfd() + { + $.get('/cgi-bin/vfd.jim', function(vfd) { + $('#vfd div').html(vfd); + }); + } + + updatevfd(); + setInterval(updatevfd, 5000); +} + }); diff --git a/webif/html/lib/font/vfd.ttf b/webif/html/lib/font/vfd.ttf new file mode 100644 index 00000000..ec70abc7 Binary files /dev/null and b/webif/html/lib/font/vfd.ttf differ diff --git a/webif/html/lib/topbar.jim b/webif/html/lib/topbar.jim index ceae77f9..089e9395 100644 --- a/webif/html/lib/topbar.jim +++ b/webif/html/lib/topbar.jim @@ -27,6 +27,7 @@ puts { if {[system model] eq "HDR" && [system usbdisks] > 0} { source /mod/webif/include/usbeject.jim } +source /mod/webif/include/vfd.jim puts {
diff --git a/webif/include/vfd.jim b/webif/include/vfd.jim new file mode 100755 index 00000000..1ecb7a29 --- /dev/null +++ b/webif/include/vfd.jim @@ -0,0 +1,14 @@ +#!/mod/bin/jimsh + +source /mod/webif/lib/setup + +if {[file exists "/tmp/.vfd"]} { + puts { +
+
+ Loading... +
+
+ } +} +