diff --git a/CONTROL/control b/CONTROL/control index 35454f6a..5d1f60b2 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 1.4.0-14 +Version: 1.4.0-15 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/html/css/EXTRA.css b/webif/html/css/EXTRA.css index 6f71622c..b4bab9cd 100644 --- a/webif/html/css/EXTRA.css +++ b/webif/html/css/EXTRA.css @@ -5,11 +5,30 @@ /* The examples below can be uncommented if required. */ -/* Hide the VFD display */ +/* Hide the Guidance icons on the schedule and EPG pages */ +/* img.guidance { display: none; } */ +/* Hide the VFD display */ /* #vfd { display: none; } */ -/* Hide the Idle time */ +/* Set VFD to orange */ +/* #vfd { color: #ffa500; } */ +/* Set VFD to orange with no black background */ +/* #vfd { color: #ffa500; background: transparent; } */ + +/* Move VFD left to align with Humax above */ +/* #vfd { left: 180px; } */ + +/* Hide the Idle time */ /* #idletime { display: none; } */ +/* Make the package screens more compact */ +/* table.avail td, table.inst td, table.upgr td { padding: 0 !important; } */ + +/* Shrink main menu icons */ +/* img.mmenu { width: 120px !important; height: 125px !important; } */ + +/* Wrap long lines in the queue screen log column */ +/* td.queuelog { white-space: normal !important; } */ + diff --git a/webif/html/css/EXTRA.css.distrib b/webif/html/css/EXTRA.css.distrib new file mode 100644 index 00000000..b4bab9cd --- /dev/null +++ b/webif/html/css/EXTRA.css.distrib @@ -0,0 +1,34 @@ +/* This style sheet can be customised to change the look and feel of some + * web interface elements. + * It will not be overwritten on webif updates. + */ + +/* The examples below can be uncommented if required. */ + +/* Hide the Guidance icons on the schedule and EPG pages */ +/* img.guidance { display: none; } */ + +/* Hide the VFD display */ +/* #vfd { display: none; } */ + +/* Set VFD to orange */ +/* #vfd { color: #ffa500; } */ + +/* Set VFD to orange with no black background */ +/* #vfd { color: #ffa500; background: transparent; } */ + +/* Move VFD left to align with Humax above */ +/* #vfd { left: 180px; } */ + +/* Hide the Idle time */ +/* #idletime { display: none; } */ + +/* Make the package screens more compact */ +/* table.avail td, table.inst td, table.upgr td { padding: 0 !important; } */ + +/* Shrink main menu icons */ +/* img.mmenu { width: 120px !important; height: 125px !important; } */ + +/* Wrap long lines in the queue screen log column */ +/* td.queuelog { white-space: normal !important; } */ + diff --git a/webif/html/css/style.css b/webif/html/css/style.css index 194853bd..ed327c3e 100644 --- a/webif/html/css/style.css +++ b/webif/html/css/style.css @@ -81,19 +81,16 @@ div.container .usb top: 8px; } -div.container .vfd +#vfd { position: absolute; left: 200px; top: 55px; -} - -#vfd div -{ background: #444; color: #1bd1b0; font-size: 20px; padding: 5px; + font-family: vfd, 'Lucida Console', Monaco, monospace; } #idletime @@ -698,9 +695,3 @@ 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 564092d9..1b43961f 100644 --- a/webif/html/js/topbar.js +++ b/webif/html/js/topbar.js @@ -26,7 +26,7 @@ if ($('#vfd').length) function updatevfd() { $.get('/cgi-bin/vfd.jim', function(vfd) { - $('#vfd div').html(vfd); + $('#vfd').html(vfd); }); } diff --git a/webif/include/vfd.jim b/webif/include/vfd.jim index 1ecb7a29..21721520 100755 --- a/webif/include/vfd.jim +++ b/webif/include/vfd.jim @@ -5,9 +5,7 @@ source /mod/webif/lib/setup if {[file exists "/tmp/.vfd"]} { puts {