From 0bd1f610d10beaf048ffd3e7884bb812fd49be47 Mon Sep 17 00:00:00 2001 From: hummypkg Date: Sun, 14 Aug 2016 08:52:49 +0000 Subject: [PATCH] check size of pending list before showing pending panel git-svn-id: file:///root/webif/svn/pkg/webif/trunk@3156 2a923420-c742-0410-a762-8d5b09965624 --- CONTROL/control | 4 ++-- webif/cgi-bin/pending.jim | 9 +++++++++ webif/html/js/epg_popup.js | 5 ++++- webif/html/settings/modules/advanced/settings.hook | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) create mode 100755 webif/cgi-bin/pending.jim diff --git a/CONTROL/control b/CONTROL/control index 6741d19..4d8d2fd 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,10 +1,10 @@ Package: webif Priority: optional Section: web -Version: 1.3.1-1 +Version: 1.3.1-2 Architecture: mipsel Maintainer: af123@hpkg.tv -Depends: tcpfix,webif-channelicons(>=1.1.23),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.0),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 +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.2),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 Suggests: Description: An evolving web interface for the Humax. Tags: http://hummy.tv/forum/threads/7116/ diff --git a/webif/cgi-bin/pending.jim b/webif/cgi-bin/pending.jim new file mode 100755 index 0000000..8dcc839 --- /dev/null +++ b/webif/cgi-bin/pending.jim @@ -0,0 +1,9 @@ +#!/mod/bin/jimsh + +source /mod/webif/lib/setup +require rsv.class + +httpheader "application/json" + +puts "{ \"pending\": \"[rsv count pending]\" }" + diff --git a/webif/html/js/epg_popup.js b/webif/html/js/epg_popup.js index 8431a45..57f1d29 100644 --- a/webif/html/js/epg_popup.js +++ b/webif/html/js/epg_popup.js @@ -7,7 +7,10 @@ $(function() { '&event=' + encodeURIComponent($('#epgpopup_dialogue').attr('xe')) + '&type=' + type, function() { - $('#restart_block').slideDown('slow'); + $.getJSON('/cgi-bin/pending.jim', function(data) { + if (data.pending > 0) + $('#restart_block').slideDown('slow'); + }); }); $(":button:contains('Record')").fadeOut('slow'); $(":button:contains('Reminder')").fadeOut('slow'); diff --git a/webif/html/settings/modules/advanced/settings.hook b/webif/html/settings/modules/advanced/settings.hook index 7d34243..bdc85cb 100755 --- a/webif/html/settings/modules/advanced/settings.hook +++ b/webif/html/settings/modules/advanced/settings.hook @@ -13,7 +13,7 @@ puts -nonewline " setting_toggle "Show development and advanced packages?" "pkgdev" $pkgdev if {[system pkginst nugget]} { - setting_toggle "Real-time scheduling? (alpha)" "rtschedule" $rtschedule + setting_toggle "Real-time scheduling? (beta)" "rtschedule" $rtschedule } puts -nonewline "