update to Jim 0.75

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@1811 2a923420-c742-0410-a762-8d5b09965624

CONTROL/conffiles

@@ -0,0 +1,6 @@
+var/mongoose/html/css/EXTRA.css
+var/mongoose/html/favicon.ico
+var/mongoose/html/img/fav/57.png
+var/mongoose/html/img/fav/72.png
+var/mongoose/html/img/fav/114.png
+var/mongoose/html/img/fav/144.png

CONTROL/control

@@ -1,9 +1,10 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.0
+Version: 1.0.9-6
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
-Depends: webif-channelicons(>=1.0.5),mongoose(>=3.0-7),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.13),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.1.2),smartmontools,tmenu(>=1.05),ffmpeg,id3v2
+Depends: webif-channelicons(>=1.1.9),mongoose(>=3.0.11),jim(>=0.75),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.14),ssmtp,anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2),stripts(>=1.2.5-3),smartmontools,tmenu(>=1.05),ffmpeg,id3v2,multienv(>=1.6)
 Suggests:
 Description: An evolving web interface for the Humax.
+Tags: http://hummy.tv/forum/threads/4659/

CONTROL/postinst

@@ -6,25 +6,22 @@ export tmpf=/tmp/cronf.$$
 
 # Add cron jobs
 
-crond=$PKG_ROOT/var/spool/cron/crontabs
-[ -d $crond ] || exit 1
-
-cronf=$crond/root
-grep -v webif/lib/bin/auto $cronf > $tmpf
-(
-	cat $tmpf
-	echo '*/10 * * * * /mod/webif/lib/bin/auto >/dev/null 2>&1'
-) > $cronf
+crontab=$PKG_ROOT/bin/crontab
+if [ -x $crontab ]; then
+	$crontab -l | grep -v webif/lib/bin/auto > $tmpf
+	cat $tmpf - << EOM | $crontab -
+*/10 * * * * /mod/webif/lib/bin/auto >/dev/null 2>&1
+EOM
+fi
 
 # Add anacron jobs
 
 ana=$PKG_ROOT/etc/anacrontab
-egrep -v 'backup/backup.jim|diskattrs' $ana > $tmpf
-(
-	cat $tmpf
-	echo "1 8 sched_backup /mod/var/mongoose/cgi-bin/backup/backup.jim"
-	echo "1 5 diskattrs /mod/webif/lib/bin/diskattrs"
-) > $ana
+egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf
+cat $tmpf - << EOM > $ana
+1 8 sched_backup /mod/webif/cgi-bin/backup/backup.jim
+1 5 diskattrs /mod/webif/lib/bin/diskattrs
+EOM
 
 $PKG_ROOT/etc/init.d/S02anacron start < /dev/null > /dev/null 2>&1 &
 
@@ -39,5 +36,10 @@ if [ ! -f /mod/webif/.strip-updated ]; then
 	touch /mod/webif/.strip-updated
 fi
 
+/mod/webif/lib/bin/diskattrs
+#/mod/webif/lib/bin/resetnew
+
+[ -f $tmpf ] && rm -f $tmpf
+
 exit 0
 

CONTROL/prerm

@@ -2,16 +2,17 @@
 
 export tmpf=/tmp/cronf.$$
 
-cronf=$PKG_ROOT/var/spool/cron/crontabs/root
-if [ -f $cronf ]; then
-	grep -v webif/lib/bin/auto $cronf > $tmpf
-	cp $tmpf $cronf
-	[ -s $cronf ] || rm -f $cronf
+crontab=$PKG_ROOT/bin/crontab
+if [ -x $crontab ]; then
+	$crontab -l | grep -v webif/lib/bin/auto > $tmpf
+	[ -s $tmpf ] && $crontab $tmpf || $crontab -r
 fi
 
 ana=/mod/etc/anacrontab
-egrep -v 'backup/backup.jim|diskattrs' $ana > $tmpf
+egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf
 cp $tmpf $ana
 
+[ -f $tmpf ] && rm -f $tmpf
+
 exit 0
 

var/mongoose/cgi-bin/backup/backup.jim

@@ -5,7 +5,7 @@ source /mod/webif/lib/setup
 
 require rsv.class
 
-set dir /mod/var/backup
+set dir "/mod/var/backup"
 
 httpheader
 
@@ -26,58 +26,12 @@ if {[string match {auto-*} $file]} {
 	}
 }
 
-set ffile "/$dir/$file.rbk"
+set ffile "$dir/$file.rbk"
 
 if {[file exists $ffile]} {
 	puts "Backup file <i>$file</i> already exists."
 	exit
 }
 
-if {[catch { set fd [open $ffile w] } msg]} {
-	puts "Error creating backup file. - $msg"
-	exit
-}
-
-puts "Backing up scheduled recordings and events..."
-
-set events [rsv list]
-
-set fields [lsort [[rsv] vars]]
-
-#puts $fd "# [join $fields "\t"]"
-
-foreach event $events {
-	puts "  Backing up scheduled event '[$event name]'"
-	puts -nonewline $fd "event\t"
-
-	foreach f $fields {
-		if {$f eq "aulEventToRecordInfo"} { continue }
-		puts -nonewline $fd "[$event get $f]\t"
-	}
-	puts $fd ""
-}
-puts "Done."
-
-puts "Backing up channel favourites..."
-
-set grp 0
-foreach res [$rsvdb query {
-	select	eFavGroup,
-		TBL_FAV.eSvcType,
-		substr(szSvcName, 2) as szSvcName,
-		favIdx
-	from TBL_FAV join TBL_SVC using (hSvc)
-	order by eFavGroup, favIdx
-    }] {
-	if {$res(eFavGroup) != $grp} {
-		set grp $res(eFavGroup)
-		puts "  Group $grp"
-	}
-	puts "    $res(szSvcName)"
-	puts $fd "fav\t$res(eFavGroup)\t$res(eSvcType)\t$res(szSvcName)\t$res(favIdx)"
-}
-puts "Done."
-
-close $fd
-rsv cleanup
+rsv backup $ffile
 

var/mongoose/cgi-bin/backup/restore.jim

@@ -3,9 +3,9 @@
 package require cgi
 source /mod/webif/lib/setup
 
-require rsv.class findhsvc system.class
+require rsv.class
 
-set dir /mod/var/backup
+set dir "/mod/var/backup"
 
 httpheader
 
@@ -15,121 +15,7 @@ if {$file == 0} {
 	exit
 }
 
-set ffile "/$dir/$file.rbk"
+set ffile "$dir/$file.rbk"
 
-if {![file exists $ffile]} {
-	puts "Backup file <i>$file</i> does not exist."
-	exit
-}
-
-if {[catch { set fd [open $ffile r] } msg]} {
-	puts "Error opening <i>$file</i> - $msg"
-	exit
-}
-
-puts "Restoring scheduled events from <i>$file</i>..."
-
-$rsvdb query {begin transaction;}
-$rsvdb query {delete from TBL_RESERVATION;}
-
-set fields [lsort [[rsv] vars]]
-
-set data [split [read $fd] "\n"]
-
-foreach line $data {
-	set vals [split $line "\t"]
-	if {[lindex $vals 0] ne "event"} { continue }
-	set vars {}
-	set i 0
-	foreach f $fields {
-		if {$f eq "aulEventToRecordInfo"} { continue }
-		incr i
-		lappend vars $f [lindex $vals $i]
-	}
-
-	# Don't restore DSO events.
-	if {$vars(ersvtype) == 11} { continue }
-
-	set rsv [rsv new $vars]
-
-	# Need to fix up channel and CRID mappings in case something has
-	# changed during a channel scan.
-
-	puts "  Restoring [$rsv name]"
-
-	set bad 0
-	# First, the service number
-	set ohsvc [$rsv get hsvc]
-	if {$ohsvc > 0} {
-		set hsvc [$rsv fix_hsvc]
-		if {$hsvc == 0} {
-			puts "    Cannot find channel, restore failed."
-			set bad 1
-		} elseif {$hsvc != $ohsvc} {
-			puts -nonewline "    Service number has "
-			puts "changed $ohsvc -> $hsvc, fixing."
-		} else {
-			puts "    No change in channel service."
-		}
-	}
-
-	if {!$bad} {
-		if {[catch {$rsv insert pending 1} msg]} {
-			puts "    Error inserting event, $msg"
-		}
-	}
-}
-
-$rsvdb query {commit transaction;}
-
-puts "Restoring favourite channels..."
-$rsvdb query {begin transaction;}
-$rsvdb query {delete from channel.TBL_FAV}
-
-$rsvdb query {drop table if exists pending.fav}
-$rsvdb query {create table pending.fav (
-		favIdx integer primary key autoincrement unique,
-		hSvc integer(4),
-		eFavGroup integer(4),
-		[eSvcType] integer(4)
-	)}
-
-set grp 0
-foreach line $data {
-	set vals [split $line "\t"]
-	if {[lindex $vals 0] ne "fav"} { continue }
-
-	set group [lindex $vals 1]
-	set type [lindex $vals 2]
-	set chan [lindex $vals 3]
-	set idx [lindex $vals 4]
-	if {$idx eq ""} { set idx 0 }
-	set hsvc [get_channel_attr $chan]
-
-	if {$grp != $group} {
-		set grp $group
-		puts "  Group $grp"
-	}
-
-	puts "    $chan"
-
-	if {$hsvc eq ""} {
-		puts "        Cannot map channel name to service."
-		continue
-	}
-
-	set query "
-		insert into pending.fav(favIdx, hSvc, eFavGroup, eSvcType)
-		values($idx, $hsvc, $group, $type);
-	"
-
-	$rsvdb query $query
-}
-
-$rsvdb query {commit transaction;}
-
-system restartpending
-
-close $fd
-rsv cleanup
+rsv restore $ffile
 

var/mongoose/cgi-bin/channel.jim

@@ -29,20 +29,23 @@ puts "
 		<th>Signal Quality</th>
 		<th>Network</th>
 		<th>Mux</th>
