diff --git a/CONTROL/control b/CONTROL/control
index 9f3c125..3acd19a 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
Package: webif
Priority: optional
Section: web
-Version: 1.0.14-2
+Version: 1.0.14-3
Architecture: mipsel
Maintainer: af123@hummypkg.org.uk
Depends: webif-channelicons(>=1.1.11),lighttpd(>=1.4.35-2),jim(>=0.75-1),jim-oo,jim-sqlite3(>=0.75),jim-cgi(>=0.7),jim-binary(>=0.75),service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.19),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),mongoose
diff --git a/webif/html/browse/file.jim b/webif/html/browse/file.jim
index 9ebd6e6..028f47a 100755
--- a/webif/html/browse/file.jim
+++ b/webif/html/browse/file.jim
@@ -81,7 +81,7 @@ if {$type eq "ts"} {
Resumes |
- [$ts get resume] seconds into recording.
+ | [expr [$ts get resume] / 60] minutes into recording.
[progressbar $([$ts get resume] * 100 / [$ts duration 1])]
|
diff --git a/webif/html/lib/jquery.plugin/confirmAction/jconfirmaction.jquery.js b/webif/html/lib/jquery.plugin/confirmAction/jconfirmaction.jquery.js
index 893c64b..f3c8209 100644
--- a/webif/html/lib/jquery.plugin/confirmAction/jconfirmaction.jquery.js
+++ b/webif/html/lib/jquery.plugin/confirmAction/jconfirmaction.jquery.js
@@ -18,7 +18,6 @@
var obj = $(this);
if (obj.next('.jcaquestion').length <= 0)
- {
obj.after('' +
options.question + '
' +
'' + options.yesAnswer +
@@ -26,19 +25,16 @@
'' + options.cancelAnswer +
'
');
- o = obj.next('.jcaquestion');
+ o = obj.next('.jcaquestion');
- o.animate({opacity: 1}, 300);
- o.find('.jcayes').on('click', function() {
- callback(obj);
- });
- o.find('.jcacancel').on('click', function() {
- $(this).parents('.jcaquestion')
- .fadeOut(300, function() {
- $(this).remove();
- });
- });
- }
+ o.animate({opacity: 1}, 300);
+ o.find('.jcayes').on('click', function() {
+ o.animate({opacity: 0}, 300);
+ callback(obj);
+ });
+ o.find('.jcacancel').on('click', function() {
+ o.animate({opacity: 0}, 300);
+ });
}
jQuery.fn.jConfirmAction = function(options, callback) {