diff --git a/CONTROL/control b/CONTROL/control index 0036516..eb9cd0b 100644 --- a/CONTROL/control +++ b/CONTROL/control @@ -1,7 +1,7 @@ Package: webif Priority: optional Section: web -Version: 0.6.8-1 +Version: 0.6.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),jim-oo,jim-pack,service-control,busybox(>=1.18.3-1),lsof,epg(>=1.0.3),hmt(>=1.0.6),ssmtp diff --git a/var/mongoose/cgi-bin/backup/restore.jim b/var/mongoose/cgi-bin/backup/restore.jim index 7bc7e3f..b074b6a 100755 --- a/var/mongoose/cgi-bin/backup/restore.jim +++ b/var/mongoose/cgi-bin/backup/restore.jim @@ -117,7 +117,7 @@ foreach line $data { $rsvdb query {commit transaction;} -close [open /tmp/.restartpending w] +system restartpending close $fd rsv cleanup diff --git a/var/mongoose/include/sched.jim b/var/mongoose/include/sched.jim index b7ee1ed..3617dd8 100755 --- a/var/mongoose/include/sched.jim +++ b/var/mongoose/include/sched.jim @@ -91,8 +91,14 @@ $(document).ready(function() { } -proc eventheader {{table TBL_RESERVATION}} { +proc eventheader {{table TBL_RESERVATION} note} { puts { +
+ + } + puts "

$note

" + puts { +
@@ -199,13 +205,12 @@ proc eventrow {event {table TBL_RESERVATION}} { } proc eventfooter {} { - puts "
" + puts "
" } set events [rsv list pending] if {[llength $events] > 0} { - puts "

Pending Schedule Events

" - eventheader pending + eventheader pending "Pending Scheduled Events" foreach event $events {eventrow $event pending} eventfooter puts { @@ -217,13 +222,13 @@ if {[llength $events] > 0} { } } -puts "

Scheduled Events

" set events [rsv list] -eventheader +eventheader "live" "Scheduled Events" foreach event $events {eventrow $event} eventfooter puts { +