+		<th>Type</th>
 		<th>Channels</th>
 		<th>&gt;799</th>
 	</tr>
 "
 foreach tw [$db query {
-		select tsIdx, szNetName, usTsID, ulFrequency, ucLevel, ucQuality
+		select tsIdx, szNetName, usTsID, ulFrequency, ucLevel,
+		ucQuality, eTransMode
 		from TBL_TS join TBL_NET using (netIdx)
 		order by ulFrequency
 	}] {
 	lassign $tw \
-	    x tsIdx x netName x usTsID x ulFrequency x ucLevel x ucQuality
+	    x tsIdx x netName x usTsID x ulFrequency x ucLevel x ucQuality \
+	    x eTransMode
 
-	altrow
 	puts "
+		<tr class=odd>
 		<td>[f2c $ulFrequency]</td>
 		<td>[expr $ulFrequency / 1000.0] MHz</td>
 	"
@@ -64,17 +67,23 @@ foreach tw [$db query {
 		set name [string range $name 1 end]
 		if {$lcn >= 800} { incr ehs }
 		switch $name {
-			"BBC ONE" { set mux "PSB1/BBC A" }
+			"BBC THREE" { set mux "PSB1/BBC A" }
 			"ITV1" { set mux "PSB2/D3&amp;4" }
 			"ITV" { set mux "PSB2/D3&amp;4" }
-			"BBC One HD" { set mux "PSB3/BBC B (HD)" }
+			"BBC ONE HD" { set mux "PSB3/BBC B" }
 			"ITV3" { set mux "COM4/SDN" }
 			"Dave" { set mux "COM5/ARQ A" }
-			"Film4" { set mux "COM6/ARQ B" }
+			"Film4+1" { set mux "COM6/ARQ B" }
+			"BBC NEWS HD" { set mux "COM7/ARQ C" }
 			"Movies4Men" { set mux "Local" }
 		}
 	}
 	puts "<td>$mux</td>"
+	if {$eTransMode == 2} {
+		puts "<td>DVB-T (SD)</td>"
+	} else {
+		puts "<td class=blood>DVB-T2 (HD)</td>"
+	}
 
 	puts "<td>[llength $channels]
 		<a class=mchan ts=$tsIdx href=#>
@@ -92,6 +101,7 @@ foreach tw [$db query {
 		<th>Provider</th>
 		<th>Authority</th>
 	      </tr>"
+	altrow reset
 	foreach chan $channels {
 		lassign $chan x lcn x name x prv x auth
 		set name [string range $name 1 end]

var/mongoose/cgi-bin/db.jim

@@ -6,6 +6,7 @@ source /mod/webif/lib/setup
 require altrow
 
 set databases [glob /var/lib/humaxtv/*.db]
+lappend databases {*}[glob /mod/etc/*.db]
 lappend databases "/mnt/hd2/dms_cds.db"
 
 header

var/mongoose/cgi-bin/epg/info.jim

@@ -2,18 +2,27 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require epg.class
+require epg.class system.class settings.class
+
+set irinst [system pkginst ir]
 
 httpheader
 
 set service [cgi_get service 0]
 set event [cgi_get event 0]
-if {![cgi_exists bare]} header
+if {![cgi_exists bare]} header else noheader
 
 set record [lindex [epg fetch dump -service $service -event $event] 0]
 $record get_channel_info
 set others [$record othertimes]
 
+if {[[settings] chanchangenc]} {
+	puts { <script type=text/javascript src=/js/chanchangenc.js></script> }
+} else {
+	jqplugin confirmAction
+	puts { <script type=text/javascript src=/js/chanchange.js></script> }
+}
+
 puts "
 	<table class=keyval>
 	<tr>
@@ -116,7 +125,14 @@ if {[$record get rec_crid] != ""} {
 puts "
 	<tr>
 		<td colspan=2 valign=top>
-			[$record channel_icon 70]
+"
+if {$irinst} {
+	puts "<a class=chanchange chan=[$record get channel_num] href=#>"
+}
+puts [$record channel_icon 70]
+if {$irinst} { puts "</a>" }
+
+puts "
 			[join [$record icon_set] "&nbsp;"]
 		</td>
 	</tr>

var/mongoose/cgi-bin/epg/search.jim

@@ -4,12 +4,11 @@ package require cgi
 source /mod/webif/lib/setup
 require epg.class spinner.class altrow settings.class
 
+jqplugin highlight
 header
 
 require totop
 
-puts "<script type=text/javascript src=/js/jquery.highlight.js></script>"
-
 set ct [cgi_get ct 0]
 set crid [cgi_get crid ""]
 set scrid [cgi_get scrid ""]
@@ -56,6 +55,12 @@ if {$ct > 0 } {
 }
 
 set favlist [epg favlist]
+set s [settings]
+if {[$s service_style] eq "standard"} {
+	set surl xservice
+} else {
+	set surl service
+}
 
 if {[llength $records] > 0} {
 	puts {
@@ -83,8 +88,10 @@ proc rsort {v1 v2} {
 set seen {}
 set i 0
 foreach record [lsort -command rsort $records] {
+	set ename [$record get name]
+	if {$ename eq ""} continue
+
 	if {$dedup} {
-		set ename [$record get name]
 		if {$ename in $seen} continue
 		lappend seen $ename
 	}
@@ -105,7 +112,7 @@ foreach record [lsort -command rsort $records] {
 	puts "<td>[$record get channel_num]</td>"
 	puts "<td>[$record channel_icon 50]</td>"
 	puts "<td nowrap>
-	    <a href=/cgi-bin/epg/service.jim?service=[$record get service_id]>
+	    <a href=/epg/$surl.jim?service=[$record get service_id]>
 	    [$record get channel_name]
 	    </a></td>"
 	puts [$record cell]

var/mongoose/cgi-bin/restart.jim

@@ -7,7 +7,7 @@ require rsv.class system.class
 httpheader
 
 if {[cgi_get act] eq "cancel"} {
-	file delete /tmp/.restartpending
+	system restartpending 0
 	exit
 }
 
@@ -18,7 +18,8 @@ if {[cgi_get now] eq "yes"} {
 	exit
 }
 
-file delete /tmp/.restartpending
+system restartpending 0
+jqplugin progressbar
 header
 
 # Commit pending reservations on older mod versions.
@@ -27,8 +28,6 @@ if {![file exists /sbin/rsvsync] && ![file exists /mod/boot/rsvsync]} {
 }
 
 puts { 
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type="text/javascript" src="/js/jquery.progressbar.js"></script>
 
 <script type=text/javascript>
 	var handle = 0;

var/mongoose/cgi-bin/settings.jim

@@ -7,7 +7,8 @@ require settings.class plugin system.class
 httpheader
 
 if {[cgi_get act] eq "https"} {
-	if {[cgi_get val off] eq "off"} {
+	set val [cgi_get val off]
+	if {$val in {0 off}} {
 		file delete /mod/etc/mongoose.cert
 		puts "HTTPS Server will be disabled after next reboot."
 	} else {
@@ -18,7 +19,8 @@ if {[cgi_get act] eq "https"} {
 }
 
 if {[cgi_get act] eq "xtelnet"} {
-	if {[cgi_get val off] eq "off"} {
+	set val [cgi_get val off]
+	if {$val in {0 off}} {
 		file delete /mod/boot/xtelnet
 		puts "Telnet server expert mode will be disabled after next reboot."
 	} else {
@@ -34,9 +36,14 @@ set hostname [$settings hostname]
 set smtp_server [$settings smtp_server]
 set channel_group [$settings channel_group]
 set epg_style [$settings epg_style]
+set service_style [$settings service_style]
 set pkgdev [$settings pkgdev]
 set notoolbar [$settings notoolbar]
 set nomobile [$settings nomobile]
+set nohelplinks [$settings nohelplinks]
+set notwitfeed [$settings notwitfeed]
+set nounwatchedcount [$settings nounwatchedcount]
+set chanchangenc [$settings chanchangenc]
 set xepghours [$settings xepghours]
 if {$xepghours == 0} { set xepghours 4 }
 set genrededup [$settings genrededup]
@@ -77,9 +84,15 @@ _handle_update ascii smtp_server $smtp_server "SMTP Server"
 handle_int_update channel_group $channel_group "Channel Group"
 handle_int_update xepghours $xepghours "Grid EPG Hours"
 handle_str_update epg_style $epg_style "EPG Type"
+handle_str_update service_style $service_style "EPG Channel Type"
 handle_int_update pkgdev $pkgdev "Development Package Display"
 handle_int_update notoolbar $notoolbar "Disable toolbar"
 handle_int_update nomobile $nomobile "Disable mobile link"
+handle_int_update nohelplinks $nohelplinks "Disable help links"
+handle_int_update notwitfeed $notwitfeed "Disable twitter feed ticker"
+handle_int_update chanchangenc $chanchangenc \
+    "Disable channel change confirmation"
+handle_int_update nounwatchedcount $nounwatchedcount "Disable unwatched count"
 handle_int_update genrededup $genrededup "Genre search dedup"
 handle_int_update autolog $autolog "Auto-processing log level"
 
@@ -111,19 +124,33 @@ if {$aclact ne "-" && $acluser ne "-"} {
 	exit
 }
 
+jqplugin form iphone-style-checkboxes
 header
 
 puts {
-<script type="text/javascript" src="/cgi-bin/settings.js"></script>
-<script type="text/javascript" src="/js/jquery.form.js"></script>
-<script type="text/javascript" src="/js/jconfirmaction.jquery.js"></script>
-<link href=/css/jconfirmaction.jquery.css rel=stylesheet type=text/css />
-<script type="text/javascript" src="/js/iphone-style-checkboxes.js"></script>
-<link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
+<script type="text/javascript" src="settings.js"></script>
+<div id=accordion>
+}
+
+proc setting_toggle {name attr checked {invert 0} {val 0}} {
+	puts -nonewline "
+	    <tr>
+		<th class=key>$name</th>
+		<td><input class=setting_toggle type=checkbox value=yes"
+	if {$checked} { puts -nonewline " checked" }
+	puts -nonewline " attr=$attr"
+	if {$invert} { puts -nonewline " invert=1" }
+	if {$val} { puts -nonewline " useval=1" }
+	puts -nonewline ">
+		<div id=${attr}_output></div>
+		</td>
+	</tr>
+	"
 }
 
 puts "
-	<fieldset style=\"display: inline\">
+	<h4>General Settings</h4>
+	<div><fieldset style=\"display: inline\">
 		<legend>
 			General Settings
 		</legend>
@@ -146,40 +173,20 @@ puts "
 	</tr>
 "
 
-puts -nonewline "
-	<tr>
-		<th class=key>HTTPS web server?</th>
-		<td><input id=https_toggle name=https type=checkbox value=yes"
-if {[file exists /mod/etc/mongoose.cert]} { puts -nonewline " checked" }
-puts ">
-		    <div id=https_output></div>
-		</td>
-	</tr>
-"
+setting_toggle "HTTPS web server?" "https" \
+    [file exists /mod/etc/mongoose.cert] 0 1
+setting_toggle "Slide-down toolbar?" "notoolbar" $(!$notoolbar) 1
+setting_toggle "Mobile link on main page?" "nomobile" $(!$nomobile) 1
+setting_toggle "Help links on main page?" "nohelplinks" $(!$nohelplinks) 1
+setting_toggle "Twitter feed ticker on main page?" "notwitfeed" $(!$notwitfeed) 1
+setting_toggle "Unwatched count on folders?" "nounwatchedcount" $(!$nounwatchedcount) 1
+if {[system pkginst ir]} {
+	setting_toggle "Disable channel change confirmation?" \
+	    "chanchangenc" $chanchangenc 0
+}
 
 puts -nonewline "
 	<tr>
-		<th class=key>Slide-down toolbar?</th>
-		<td><input id=toolbar_toggle name=toolbar type=checkbox value=yes"
-if {$notoolbar == 0} { puts -nonewline " checked" }
-puts ">
-		    <div id=toolbar_output></div>
-		</td>
-	</tr>
-"
-
-puts -nonewline "
-	<tr>
-		<th class=key>Mobile link on main page?</th>
-		<td><input id=mobile_toggle name=mobile type=checkbox value=yes"
-if {$nomobile == 0} { puts -nonewline " checked" }
-puts ">
-		    <div id=mobile_output></div>
-		</td>
-	</tr>
-"
-
-puts -nonewline "
 	<form class=auto id=autolog method=get action=$env(REQUEST_URI)>
 		<th class=key>Auto-processing log level</th>
 		<td><select id=autolog name=autolog
@@ -202,12 +209,14 @@ puts "
 		<div id=autolog_output></div>
 		</td>
 	</form>
+	</tr>
 "
 
 puts "
-</table></fieldset>
-<br><br>
-<fieldset style=\"display: inline\">
+</table></fieldset></div>
+
+<h4>EPG Settings</h4>
+<div><fieldset style=\"display: inline\">
 	<legend>
 		EPG Settings
 	</legend>
@@ -238,6 +247,30 @@ puts "
 	</tr>
 "
 
+puts "
+	<tr>
+	<form class=auto id=service_style method=get action=$env(REQUEST_URI)>
+		<th class=key>Default Single-channel style</th>
+		<td><select id=service_style name=service_style
+		    class=\"text ui-widget-content ui-corner-all\">
+"
+puts "<option value=standard"
+if {$service_style eq "standard"} { puts " selected" }
+puts ">Standard\n"
+puts "<option value=grid"
+if {$service_style ne "standard"} { puts " selected" }
+puts ">Grid\n"
+puts "
+		</select>
+		<small>
+		<input name=service_style value=\"set\" type=submit>
+		</small>
+		<div id=service_style_output></div>
+		</td>
+	</form>
+	</tr>
+"
+
 puts "
 	<tr>
 	<form class=auto id=channel_group method=get action=$env(REQUEST_URI)>
@@ -295,49 +328,44 @@ puts "
 	</tr>
 "
 
-puts -nonewline "
-	<tr>
-		<th class=key>De-duplicate genre search results?</th>
-		<td><input id=genrededup_toggle name=genrededup type=checkbox value=yes"
-if {$genrededup == 1} { puts -nonewline " checked" }
-puts ">
-		    <div id=genrededup_output></div>
-		</td>
-	</tr>
-"
+setting_toggle "De-duplicate genre search results?" genrededup $genrededup
 
 puts "
 	</table>
-	</fieldset>
-	<br><br>
-	<fieldset style=\"display: inline\">
-	<legend> Email Settings </legend>
-	<table>
+	</fieldset></div>
 "
 
-puts "
-	<tr>
-	<form class=auto id=smtp_server method=get action=$env(REQUEST_URI)>
-		<th class=key>SMTP Server for outbound email</th>
-		<td><input name=smtp_server value=\"$smtp_server\"
-		    class=\"text ui-widget-content ui-corner-all\"
-		    length=20 maxlength=50>
-		    <small>
-		    <input id=smtp_server_submit value=\"change\" type=submit>
-		    </small>
-		    <div id=smtp_server_output></div>
-		</td>
-	</form>
-	</tr>
-"
+#puts "
+#	<fieldset style=\"display: inline\">
+#	<legend> Email Settings </legend>
+#	<table>
+#"
+#
+#puts "
+#	<tr>
+#	<form class=auto id=smtp_server method=get action=$env(REQUEST_URI)>
+#		<th class=key>SMTP Server for outbound email</th>
+#		<td><input name=smtp_server value=\"$smtp_server\"
+#		    class=\"text ui-widget-content ui-corner-all\"
+#		    length=20 maxlength=50>
+#		    <small>
+#		    <input id=smtp_server_submit value=\"change\" type=submit>
+#		    </small>
+#		    <div id=smtp_server_output></div>
+#		</td>
+#	</form>
+#	</tr>
+#"
+#
+#puts "
+#	</table>
+#	</fieldset>
+#	<br><br>
+#"
 
 puts "
-	</table>
-	</fieldset>
-"
-
-puts "
-	<br><br>
+	<h4>Web Interface User Access Control</h4>
+	<div>
 	<fieldset style=\"display: inline\">
 	<legend> Web Interface User Access Control </legend>
 	<table>
@@ -392,6 +420,7 @@ puts "
 	</table>
 	<div id=aclnewuser_output></div>
 	</fieldset>
+	</div>
 "
 
 puts {
@@ -428,42 +457,36 @@ $('button.pwchange').click(function(el) {
 }
 
 puts -nonewline "
-	<br><br>
+	<h4>Advanced Settings</h4>
+	<div>
 	<fieldset style=\"display: inline\">
 	<legend> Advanced Settings </legend>
 	<table>
-	<tr>
-		<th class=key>Show development and advanced packages?</th>
-		<td><input name=pkgdev id=pkgdev value=1 type=checkbox
-"
-if {$pkgdev} { puts -nonewline " checked" }
-puts ">
-		</td>
-	</tr>
 "
+setting_toggle "Show development and advanced packages?" "pkgdev" $pkgdev
 
 if {[system modversion 1] >= 214} {
-
-puts -nonewline "
-	<tr>
-		<th class=key>Expert mode telnet server?</th>
-		<td><input id=xtelnet_toggle name=xtelnet type=checkbox value=yes"
-if {[file exists /mod/boot/xtelnet]} { puts -nonewline " checked" }
-puts ">
-		    <div id=xtelnet_output></div>
-		</td>
-	</tr>
-"
-
+	setting_toggle "Expert mode telnet server?" "xtelnet" \
+	    [file exists /mod/boot/xtelnet] 0 1
 }
 
 puts "
 	</table>
-	<div id=pkgdev_output></div>
 	</fieldset>
+	</div>
 "
 
-eval_plugins settings
+set hook settings
+foreach plugin [lsort [glob -nocomplain /mod/webif/plugin/*]] {
+	if {[file isfile "$plugin/$hook.hook"]} {
+		puts "<h4>Settings for <i>[file tail $plugin]</i> package</h4>"
+		puts "<div class=pluginsettings>"
+		catch {source "$plugin/$hook.hook"}
+		puts "</div>"
+	} 
+}
+
+puts "</div>"
 
 footer
 

var/mongoose/cgi-bin/settings.js

@@ -41,120 +41,46 @@ $(document).ready(function () {
 		});
 	});
 
-	$('#pkgdev').change(function() {
+	$('.setting_toggle').change(function() {
 		var arg = '0';
+		var urlargs;
 		if ($(this).attr('checked'))
 			arg = '1';
 
+		if ($(this).attr('invert'))
+			arg = arg == "0" ? "1" : "0";
+
+		var el = $(this);
+		var attr = $(this).attr('attr');
+		var output = '#' + attr + '_output';
+
+		if ($(this).attr('useval'))
+			urlargs = 'act=' + attr + '&val=' + arg;
+		else
+			urlargs = attr + '=' + arg;
+
 		$(this).disable();
 
-		$('#pkgdev_output')
+		$(output)
 		    .empty()
 		    .show('slow')
-		    .load('/cgi-bin/settings.jim?pkgdev=' + arg,
+		    .load('/cgi-bin/settings.jim?' + urlargs,
 		        function() {
-				$('#pkgdev').enable();
-				$('#pkgdev_output')
+				$(el).enable();
+				$(output)
 				    .css('font-style', 'italic')
 				    .delay(2000).fadeOut('slow');
 		    });
 	});
 
-	$('#https_toggle').change(function() {
-		var arg = 'off';
-		if ($(this).attr('checked'))
-			arg = 'on';
-
-		$(this).disable();
-
-		$('#https_output')
-		    .empty()
-		    .html('<img src=/img/loading.gif>Please Wait...')
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?act=https&val=' + arg,
-		        function() {
-				$('#https_toggle').enable();
-				$('#https_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
+	$('#accordion').accordion({
+	    header: 'h4',
+	    collapsible: true,
+	    active: 0,
+	    heightStyle: 'content'
 	});
 
-	$('#xtelnet_toggle').change(function() {
-		var arg = 'off';
-		if ($(this).attr('checked'))
-			arg = 'on';
-
-		$(this).disable();
-
-		$('#xtelnet_output')
-		    .empty()
-		    .html('<img src=/img/loading.gif>Please Wait...')
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?act=xtelnet&val=' + arg,
-		        function() {
-				$('#xtelnet_toggle').enable();
-				$('#xtelnet_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
-
-	$('#toolbar_toggle').change(function() {
-		var arg = '1';
-		if ($(this).attr('checked'))
-			arg = '0';
-
-		$(this).disable();
-
-		$('#toolbar_output')
-		    .empty()
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?notoolbar=' + arg,
-		        function() {
-				$('#toolbar_toggle').enable();
-				$('#toolbar_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
-
-	$('#mobile_toggle').change(function() {
-		var arg = '1';
-		if ($(this).attr('checked'))
-			arg = '0';
-
-		$(this).disable();
-
-		$('#mobile_output')
-		    .empty()
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?nomobile=' + arg,
-		        function() {
-				$('#mobile_toggle').enable();
-				$('#mobile_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
-
-	$('#genrededup_toggle').change(function() {
-		var arg = '0';
-		if ($(this).attr('checked'))
-			arg = '1';
-
-		$(this).disable();
-
-		$('#genrededup_output')
-		    .empty()
-		    .show('slow')
-		    .load('/cgi-bin/settings.jim?genrededup=' + arg,
-		        function() {
-				$('#genrededup_toggle').enable();
-				$('#genrededup_output')
-				    .css('font-style', 'italic')
-				    .delay(2000).fadeOut('slow');
-		    });
-	});
+	// For now - until plugins are updated.
+	$('div.pluginsettings').find('br + br').remove();
 });
 

var/mongoose/cgi-bin/status.jim

@@ -8,7 +8,7 @@ set runmode cli
 if {[string match {*jim} $argv0]} { set runmode cgi }
 
 set schedtime 1200 
-case $runmode {
+switch $runmode {
     cgi {
 	set type [cgi_get type "full"]
 	httpheader
@@ -19,7 +19,7 @@ case $runmode {
     }
 }
 
-if {[catch {set pid [exec pgrep humaxtv]}]} {
+if {[catch {set pid [exec pgrep -n humaxtv]}]} {
 	puts "Cannot find humaxtv process."
 	exit
 }

var/mongoose/cgi-bin/xepg.jim

@@ -2,14 +2,29 @@
 
 package require cgi
 source /mod/webif/lib/setup
+require settings.class
 
+jqplugin enadis
+jscss xepg.js /css/xepg.css
 header
 
-require epg.class spinner.class altrow epg_search totop
+require epg.class spinner.class altrow epg_search totop system.class
 
-puts {
-<link type="text/css" href="/css/xepg.css" rel="Stylesheet" />
-<script type=text/javascript src=/js/enadis.js></script>
+set irinst [system pkginst ir]
+
+set s [settings]
+
+if {[$s chanchangenc]} {
+	puts { <script type=text/javascript src=/js/chanchangenc.js></script> }
+} else {
+	jqplugin confirmAction
+	puts { <script type=text/javascript src=/js/chanchange.js></script> }
+}
+
+if {[$s service_style] eq "standard"} {
+	set surl xservice
+} else {
+	set surl service
 }
 
 [spinner new {
@@ -29,7 +44,7 @@ if {$stt <= $now} {
 	set current 0
 }
 
-set favgroup [[settings] channel_group]
+set favgroup [$s channel_group]
 
 set hours [expr 1.0 * [[settings] xepghours]]
 if {$hours == 0} { set hours 4.0 }
@@ -82,7 +97,8 @@ but "&lt&lt; -1 Week" $($stt - 3600 * 24 * 7) \
     $($stt - $now + 3600 >= 3600 * 24 * 7)
 but "&lt&lt; -1 Day" $($stt - 3600 * 24) $($stt - $now >= 3600 * 23)
 but "&lt;&lt; Earlier", $($stt - 3600 * 4) $($stt > $now)
-but "&lt; Now &gt;" $now $($current == 0)
+#but "&lt; Now &gt;" $now $($current == 0)
+but "&lt; Now &gt;" $now
 but "&gt;&gt; Later" $ett;
 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)
@@ -121,9 +137,13 @@ foreach e $records {
 	if {$chnum != $lcn} {
 		puts "<div class=xechan style=\"width: ${chanpx}px;\">"
 
+		if {$irinst} {
+			puts "<a class=chanchange chan=$chnum href=#>"
+		}
 		puts "[$e channel_icon 30]&nbsp;"
+		if {$irinst} { puts "</a>" }
 		puts "$chnum
-	    <a href=/cgi-bin/epg/service.jim?service=[$e get service_id]
+	    <a href=\"/epg/$surl.jim?service=[$e get service_id]\"
 		title=\"[$e get channel_name]\">
 	    [$e get channel_name]
 	    </a></div>"
@@ -200,48 +220,11 @@ puts "
 </div>
 "
 
-puts "
-
-<script type=text/javascript>
-\$(document).ready(function() {
-
-\$('#epgswitch').button().click(function() {
-	window.location = '/epg.shtml';
-});
-
-\$('button.nav').click(function() {
-        window.location = '/cgi-bin/xepg.jim?stt=' + \$(this).attr('tt') +
-            '&pos=' + \$('#xegrid').scrollTop();
-});
-
-\$('#xepg_dp').datepicker({
-        buttonImage: '/img/cal.gif',
-        buttonImageOnly: true,
-        showOn: 'button',
-        dateFormat: '@',
-        minDate: '[expr $now * 1000]',
-        maxDate: '[expr ($now + 7 * 86400) * 1000]',
-        onSelect: function(val, sel) {
-                var stt = \$(this).attr('stt');
-                // Extract date part
-                dval  = Math.round(val / 86400000.0);
-                // Extract current time part
-                var tm = ~~(stt % 86400);
-
-                var ret = dval * 86400 + tm;
-
-                window.location = '/cgi-bin/xepg.jim?stt=' + ret;
-        }
-});
-
-\$('img.ui-datepicker-trigger').hover(
-    function() { \$(this).css('cursor', 'pointer'); },
-    function() { \$(this).css('cursor', 'auto'); }
-);
-
-"
-
 if {$current} {
+	puts "
+		<script type=text/javascript>
+		\$(function() {
+	"
 	puts {
 
 var kt = $('#xe0');
@@ -252,20 +235,18 @@ var height = $('#keypos').position().top - ktpos.top;
 	}
 	puts "var nowpos = ktpos.left + (kt.width() * $offset);"
 	puts {
-if (window.console)
-	console.log('NOWPOS: %d', nowpos);
 $('#xepgnow')
 	.css('left', nowpos + 'px')
 	.css('top', ktpos.top)
 	.height(height)
 	.show('slow');
 	}
-}
 
-puts "
-});
-</script>
-"
+	puts "
+		});
+		</script>
+	"
+}
 
 puts "
 	<a href=/cgi-bin/settings.jim>

var/mongoose/cgi-bin/xepg.js

@@ -0,0 +1,38 @@
+$(function() {
+
+$('#epgswitch').button().click(function() {
+	window.location = '/epg.shtml';
+});
+
+$('button.nav').click(function() {
+        window.location = '/cgi-bin/xepg.jim?stt=' + $(this).attr('tt') +
+            '&pos=' + $('#xegrid').scrollTop();
+});
+
+$('#xepg_dp').datepicker({
+        buttonImage: '/img/cal.gif',
+        buttonImageOnly: true,
+        showOn: 'button',
+        dateFormat: '@',
+        minDate: 0,
+        maxDate: 8,
+        onSelect: function(val, sel) {
+                var stt = $(this).attr('stt');
+                // Extract date part
+                dval  = Math.round(val / 86400000.0);
+                // Extract current time part
+                var tm = ~~(stt % 86400);
+
+                var ret = dval * 86400 + tm;
+
+                window.location = '/cgi-bin/xepg.jim?stt=' + ret;
+        }
+});
+
+$('img.ui-datepicker-trigger').hover(
+    function() { $(this).css('cursor', 'pointer'); },
+    function() { $(this).css('cursor', 'auto'); }
+);
+
+});
+

var/mongoose/html/browse/assets.jim

@@ -209,7 +209,10 @@ puts {
 <div id=savestreamform title="Save streamed content"
     style="display: none">
 	<div class=pre id=savestream_detail></div>
-	<form id=savestream_form>
+	<div id=savestream_retrieving>
+		<img src=/img/loading.gif> Retrieving details...
+	</div>
+	<form id=savestream_form class=hidden>
 }
 puts "<input type=hidden name=dir value=\"$dir\">"
 puts {
@@ -217,7 +220,7 @@ puts {
 	<tr>
 	<th>
 		<label for="savestream_name">
-			<b>Filename</b>
+			<b>Enter Filename</b>
 		</label>
 	</th>
 	<td>
@@ -225,7 +228,9 @@ puts {
 		    id="savestream_name"
 		    value="" size=70 maxlength=255
 		    class="text ui-widget-content ui-corner-all">
-		<img id=savestream_spin src=/img/loading.gif>
+		<span id=savestream_spin>
+			<img src=/img/loading.gif> Saving...
+		</span>
 	</td>
 	</tr>
 	</table>
@@ -268,7 +273,7 @@ puts {
 		</label>
 	</th>
 	<td>
-		<input type=text name="aexpiry_days" id="aexpiry_days"
+		<input name="aexpiry_days" id="aexpiry_days"
 		    type=number value=0 size=5 maxlength=3
 		    class="text ui-widget-content ui-corner-all">
 	</td>

var/mongoose/html/browse/audio/audio.jim

@@ -5,6 +5,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class system.class
 
+jqplugin progressbar
+jscss audio.js
 header
 
 set rfile [cgi_get file]
@@ -12,10 +14,8 @@ set ts [ts fetch $rfile]
 set dir [file dirname $rfile]
 set len [$ts duration 1]
 
+
 puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=audio.js></script>
 
 <fieldset class=cleft>
 <legend>Audio Extraction</legend>

var/mongoose/html/browse/chunk/chunk.jim

@@ -4,6 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
+jqplugin progressbar
+jscss chunk.js chunk.css
 header
 
 set rfile [cgi_get file]
@@ -19,10 +21,6 @@ set esttime $(int($len * 0.025))
 if {[$ts get definition] eq "HD"} { set esttime $($esttime * 4) }
 
 puts "
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=chunk.js></script>
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<link href=chunk.css rel=stylesheet type=text/css />
 
 <fieldset class=cleft>
 <legend>Split recording into 45 minute segments</legend>

var/mongoose/html/browse/clipboard.jim

@@ -113,6 +113,7 @@ switch $action {
 				    "$dir/[file tail $path]"}
 			}
 		}
+		ts resetnew $dir
 	}
 	$cb clear
 	$cb save

var/mongoose/html/browse/crop/crop.jim

@@ -4,6 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
+jqplugin progressbar
+jscss crop.js
 header
 
 set rfile [cgi_get file]
@@ -13,10 +15,6 @@ set dir [file dirname $rfile]
 set len [$ts duration 1]
 
 puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=crop.js></script>
-
 <fieldset class=cleft>
 <legend>Crop recording</legend>
 

var/mongoose/html/browse/crop/execute.jim

@@ -49,6 +49,8 @@ set newname "$shname-[clock seconds]"
 puts "Renaming file group to $newname"
 ts renamegroup "$dir/$shname.ts" $newname
 exec /mod/bin/hmt "+setfilename=$newname" "$dir/$newname.hmt"
+# New nicesplice shrinks whilst cropping.
+exec /mod/bin/hmt "+shrunk" "$dir/$newname.hmt"
 
 set croptime [expr [expr [clock milliseconds] - $cropstart] / 1000.0]
 puts "Time taken: $croptime"

var/mongoose/html/browse/crop/progress.jim

@@ -7,7 +7,7 @@ require ts.class
 httpheader
 
 set perc [cgi_get perc 100]
-set tsfile [file normalize [cgi_get file]]
+set tsfile [cgi_get file]
 
 set origfile "[file dirname $tsfile]/_original/[file tail $tsfile]"
 set newfile [file rootname $tsfile]

var/mongoose/html/browse/decrypt/decrypt.jim

@@ -5,6 +5,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class
 
+jqplugin progressbar
+jscss decrypt.js
 header
 
 set rfile [cgi_get file]
@@ -14,9 +16,6 @@ set len [$ts duration 1]
 lassign [$ts dlnaloc "127.0.0.1"] url
 
 puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=decrypt.js></script>
 
 <fieldset class=cleft>
 <legend>Decrypt in-place</legend>

var/mongoose/html/browse/delete.jim

@@ -2,7 +2,7 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require safe_delete
+require safe_delete ts.class
 
 httpheader
 
@@ -31,3 +31,5 @@ foreach file [cgi_get files] {
 }
 puts "</ul>"
 
+ts resetnew $dir
+

var/mongoose/html/browse/index.jim

@@ -4,6 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size system.class settings.class escape browse.class
 
+jqplugin contextMenu bar enadis
+jscss script.js style.css
 header
 
 set nicesplice [system pkginst nicesplice]
@@ -20,13 +22,17 @@ if {![dict exists $env REQUEST_URI]} {
 
 if {![dict exists $env QUERY_STRING]} { set env(QUERY_STRING) "root" }
 
+set config [settings new]
+
 set order [cgi_get order -]
 if {$order eq "-"} {
-	set order [[settings new] sortorder]
+	set order [$config sortorder]
 } else {
-	[settings new] sortorder $order
+	$config sortorder $order
 }
 
+set nofcount [$config nounwatchedcount]
+
 set model [system model]
 set dustbin [system dustbin 1]
 
@@ -39,10 +45,11 @@ proc icon {img {hover ""} {extra ""} {class "va"}} {
 }
 
 proc directory {file bfile tbfile} {
-	puts "<div class=va>"
+	puts "<div class=\"va relative\">"
 	set img "/images/711_1_09_Media_Folder.png"
 	if {$bfile eq $::dustbin} { set img "/img/Dustbin_Folder.png" }
 	puts "<img border=0 class=va id=\"img$tbfile\" src=$img>"
+	if {!$::nofcount} { puts "<span class=foldernum></span>" }
 	puts "<input class=\"fs fsdir\" type=checkbox>"
 	puts "<a class=dbf
 	    href=\"$::env(REQUEST_URI)?dir=[cgi_quote_url $file]\"
@@ -77,13 +84,19 @@ proc directory {file bfile tbfile} {
 	puts "</div>"
 }
 
+set dircount 0
+set filecount 0
+
 proc entry {file} {{i 0}} {
+	global dircount filecount
+	
 	set bfile [file tail $file]
 	regsub -all " +" $bfile "" tbfile
 	if {[string index $bfile 0] == "\025"} {
 		set bfile [string range $bfile 1 end]
 	}
 	if [file isdirectory "$file"] {
+		incr dircount
 		directory $file $bfile $tbfile
 		return
 	}
@@ -116,6 +129,7 @@ proc entry {file} {{i 0}} {
 		set img Video_Other
 		set omenu oopt
 	}
+	incr filecount
 
 	set new 0
 	if {$type eq "ts"} {
@@ -165,9 +179,9 @@ proc entry {file} {{i 0}} {
 		}
 		lassign $ret txt img
 		if {$img eq "Unclassified"} {
-			icon "/images/173_3_26_G3_$img.png" $txt
+			icon "/images/173_3_26_G3_$img.png" $txt "" "va genre"
 		} else {
-			icon "/images/173_3_00_G3_$img.png" $txt
+			icon "/images/173_3_00_G3_$img.png" $txt "" "va genre"
 		}
 
 		# HD / SD
@@ -237,16 +251,6 @@ set dir [cgi_get dir $mroot]
 ######################################################################
 # Render web page
 
-puts { 
-	<link href=/css/jquery.contextMenu.css rel=stylesheet type=text/css />
-	<script type=text/javascript src=/js/jquery.contextMenu.js></script>
-	<link href=/css/jquery.bar.css rel=stylesheet type=text/css />
-	<script type=text/javascript src=/js/jquery.bar.js></script>
-	<script type=text/javascript src=/js/enadis.js></script>
-	<script type=text/javascript src=script.js></script>
-	<link type=text/css rel=stylesheet href=style.css />
-}
-
 source assets.jim
 
 puts "
@@ -261,7 +265,7 @@ set stub ""
 foreach part [split $dir /] {
 	if {$stub eq "/"} { set name $part } else { set name "/$part" }
 	append stub $name
-	puts "<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $stub]>$name</a>
+	puts "<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $stub]\">$name</a>
 }
 puts "<span class=filesize id=dirsize></span>"
 puts "</legend>"
@@ -271,7 +275,7 @@ set parent [join [lrange [split $dir /] 0 end-1] /]
 if {$parent ne ""} {
 	puts "
 	    <div class=va>
-		<a href=$env(REQUEST_URI)?dir=[cgi_quote_url $parent]>
+		<a href=\"$env(REQUEST_URI)?dir=[cgi_quote_url $parent]\">
 		<img border=0 src=/images/711_3_09_Media_Folder_UP.png class=va>
 			\[parent directory\]</a>
 	    </div>
@@ -296,9 +300,9 @@ proc s_time {a b} {
 	}
 
 	if {[catch {file stat $a l}]} { return 0}
-	set at $l(ctime)
+	set at $l(mtime)
 	if {[catch {file stat $b l}]} { return 0}
-	set bt $l(ctime)
+	set bt $l(mtime)
 
 	if {$at < $bt} { return -1 }
 	if {$at > $bt} { return 1 }
@@ -313,7 +317,11 @@ switch $order {
 
 foreach file $files { entry "$dir/$file" }
 
-puts "<a href=# id=selectall>Select all</a> | <a href=# id=deselectall>none</a>"
+puts "
+<a href=# id=selectall>Select all</a> | <a href=# id=deselectall>none</a>
+&nbsp;&nbsp;
+Directories: $dircount, Files: $filecount
+"
 
 # Sort icons
 puts "<div id=sortdiv>"
@@ -326,7 +334,7 @@ foreach sl $sortlist {
 	set tag "Currently sorting"
 	if {$order != $index} {
 		puts "
-		    <a href=$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index>"
+	    <a href=\"$env(REQUEST_URI)?$env(QUERY_STRING)&order=$index\">"
 		set tag "Sort"
 	}
 	puts "<img class=va border=0 src=/img/$img.gif> $tag by $descr"

var/mongoose/html/browse/join/join.jim

@@ -4,18 +4,14 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
+jqplugin progressbar touchbridge
+jscss join.js join.css
 header
 
 cgi_input 1
 #cgi_dump
 
 puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<link href=join.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=/js/touchbridge.js></script>
-<script type/text/javascript src=join.js></script>
-
 <p><b>
 Drag the files below into order, enter a name for the resulting file and then
 click the <i>Join</i> button.</b>

var/mongoose/html/browse/mpg/mpg.jim

@@ -5,6 +5,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class system.class
 
+jqplugin progressbar
+jscss mpg.js
 header
 
 set rfile [cgi_get file]
@@ -13,9 +15,6 @@ set dir [file dirname $rfile]
 set len [$ts duration 1]
 
 puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=mpg.js></script>
 
 <fieldset class=cleft>
 <legend>Extract to MPG</legend>

var/mongoose/html/browse/new.jim

@@ -14,6 +14,7 @@ if {[set ts [ts fetch $file]] != 0} {
 
 	if {[$ts set_$action]} {
 		puts "Successfully marked $file as $action."
+		ts resetnew [file dirname $file]
 	} else {
 		puts "Problem marking $file as $action,
 		    [$ts get error]"

var/mongoose/html/browse/newdir.jim

@@ -15,10 +15,11 @@ foreach dir [glob -nocomplain "$root"] {
 	if {[file exists "$dir/.series"]} {
 		set fd [open "$dir/.series"]
 		set bytes [read $fd 8]
+		$fd close
 		set recs [unpack $bytes -uintle 0 32]
 		set plays [unpack $bytes -uintle 32 32]
 		set diff $($recs - $plays)
-		if {$diff != 0} {
+		if {$diff > 0} {
 			set node [lindex [split $dir /] end]
 			puts "\"$node\": $diff,"
 		}

var/mongoose/html/browse/resetnew.jim

@@ -1,45 +1,12 @@
 #!/mod/bin/jimsh
 
 package require cgi
-package require pack
 source /mod/webif/lib/setup
-require ts.class hexdump
+require ts.class
 
 httpheader
 
 set dir [cgi_get dir]
-if {![file isdirectory $dir]} { exit }
-if {![file exists "$dir/.series"]} { exit }
 
-set tot 0
-set watched 0
-foreach file [readdir -nocomplain $dir] {
-	if {![string match {*.ts} $file]} { continue }
-	#puts "FILE: $file"
-	incr tot
-	if {[set ts [ts fetch "$dir/$file"]] != 0} {
-		if {![$ts flag "New"]} { incr watched }
-	}
-}
-
-set fd [open "$dir/.series"]
-set bytes [read $fd]
-close $fd
-set recs [unpack $bytes -uintle 0 32]
-set played [unpack $bytes -uintle 32 32]
-
-puts "Current: $played/$recs"
-
-#hexdump $bytes
-
-puts "Calculated: $watched/$tot"
-
-pack bytes $tot -intle 32 0 
-pack bytes $watched -intle 32 32
-
-#hexdump $bytes
-
-set fd [open "$dir/.series" "w"]
-puts -nonewline $fd $bytes
-close $fd
+ts resetnew $dir
 

var/mongoose/html/browse/script.js

@@ -115,7 +115,13 @@ function set_folder_new(folder, cnt)
 	folder = folder.replace(/ /g, '');
 	folder = folder.replace(/([ #;&,.+*~\':"!^$[\]()=>|\/@])/g, '\\$1');
 	//console.log("Folder: (%s) = (%s)", folder, cnt);
-	$('#img' + folder).attr('src', '/img/Folder_New.png');
+	left = cnt > 99 ? 11 : (cnt > 9 ? 14 : 17);
+	$('#img' + folder)
+	    .attr('src', '/img/Folder_New.png')
+	    .next('span.foldernum')
+	    .css('left', left + 'px')
+	    .text(cnt)
+	    .show();
 }
 
 function new_folder_callback(data, status, xhr)
@@ -225,6 +231,7 @@ function savestream_submit()
 {
 	var s = $('#savestream_form').serialize();
 	var sf = $('#save_stream').attr('file');
+	$('#savestream_name').disable();
 	$('#savestream_spin').show();
 	$.get('/browse/savestream.jim?sfile=' +
 	    encodeURIComponent(sf) + '&' + s,
@@ -785,6 +792,11 @@ var dmenuclick = function(action, el, pos)
 		close: function() { $('#savestream_name').val(''); }
 	});
 
+	$('#savestream_name').keyup(function(e) {
+		if (e.keyCode == $.ui.keyCode.ENTER)
+			savestream_submit();
+	});
+
 	$('#bmpdialogue').dialog({
 		autoOpen: false,
 		height: 'auto', width: 'auto',
@@ -831,11 +843,20 @@ var dmenuclick = function(action, el, pos)
 	});
 
 	$('#save_stream').button().click(function() {
+		$('#savestream_retrieving').show();
+		$('#savestream_detail').text('').hide();
 		$('#savestream_spin').hide();
+		$('#savestream_name').val('').enable();
+
 		$('#savestreamform').dialog('open');
 		$('#savestream_detail').load(
 		    '/browse/ffmpeg.jim?file=' +
-		    encodeURIComponent($('#save_stream').attr('file')));
+		    encodeURIComponent($('#save_stream').attr('file')),
+		    function() {
+			$('#savestream_retrieving').hide();
+			$('#savestream_detail').show();
+			$('#savestream_form').show();
+		    });
 	});
 
 	$('#selectall').click(function(e) {

var/mongoose/html/browse/strip/strip.jim

@@ -4,6 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
+jqplugin progressbar
+jscss strip.js
 header
 
 set rfile [cgi_get file]
@@ -15,10 +17,6 @@ set len [$ts duration 1]
 set esttime $([$ts size] / 5700000)
 
 puts "
-<link href=/css/jquery.progressbar.css rel=stylesheet type=text/css />
-<script type=text/javascript src=/js/jquery.progressbar.js></script>
-<script type=text/javascript src=strip.js></script>
-
 <fieldset class=cleft>
 <legend>Make recordings smaller by removing unecessary frames</legend>
 

var/mongoose/html/browse/thumbnail/index.jim

@@ -4,6 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require ts.class pretty_size
 
+jqplugin enadis
+jscss script.js
 header
 
 set rfile [cgi_get file]
@@ -20,8 +22,6 @@ set pos $($pos + 0)
 if {$pos < 0} { set pos 0 }
 
 puts "
-<script type=text/javascript src=script.js></script>
-<script type=text/javascript src=/js/enadis.js></script>
 
 <fieldset class=cleft>
 <legend>Replace Thumbnail</legend>

var/mongoose/html/css/EXTRA.css

@@ -0,0 +1,5 @@
+/* This style sheet can be customised to change the look and feel of some
+ * web interface elements.
+ * It will not be overwritten on webif updates.
+ */
+

var/mongoose/html/css/iphone-style-checkboxes.css

@@ -1,75 +0,0 @@
-.iPhoneCheckContainer {
-  position: relative;
-  height: 27px;
-  cursor: pointer;
-  overflow: hidden; }
-  .iPhoneCheckContainer input {
-    position: absolute;
-    top: 5px;
-    left: 30px;
-    opacity: 0;
-    -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
-    filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0); }
-  .iPhoneCheckContainer label {
-    white-space: nowrap;
-    font-size: 17px;
-    line-height: 17px;
-    font-weight: bold;
-    font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
-    text-transform: uppercase;
-    cursor: pointer;
-    display: block;
-    height: 27px;
-    position: absolute;
-    width: auto;
-    top: 0;
-    padding-top: 5px;
-    overflow: hidden; }
-  .iPhoneCheckContainer, .iPhoneCheckContainer label {
-    user-select: none;
-    -moz-user-select: none;
-    -khtml-user-select: none; }
-
-.iPhoneCheckDisabled {
-  opacity: 0.5;
-  -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50);
-  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50); }
-
-label.iPhoneCheckLabelOn {
-  color: white;
-  background: url('/img/iphone-style-checkboxes/on.png?1282083753') no-repeat;
-  text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.6);
-  left: 0;
-  padding-top: 5px; }
-  label.iPhoneCheckLabelOn span {
-    padding-left: 8px; }
-label.iPhoneCheckLabelOff {
-  color: #8b8b8b;
-  background: url('/img/iphone-style-checkboxes/off.png?1282083753') no-repeat right 0;
-  text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.6);
-  text-align: right;
-  right: 0; }
-  label.iPhoneCheckLabelOff span {
-    padding-right: 8px; }
-
-.iPhoneCheckHandle {
-  display: block;
-  height: 27px;
-  cursor: pointer;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 0;
-  background: url('/img/iphone-style-checkboxes/slider_left.png?1282083753') no-repeat;
-  padding-left: 3px; }
-
-.iPhoneCheckHandleRight {
-  height: 100%;
-  width: 100%;
-  padding-right: 3px;
-  background: url('/img/iphone-style-checkboxes/slider_right.png?1282083753') no-repeat right 0; }
-
-.iPhoneCheckHandleCenter {
-  height: 100%;
-  width: 100%;
-  background: url('/img/iphone-style-checkboxes/slider_center.png?1282083753'); }

var/mongoose/html/css/iphone-style-checkboxes.css

@@ -0,0 +1 @@
+../lib/jquery.iphone-style-checkboxes/iphone-style-checkboxes.css

var/mongoose/html/css/style.css

@@ -427,7 +427,16 @@ button.red
 
 div#restart_block
 {
+	text-align: center;
 	z-index: 31;
+	float: right;
+	width: 60%;
+	position: absolute;
+	top: 10px;
+	left: 100px;
+	background-color: #f8f8f8;
+	opacity: 0.9;
+	filter:alpha(opacity=90);
 }
 
 img.bmp, img.doublebmp
@@ -445,3 +454,31 @@ img.doublebmp
 	width: 280px;
 }
 
