diff --git a/CONTROL/control b/CONTROL/control index 462533a..aa9c27c 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,9 +1,9 @@ Package: webif Priority: optional Section: web -Version: 0.9.12-2 +Version: 0.9.12-5 Architecture: mipsel 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.2),stripts(>=1.0.4) +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),stripts(>=1.1.0) Suggests: ffmpeg,webif-iphone Description: An evolving web interface for the Humax. diff --git a/var/mongoose/cgi-bin/browse.jim b/var/mongoose/cgi-bin/browse.jim index db2b56e..5aaffc9 100755 --- a/var/mongoose/cgi-bin/browse.jim +++ b/var/mongoose/cgi-bin/browse.jim @@ -214,6 +214,9 @@ proc entry {file} {{i 0}} { # Shrunk (shown when necessary via Ajax) icon "/img/compress.png" "Shrunk" \ "id=\"sp_$tbfile\"" "va hidden" + # Timeshifted (shown when necessary via Ajax) + icon "/img/clock.png" "Time-shifted Recording" \ + "id=\"tsr_$tbfile\"" "va hidden" set bx [$ts get bookmarks] } diff --git a/var/mongoose/cgi-bin/browse/browse.js b/var/mongoose/cgi-bin/browse/browse.js index 6f8822b..48af8fe 100755 --- a/var/mongoose/cgi-bin/browse/browse.js +++ b/var/mongoose/cgi-bin/browse/browse.js @@ -267,7 +267,8 @@ function preparemenu(el, menu) $(menu).enableContextMenuItems('#delete'); } - if (el.attr('odencd') == 1 && el.attr('dlna') == 1) + if (el.attr('odencd') == 1 && el.attr('dlna') == 1 && + el.attr('encd') == 0) $(menu).enableContextMenuItems('#decrypt'); else $(menu).disableContextMenuItems('#decrypt'); diff --git a/var/mongoose/cgi-bin/browse/strip/strip.jim b/var/mongoose/cgi-bin/browse/strip/strip.jim index 8f262fe..eb1089f 100755 --- a/var/mongoose/cgi-bin/browse/strip/strip.jim +++ b/var/mongoose/cgi-bin/browse/strip/strip.jim @@ -38,7 +38,7 @@ Your original recording files will be retained in a folder called _original.