diff --git a/CONTROL/control b/CONTROL/control
index a36cfc4..d2bf784 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,9 +1,9 @@
Package: webif
Priority: optional
Section: web
-Version: 0.8.8-1
+Version: 0.8.8-2
Architecture: mipsel
Maintainer: af123@hummypkg.org.uk
-Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.2),ssmtp,anacron
+Depends: mongoose(>=3.0-2),jim(>=0.71-1),jim-sqlite3(>=0.71-1),jim-cgi(>=0.4-1),jim-oo,jim-pack,service-control,busybox(>=1.19.3-1),lsof,epg(>=1.0.8),hmt(>=1.1.3),ssmtp,anacron
Suggests: ffmpeg,webif-iphone,nicesplice,id3v2
Description: An evolving web interface for the Humax.
diff --git a/var/mongoose/cgi-bin/browse/decrypt.jim b/var/mongoose/cgi-bin/browse/decrypt.jim
index b36a6e8..458a79b 100755
--- a/var/mongoose/cgi-bin/browse/decrypt.jim
+++ b/var/mongoose/cgi-bin/browse/decrypt.jim
@@ -73,6 +73,7 @@ puts "
if {$url eq ""} {
puts "This file has not been indexed by the media server.
Cannot decrypt."
+ puts "Have you enabled Content Sharing in the Humax menus?"
exit
}
diff --git a/var/mongoose/cgi-bin/browse/file.jim b/var/mongoose/cgi-bin/browse/file.jim
index e82a8ae..7c81b63 100755
--- a/var/mongoose/cgi-bin/browse/file.jim
+++ b/var/mongoose/cgi-bin/browse/file.jim
@@ -65,15 +65,22 @@ if {$type eq "ts"} {
Start Time |
"
puts [clock format [$ts get start] -format "%c %Z"]
+ puts "(Scheduled: [
+ clock format [$ts get schedstart] -format "%c %Z"])"
puts " |
End Time |
"
puts [clock format [$ts get end] -format "%c %Z"]
+ puts "(Scheduled: [clock format \
+ [expr [$ts get schedstart] + [$ts get scheddur]] \
+ -format "%c %Z"])"
puts " |
Duration |
- [$ts duration] minute(s). |
+ [$ts duration] minute(s).
+ (Scheduled: [expr [$ts get scheddur] / 60])
+ |
Size |
$sz |
diff --git a/var/mongoose/cgi-bin/epg_info.jim b/var/mongoose/cgi-bin/epg_info.jim
index ff13d0a..b7bbe3d 100755
--- a/var/mongoose/cgi-bin/epg_info.jim
+++ b/var/mongoose/cgi-bin/epg_info.jim
@@ -18,18 +18,6 @@ set record [lindex [epg fetch dump -service $service -event $event] 0]
$record get_channel_info
set others [$record othertimes]
-puts {
-
-}
-
puts "
diff --git a/var/mongoose/html/css/style.css b/var/mongoose/html/css/style.css
index be6a708..9194208 100644
--- a/var/mongoose/html/css/style.css
+++ b/var/mongoose/html/css/style.css
@@ -82,6 +82,12 @@ table.borders, table.borders td, table.borders th
color: black;
}
+.hover
+{
+ background: #f6ff5b;
+ color: black;
+}
+
table td,table th
{
font-size: small;
@@ -296,3 +302,11 @@ div.cut
font-size: 12px;
}
+font.also
+{
+ font-size: 0.9em;
+ font-style: italic;
+ color: #333;
+ background: transparent;
+}
+
diff --git a/var/mongoose/include/sched.jim b/var/mongoose/include/sched.jim
index e4ab2f4..315bde6 100755
--- a/var/mongoose/include/sched.jim
+++ b/var/mongoose/include/sched.jim
@@ -89,6 +89,10 @@ $(document).ready(function() {
$dialog.dialog('open');
}
$('a.schedule').click(function(e) { schedpopup(e, $(this)) });
+
+ $('table.tablesorter').hover(
+ function() { $(this).addClass('hover'); },
+ function() { $(this).removeClass('hover'); });
});
}
diff --git a/var/mongoose/lib/ts.class b/var/mongoose/lib/ts.class
index 2c0b217..240a46d 100644
--- a/var/mongoose/lib/ts.class
+++ b/var/mongoose/lib/ts.class
@@ -17,6 +17,8 @@ class ts {
error ""
guidance ""
bookmarks 0
+ schedstart 0
+ scheddur 0
}
ts method duration {{raw 0}} {
@@ -35,7 +37,7 @@ ts method _parse {line} {
lassign [split $line "\t"] \
title synopsis definition channel_num channel_name \
- start end flags_list guidance bookmarks
+ start end flags_list guidance bookmarks schedstart scheddur
set flags [split [string range $flags_list 0 end-1] ,]
}