+.relative
+{
+	position: relative;
+}
+
+span.foldernum
+{
+	display: none;
+	position: absolute;
+	left: 14px;
+	top: 9px;
+	color: white;
+	height: 15px;
+	line-height: 16px;
+	background-color: #CC0000;
+	background: linear-gradient(#FF0000, #CC0000) repeat scroll 0 0 #EEEEEE;
+	font-size: 10px;
+	border: 1px solid #660000;
+	padding: 0 2px 0 2px;
+	border-radius: 1em 1em 1em 1em;
+	-moz-border-radius: 1em;  
+	-webkit-border-radius: 1em;
+	border-top-right-radius: 1em;
+	border-top-left-radius: 1em;
+	border-bottom-right-radius: 1em;
+	border-bottom-left-radius: 1em;
+}
+

var/mongoose/html/css/ui.totop.css

@@ -1,30 +0,0 @@
-
-#toTop {
-    background: url("/img//ui.totop.png") no-repeat scroll left top transparent;
-    border: medium none;
-    bottom: 110px;
-    display: none;
-    height: 51px;
-    margin-left: 50px;
-    overflow: hidden;
-    position: fixed;
-    text-decoration: none;
-    text-indent: -999px;
-    width: 77px;
-    z-index: 2000;
-}
-
-#toTopHover {
-    background: url("/img/ui.totop.png") no-repeat scroll left -51px transparent;
-    display: block;
-    float: left;
-    height: 51px;
-    opacity: 0;
-    overflow: hidden;
-    width: 77px;
-}
-
-#toTop:active, #toTop:focus {
-    outline: medium none;
-}
-

