fix EPG calendar. Leave Now ungrayed.

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1660 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2013-09-08 19:15:54 +00:00
parent 27c7818da8
commit f7de940e51
3 changed files with 7 additions and 4 deletions

View File

@ -1,7 +1,7 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 1.0.6 Version: 1.0.6-1
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk Maintainer: af123@hummypkg.org.uk
Depends: webif-channelicons(>=1.1.4),mongoose(>=3.0-9),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6) Depends: webif-channelicons(>=1.1.4),mongoose(>=3.0-9),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73-1),jim-cgi(>=0.7),jim-binary,service-control(>=1.2),busybox(>=1.20.2-1),lsof,epg(>=1.0.13),hmt(>=1.1.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6)

View File

@ -87,7 +87,8 @@ but "&lt< -1 Week" $($stt - 3600 * 24 * 7) \
$($stt - $now + 3600 >= 3600 * 24 * 7) $($stt - $now + 3600 >= 3600 * 24 * 7)
but "&lt< -1 Day" $($stt - 3600 * 24) $($stt - $now >= 3600 * 23) but "&lt< -1 Day" $($stt - 3600 * 24) $($stt - $now >= 3600 * 23)
but "<< Earlier", $($stt - 3600 * 4) $($stt > $now) but "<< Earlier", $($stt - 3600 * 4) $($stt > $now)
but "< Now >" $now $($current == 0) #but "< Now >" $now $($current == 0)
but "< Now >" $now
but ">> Later" $ett; but ">> Later" $ett;
but "&gt;&gt; +1 Day" $($stt + 3600 * 24) $($stt < $now + 8 * 3600 * 24) but "&gt;&gt; +1 Day" $($stt + 3600 * 24) $($stt < $now + 8 * 3600 * 24)
but "&gt;&gt; +1 Week" $($stt + 3600 * 24 * 7) $($stt < $now + 8 * 3600 * 24) but "&gt;&gt; +1 Week" $($stt + 3600 * 24 * 7) $($stt < $now + 8 * 3600 * 24)

View File

@ -9,13 +9,15 @@ $('button.nav').click(function() {
'&pos=' + $('#xegrid').scrollTop(); '&pos=' + $('#xegrid').scrollTop();
}); });
var now = new Date().getTime();
$('#xepg_dp').datepicker({ $('#xepg_dp').datepicker({
buttonImage: '/img/cal.gif', buttonImage: '/img/cal.gif',
buttonImageOnly: true, buttonImageOnly: true,
showOn: 'button', showOn: 'button',
dateFormat: '@', dateFormat: '@',
minDate: '[expr $now * 1000]', minDate: now,
maxDate: '[expr ($now + 7 * 86400) * 1000]', maxDate: now + 7 * 86400,
onSelect: function(val, sel) { onSelect: function(val, sel) {
var stt = $(this).attr('stt'); var stt = $(this).attr('stt');
// Extract date part // Extract date part