diff --git a/CONTROL/control b/CONTROL/control index 76bf369..9c0eea2 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,10 +1,10 @@ Package: webif Priority: optional Section: web -Version: 1.3.0-3 +Version: 1.3.0-4 Architecture: mipsel Maintainer: af123@hpkg.tv -Depends: tcpfix,webif-channelicons(>=1.1.22-2),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.9),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.7),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) +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.9),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.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) Suggests: Description: An evolving web interface for the Humax. Tags: http://hummy.tv/forum/threads/7116/ diff --git a/webif/html/sched/visual/script.js b/webif/html/sched/visual/script.js index b50b267..798f886 100644 --- a/webif/html/sched/visual/script.js +++ b/webif/html/sched/visual/script.js @@ -19,12 +19,19 @@ $epgpopup = $('#epgpopup').dialog({ draggable: true, resizable: true, buttons: [ { - text: 'Cancel Entire Recording', + text: 'Cancel Recording', id: 'b_cancel', class: 'ep_button', icons: { primary: "ui-icon-trash" }, click: cancel_recording }, + { + text: 'Cancel Pending Change', + id: 'b_cancelpending', + class: 'ep_button', + icons: { primary: "ui-icon-trash" }, + click: cancel_pending + }, { text: 'Skip This Episode', id: 'b_skip', @@ -83,6 +90,30 @@ function cancel_recording() }); } +function cancel_pending() +{ + $('#b_cancelpending').dojConfirmAction({ + question: 'Cancel Pending Change?', + yesAnswer: 'Yes', + cancelAnswer: 'No' + }, function(el) { + var sid = $epgpopup.attr('sid'); + $.get('rpc/cancel.jim', { + slot: sid, + table: 'pending' + }, function() { + $('.ct_event[sid=' + sid + ']') + .attr('sclass', 'queued-unschedule') + .addClass('purpleshade strike'); + $epgpopup.dialog('close'); + $.growl.error({ title: 'Success', + message: + "The pending change has been cancelled." }); + list_reload_required = true; + }); + }); +} + function skip_episode() { $('#b_skip').dojConfirmAction({ @@ -254,9 +285,13 @@ function update_buttons(xs, xe) var sclass = $epgpopup.attr('sclass'); var crid = $.trim($epgpopup.find('span.scrid').text()); - if (sid == 0 || sclass != 'tbl_reservation') + $('.ep_button').hide(); + if (sid < 0) + return; + + if (sclass.indexOf('pending') >= 0) { - $('.ep_button').hide(); + $('#b_cancelpending').show(); return; }