var/mongoose/html/css/ui.totop.css

@@ -0,0 +1 @@
+../lib/jquery.plugin/ui.totop/ui.totop.css

var/mongoose/html/css/xepg.css

@@ -111,3 +111,8 @@ button#later
 	margin-left: 2em;
 }
 
+.jcaquestion
+{
+	margin-left: 0px !important;
+}
+

var/mongoose/html/dedup/dedup.jim

@@ -12,7 +12,7 @@ source process.jim
 set dir [cgi_get dir "/media/My Video"]
 set doit [cgi_get doit 0]
 
-puts "<script type=text/javascript src=script.js></script>"
+jscss script.js
 
 puts "<fieldset style=\"display: inline\">
 <legend>De-duplicate <span id=dir>$dir</span></legend>
@@ -26,6 +26,7 @@ puts "<fieldset style=\"display: inline\">
 "
 
 loadseries $dir
+set recalc 0
 foreach file [readdir $dir] {
 	set file "$dir/$file"
 	if {[file extension $file] ne ".hmt"} { continue }
@@ -52,6 +53,7 @@ foreach file [readdir $dir] {
 			}
 			ts renamegroup $file "_duplicates/$fn"
 			puts -nonewline " - Renamed to _duplicates/$fn"
+			incr recalc
 		}
 	    }
 	    error {
@@ -78,6 +80,8 @@ foreach file [readdir $dir] {
 	puts "</tr>"
 }
 
+if {$recalc} { ts resetnew $dir }
+
 puts {
 </table>
 </fieldset>

var/mongoose/html/diag/diag.jim

@@ -4,16 +4,16 @@ package require cgi
 source /mod/webif/lib/setup
 require pretty_size system.class pkg.class
 
+jqplugin enadis
+jscss script.js style.css
 header
 
 pkg loaddiagmeta
 
 set smv [system modversion 1]
 
-puts {
-<script type=text/javascript src=/js/enadis.js></script>
-<script type=text/javascript src=script.js></script>
 
+puts {
 <fieldset class=cleft>
 <legend>Utilities</legend>
 <table>
@@ -54,8 +54,8 @@ puts {
 
 <tr>
 <td colspan=2 align=center>
-<button id=runedit style="width: 48%">File Editor</button>
-<button id=dbinfo style="width: 48%">Database Browser</button>
+<button id=runedit class=half>File Editor</button>
+<button id=dbinfo class=half>Database Browser</button>
 </td>
 </tr>
 
@@ -63,26 +63,25 @@ puts {
 <td colspan=2 align=center>
 }
 if {[system model] eq "HDR"} {
-	puts { <button id=diskdiag style="width: 48%">Hard Disk</button> }
+	puts { <button id=diskdiag class=half>Hard Disk</button> }
 }
 puts {
-<button id=channelinfo style="width: 48%">Channel Information</button>
+<button id=channelinfo class=half>Channel Information</button>
 </td>
 </tr>
 
+<tr>
+<td colspan=2 align=center>
+<button id=dspace class=half>Disk Space</button>
 }
 
 if {[system model] eq "HDR"} {
-puts {
-<tr>
-<td colspan=2 align=center>
-<button id=dlna style="width: 48%">DLNA Server</button>
-</td>
-</tr>
-}
+	puts { <button id=dlna class=half>DLNA Server</button> }
 }
 
 puts {
+</td>
+</tr>
 
 <tr><td colspan=2 style="height: 10px"></td></tr>
 

var/mongoose/html/diag/disk.jim

@@ -4,6 +4,7 @@ package require cgi
 source /mod/webif/lib/setup
 require system.class settings.class
 
+jqplugin enadis
 header
 
 set device [system disk]
@@ -20,7 +21,6 @@ if {$line ne ""} {
 }
 
 puts "
-<script type=text/javascript src=/js/enadis.js></script>
 <h3 class=va>
 	<img class=va width=100 src=/img/disc.png>
 	SMART data read from device $device
@@ -105,6 +105,10 @@ foreach line [split [exec /mod/bin/smartctl -A $device] "\n"] {
 			$settings _nval_setting "SMART_realloc" $rval
 			if {$rval > 0} { set class orangeshade }
 		}
+		10 {
+			$settings _nval_setting "SMART_spinretry" $rval
+			if {$rval > 0} { set class orangeshade }
+		}
 		197 {
 			$settings _nval_setting "SMART_pending" $rval
 			if {$rval > 0} { set class redshade }

var/mongoose/html/diag/diskack.jim

@@ -9,7 +9,7 @@ set settings [settings]
 
 foreach attr {realloc pending offline} {
 	set val [$settings _nval_setting "SMART_$attr"]
-	if {$val <= 0} continue
+	if {$val < 0} continue
 	$settings _nval_setting "SMART_ack_$attr" $val
 }
 

var/mongoose/html/diag/dspace/index.jim

@@ -0,0 +1,92 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require system.class pretty_size
+
+jqplugin easy-pie-chart
+jscss script.js style.css
+header
+
+set dustbin [system dustbin 1]
+set root [system mediaroot]
+set lroot [string length $root]
+
+proc hasnew {dir} {
+	if {![file exists "$dir/.series"]} { return 0 }
+	if {[catch {set fd [open "$dir/.series"]}]} { return 0 }
+	set bytes [read $fd 8]
+	$fd close
+	set recs [unpack $bytes -uintle 0 32]
+	set plays [unpack $bytes -uintle 32 32]
+	set diff $($recs - $plays)
+	if {$diff != 0} { return 1 }
+	return 0
+}
+
+set rsize 0
+
+proc gen {dir ddir {depth 0} {expand 0}} {
+	global root lroot rsize
+
+	if {[catch {set dsize [exec /mod/bin/busybox/du -s "$dir/"]} msg]} {
+		puts "Error, $dir, $msg"
+		return
+	}
+	lassign $dsize dsize
+	if {!$rsize} { set rsize $dsize }
+
+	set dlist {}
+	foreach entry [lsort [readdir -nocomplain $dir]] {
+		if {[string index $entry 0] eq "."} continue
+		if {![file isdirectory "$dir/$entry"]} continue
+		lappend dlist $entry
+	}
+
+	set img "/images/711_1_09_Media_Folder.png"
+	if {[hasnew $dir]} { set img "/img/Folder_New.png" }
+	if {[string first "/$::dustbin" $dir] > -1} {
+		set img "/img/Dustbin_Folder.png"
+	}
+
+	if {$expand > 0} { set class "open" } else { set class "closed" }
+	if {$expand > 1} { set timg "minus" } else { set timg "plus" }
+	if {![llength $dlist]} { set timg "join" }
+
+	set perc $($dsize * 100 / $rsize)
+
+	puts -nonewline "
+	    <div class=\"va $class\" style=\"padding-left: ${depth}em\">
+		<img border=0 class=\"va tlink\" src=/img/tree/$timg.png>
+		<span class=\"va fileperc\" data-percent=$perc>
+		    <img border=0 class=va src=\"$img\"></span>
+		<span class=filesize>
+		    ([pretty_size $($dsize * 1024)] - $perc%)
+		</span>
+		<span class=path>
+		    <a target=dspace_drill
+			href=\"/browse/index.jim?dir=[cgi_quote_url $dir]\">$ddir</a>
+		</span>
+	"
+
+	incr depth 2
+	incr expand -1
+
+	foreach subd $dlist { gen "$dir/$subd" $subd $depth $expand }
+
+	puts {</div>}
+}
+
+puts {
+<fieldset style="display: inline">
+<legend> Disk Utilisation </legend>
+}
+
+gen $root "/" 0 2
+
+puts {
+</fieldset>
+}
+
+footer
+

var/mongoose/html/diag/dspace/script.js

@@ -0,0 +1,40 @@
+
+$(function() {
+
+
+$('img.tlink').hover(
+    function() { $(this).css('cursor', 'pointer'); },
+    function() { $(this).css('cursor', 'auto'); }
+).on('click', function(e) {
+        e.preventDefault();
+
+	if ($(this).attr('src') == '/img/tree/plus.png')
+	{
+		$(this).attr('src', '/img/tree/minus.png');
+		$(this).parent().children('div')
+		    .slideDown('slow')
+		    .addClass('open')
+		    .removeClass('closed');
+	}
+	else
+	{
+		$(this).attr('src', '/img/tree/plus.png');
+		$(this).parent().children('div')
+		    .slideUp('slow')
+		    .addClass('closed')
+		    .removeClass('open');
+	}
+
+});
+
+$('span.fileperc').easyPieChart({
+	size: 20,
+	barColor: '#00ff00',
+	trackColor: '#A3A3C2',
+	lineWidth: 4,
+	scaleColor: false,
+	lineCap: 'butt'
+});
+
+});
+

var/mongoose/html/diag/dspace/style.css

@@ -0,0 +1 @@
+div.closed { display: none; }

var/mongoose/html/diag/script.js

@@ -78,6 +78,11 @@ $('#dlna').click(function(e) {
 	window.location = '/dlna/dlna.jim';
 });
 
+$('#dspace').click(function(e) {
+	e.preventDefault();
+	window.location = 'dspace/index.jim';
+});
+
 $('#reboot').click(function(e) {
 	e.preventDefault();
 	if (confirm('Are you sure you wish to perform a reboot now?'))

var/mongoose/html/diag/style.css

@@ -0,0 +1 @@
+button.half { width: 48%; }

var/mongoose/html/dlna/dlna.jim

@@ -42,8 +42,8 @@ if {[system is_listening 9000]} {
 	set img "745_1_11_Video_1REC.png"
 }
 
+jscss script.js
 puts "
-<script type=text/javascript src=script.js></script>
 <fieldset class=cleft>
 <legend>DLNA Server Information</legend>
 

var/mongoose/html/edit/edit.jim

@@ -4,17 +4,13 @@ package require cgi
 source /mod/webif/lib/setup
 require plugin
 
+jqplugin enadis tabsupport filetree
+jscss script.js style.css
 header
 
 set file [cgi_get file "/tmp/hosts"]
 
 puts {
-<script type=text/javascript src=/js/enadis.js></script>
-<script type=text/javascript src=/js/tabsupport.js></script>
-<script type=text/javascript src=/js/jqueryFileTree.js></script>
-<link rel=stylesheet type=text/css href=/css/jqueryFileTree.css />
-<script type=text/javascript src=script.js></script>
-<link rel=stylesheet href=style.css type=text/css />
 
 <fieldset class=cleft>
 <legend>File Editor</legend>
@@ -23,7 +19,8 @@ puts {
 Use the <i>Open</i> button below to begin.
 </div>
 
-<textarea cols=80 rows=20 id=editor></textarea>
+<textarea cols=120 rows=20 id=editor
+class="ui-widget ui-corner-all"></textarea>
 
 <br>
 <button class=xeditactive id=open>Open</button>
@@ -45,6 +42,7 @@ Use the <i>Open</i> button below to begin.
 <ul>
 	<li><a href=# class=qfile>/mod/etc/anacrontab</a></li>
 	<li><a href=# class=qfile>/mod/var/spool/cron/crontabs/root</a></li>
+	<li><a href=# class=qfile>/mod/webif/html/css/EXTRA.css</a></li>
 }
 
 proc quickedit {file} {

var/mongoose/html/edit/style.css

@@ -2,6 +2,7 @@ textarea
 {
 	background: white;
 	color: black;
+	font-family: Consolas, "Courier New", "Lucida Console", Monaco, "Courier", monospace !important;
 }
 
 #filename

var/mongoose/html/epg/service.css

@@ -0,0 +1,79 @@
+
+table.weekview
+{
+	width: 100%;
+	border: 1px solid red;
+}
+
+th.day, th.hour, td.dayhour
+{
+	border: solid 1px #d3d3d3;
+}
+
+th.day, th.hour
+{
+	background: #ccff99;
+	color: black;
+}
+
+th.day
+{
+	text-align: center;
+	font-size: 1.2em;
+	width: 13%;
+}
+
+th.hour
+{
+	vertical-align: top;
+	text-align: center;
+	font-size: 1.3em;
+	padding: 8px 0;
+}
+
+td.dayhour
+{
+	vertical-align: top;
+	background: #ffffcc;
+}
+
+td.sdayhour
+{
+	vertical-align: middle;
+	background: #ffffcc;
+}
+
+div.prog
+{
+	margin: 5px;
+}
+
+div.progp
+{
+	padding-top: 1em;
+}
+
+div.time
+{
+	font-size: 1.3em;
+	opacity: 0.6;
+	margin-bottom: 0.4em;
+}
+
+div.title
+{
+	font-size: 1.1em;
+	text-weight: bold;
+	margin-bottom: 0.4em;
+}
+
+div.synopsis
+{
+	font-size: 0.9em;
+}
+
+img.cimg
+{
+	width: 100%;
+}
+

var/mongoose/html/epg/service.jim

@@ -0,0 +1,257 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require epg.class spinner.class altrow
+
+jqplugin iphone-style-checkboxes freezeheader scrollto
+jscss service.js service.css
+header
+
+require totop
+
+[spinner new {
+	text "Loading EPG Data..."
+	size "1.2em"
+	style "margin: 1em;"
+	}] start
+
+require epg_popup
+
+set service [cgi_get service 4170]
+set records [epg dbfetch dump \
+    -service $service \
+    -sort "strftime('%%H%%J', start, 'unixepoch'), strftime('%%M', start, 'unixepoch')" \
+    -debug 0
+]
+
+if {[llength $records] == 0} {
+	puts "No data for service.."
+	exit
+}
+
+set nowhour [clock format [clock seconds] -format "%H"]
+
+# Load the channel information from the first entry
+set tr [lindex $records 0]
+$tr get_channel_info
+set channel_num [$tr get channel_num]
+set channel_name [$tr get channel_name]
+puts "
+
+	<div style=\"margin: 0 1em 1em 1em\">
+	<table class=va><tr><td class=va>
+	[$tr channel_icon 40 {vertical-align:middle}]
+	</td><td>
+		$channel_num - $channel_name
+	</td><td style=\"width: 50px\">&nbsp;</td><td>
+		<button id=jumptonow hour=$nowhour>Jump to Now</button>
+	</td><td style=\"width: 50px\">&nbsp;</td><td>
+		Show synopsis?
+	</td><td>
+		<input type=checkbox id=synopsis value=1 checked />
+	</td><td style=\"width: 50px\">&nbsp;</td><td>
+		<button id=listview service=$service>List View</button>
+	</td></tr></table>
+	</div>
+"
+puts {
+<script type=text/javascript>
+$('button').button();
+$('#synopsis').iphoneStyle({checkedLabel: 'YES', uncheckedLabel: 'NO'});
+</script>
+}
+
+puts "
+<div class=weekview>
+<table class=weekview>
+<thead>
+<tr>
+<th class=hour></th>
+"
+set t [clock seconds]
+set firstday [clock format $t -format {%Y%m%d}]
+set daymap {}
+loop i 0 8 {
+	puts "<th class=\"day day-$i\">[clock format $t -format {%a}]<br>"
+	puts "[clock format $t -format {%e %b}]</th>"
+	set day [clock format $t -format {%Y%m%d}]
+	set daymap($day) $i
+	set dayrmap($i) $day
+	incr t 86400
+}
+puts "
+</tr>
+</thead>
+<tbody>
+"
+
+set contprog {}
+
+proc slink {e} {
+	global service
+	if {[$e get series_crid] ne ""} {
+		set ro 2
+	} else {
+		set ro 1
+	}
+	set st [$e scheduled]
+	return "<a class=event href=# xs=$service xe=[$e get event_id] sch=$st rec=$ro>"
+}
+
+proc prog {e {cont 0} {hour 99}} {
+	global service day contprog
+
+	set start [$e get start]
+	set end [$e end]
+	set class "prog"
+	if {$cont} { set class "prog progp" }
+	puts "
+<div class=\"$class\">
+<div class=time>
+[clock format $start -format {%H:%M}]-[clock format $end -format {%H:%M}]
+</div>
+<div class=title>
+[slink $e]
+[$e get name]
+</a>
+</div>
+<div class=synopsis>[$e get text] [join [$e icon_set 14] ""]</div>
+</div>
+"
+
+	# Programmes which cross the hour boundary
+	if {[clock format $end -format "%H%M"] > "$($hour + 1)00"} {
+		puts "<div class=cont><img class=cimg src=/img/contt.png></div>"
+		set contprog($day) $e
+	}
+}
+
+proc cprog {} {
+	global service day contprog hour
+
+	set e $contprog($day)
+
+	set end [$e end]
+
+	if {[clock format $end -format "%H%M"] eq "${hour}00"} {
+		dict unset contprog $day
+		return 0
+	}
+
+	set start [$e get start]
+
+	puts "
+<div class=cont><img class=cimg src=/img/contb.png></div>
+<div class=prog>
+<div class=time>
+...... -[clock format $end -format {%H:%M}]
+</div>
+<div class=title>
+[slink $e]
+[$e get name]
+</a>
+</div>
+</div>
+"
+	if {[clock format $end -format "%H"] > $hour} {
+		puts "<div class=cont><img class=cimg src=/img/contt.png></div>"
+	} else {
+		dict unset contprog $day
+	}
+	return 1
+}
+
+proc jcprog {day} {
+	global contprog
+
+	set e $contprog($day)
+
+	set start [$e get start]
+	set end [$e end]
+
+	puts "
+<div class=cont><img class=cimg src=/img/contb.png></div>
+<div class=prog>
+<div class=time>
+[clock format $start -format {%H:%M}]-[clock format $end -format {%H:%M}]
+</div>
+<div class=title>
+[slink $e]
+[$e get name]
+</a>
+</div>
+</div>
+<div class=cont><img class=cimg src=/img/contt.png></div>
+"
+}
+
+proc skiptoday {day} {
+	global daymap dayrmap currday contprog oldcell
+	if {!$oldcell && [dict exists $contprog $currday]} {
+		jcprog $currday
+	}
+	#puts "Skiptoday: $day ($daymap($currday))<br>"
+	if {$daymap($currday) eq $day} return
+	puts "</td><td class=dayhour>"
+	incr day -1
+	loop i $daymap($currday) $day {
+		set j $($i + 1)
+		if {[dict exists $contprog $dayrmap($j)]} {
+			jcprog $dayrmap($j)
+		}
+		puts "</td><td class=dayhour>"
+	}
+}
+
+set currhour -1
+set currday -1
+set oldcell 0
+foreach e $records {
+	set start [$e get start]
+	set day [clock format $start -format "%Y%m%d"]
+	if {$day ni $daymap} continue
+	set hour [clock format $start -format "%H"]
+	if {$hour != $currhour} {
+		if {$currhour ne "-1"} {
+			if {$daymap($currday) < 7} {
+				skiptoday 7
+				if {[dict exists $contprog $dayrmap(7)]} {
+					jcprog $dayrmap(7)
+				}
+			}
+			puts -nonewline "</td></tr>"
+		}
+		puts "
+			<tr class=hour id=hour_$hour>
+			<th class=hour>$hour:00</th>
+			<td class=dayhour>
+		"
+		set currhour $hour
+		set currday $firstday
+		set oldcell 0
+	}
+	if {$day ne $currday} {
+		skiptoday $daymap($day)
+		set currday $day
+		set oldcell 0
+	}
+	# Continuations from previous hour...
+	if {!$oldcell && [dict exists $contprog $day]} {
+		if {[cprog]} { set oldcell 1 }
+	}
+	prog $e $oldcell $hour
+	set oldcell 1
+}
+
+puts "
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+"
+
+epg cleanup
+footer
+

var/mongoose/html/epg/service.js

@@ -0,0 +1,31 @@
+
+$(function() {
+
+$('button').button();
+
+$('#synopsis').iphoneStyle({
+	checkedLabel: 'YES',
+	uncheckedLabel: 'NO'
+}).bind('change', function() {
+	if ($(this).attr('checked'))
+		$('.synopsis').show();
+	else
+		$('.synopsis').hide();
+});
+
+$('#listview').bind('click', function() {
+	var service = $(this).attr('service');
+	window.location.href = '/epg/xservice.jim?service=' + service;
+});
+
+$('table.weekview').freezeHeader();
+
+$('#jumptonow').bind('click', function() {
+	var hour = $(this).attr('hour');
+	$('body').scrollTo('#hour_' + hour, 500, {
+		offset: {top: -50, left: 0}
+	});
+});
+
+});
+

var/mongoose/html/epg/xservice.jim

@@ -26,14 +26,28 @@ set channel_name [$tr get channel_name]
 
 puts "
 	<div style=\"margin: 0 1em 1em 1em\">
-	[$tr channel_icon 80 {vertical-align:middle}]
-	<span style=\"vertical-align: middle\">
+	<table class=va><tr><td class=va>
+	[$tr channel_icon 40 {vertical-align:middle}]
+	</td><td>
 		$channel_num - $channel_name
-	</span>
+	</td><td style=\"width: 50px\">&nbsp;</td><td>
+	<button id=gridview>
+		Grid View
+	</button>
+	</td></tr></table>
 	</div>
 "
+puts "
+<script type=text/javascript>
+\$('button').button();
+\$('#gridview').button().bind('click', function() {
+	document.location.href = '/epg/service.jim?service=$service';
+});
+</script>
+"
 
 puts {
+	<div id=list>
 	<table class=borders>
 	<tr>
 		<th></th>
@@ -61,7 +75,7 @@ foreach record $records {
 	puts "<td>[$record get warning]</td>"
 	puts "</tr>"
 }
-puts "</table>"
+puts "</table></div>"
 
 epg cleanup
 footer

var/mongoose/html/favicon.ico

@@ -0,0 +1 @@
+img/fav/favicon.ico

var/mongoose/html/img/fav/notes.txt

@@ -0,0 +1,6 @@
+<link rel="icon" href="/favicon.ico" sizes="16x16 32x32 64x64" type=image/vnd.microsoft.icon />
+<link rel="apple-touch-icon" href="/img/fav/57.png" />
+<link rel="apple-touch-icon" sizes="57x57" href="/img/fav/57.png" />
+<link rel="apple-touch-icon" sizes="72x72" href="/img/fav/72.png" />
+<link rel="apple-touch-icon" sizes="114x114" href="/img/fav/114.png" />
+<link rel="apple-touch-icon" sizes="144x144" href="/img/fav/144.png" />

var/mongoose/html/img/tree/index.html

@@ -0,0 +1,32 @@
+<img src=blank.png>blank.png<br>
+<img src=folder.png>folder.png<br>
+<img src=folderopen.png>folderopen.png<br>
+<img src=index.html>index.html<br>
+<img src=join.png>join.png<br>
+<img src=joinbottom-down.png>joinbottom-down.png<br>
+<img src=joinbottom.png>joinbottom.png<br>
+<img src=leaf.png>leaf.png<br>
+<img src=line.png>line.png<br>
+<img src=minus.png>minus.png<br>
+<img src=minusbottom.png>minusbottom.png<br>
+<img src=minusonly.png>minusonly.png<br>
+<img src=minustop.png>minustop.png<br>
+<img src=nullonly.png>nullonly.png<br>
+<img src=plus.png>plus.png<br>
+<img src=plusbottom.png>plusbottom.png<br>
+<img src=plusonly.png>plusonly.png<br>
+<img src=plustop.png>plustop.png<br>
+<img src=rev-join.png>rev-join.png<br>
+<img src=rev-joinbottom-down.png>rev-joinbottom-down.png<br>
+<img src=rev-joinbottom.png>rev-joinbottom.png<br>
+<img src=rev-leaf.png>rev-leaf.png<br>
+<img src=rev-line.png>rev-line.png<br>
+<img src=rev-minus.png>rev-minus.png<br>
+<img src=rev-minusbottom.png>rev-minusbottom.png<br>
+<img src=rev-minusonly.png>rev-minusonly.png<br>
+<img src=rev-minustop.png>rev-minustop.png<br>
+<img src=rev-nullonly.png>rev-nullonly.png<br>
+<img src=rev-plus.png>rev-plus.png<br>
+<img src=rev-plusbottom.png>rev-plusbottom.png<br>
+<img src=rev-plusonly.png>rev-plusonly.png<br>
+<img src=rev-plustop.png>rev-plustop.png<br>