tag

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/tags/1.0.8@1777 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,9 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.0.6
+Version: 1.0.8
 Architecture: mipsel
 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.8),mongoose(>=3.0-9),jim(>=0.74-4),jim-oo,jim-sqlite3(>=0.74-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)
 Suggests:
 Description: An evolving web interface for the Humax.

CONTROL/postinst

@@ -37,6 +37,7 @@ if [ ! -f /mod/webif/.strip-updated ]; then
 fi
 
 /mod/webif/lib/bin/diskattrs
+/mod/webif/lib/bin/resetnew
 
 [ -f $tmpf ] && rm -f $tmpf
 

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/epg/info.jim

@@ -2,7 +2,7 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require epg.class system.class
+require epg.class system.class settings.class
 
 set irinst [system pkginst ir]
 
@@ -16,10 +16,14 @@ set record [lindex [epg fetch dump -service $service -event $event] 0]
 $record get_channel_info
 set others [$record othertimes]
 
-jqplugin confirmAction
+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 "
-<script type=text/javascript src=/js/chanchange.js></script>
 	<table class=keyval>
 	<tr>
 		<th>Programme</th>

var/mongoose/cgi-bin/settings.jim

@@ -40,6 +40,9 @@ 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]
@@ -84,6 +87,10 @@ 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"
 
@@ -122,6 +129,7 @@ puts {
 <script type="text/javascript" src="/js/jquery.form.js"></script>
 <script type="text/javascript" src="/js/iphone-style-checkboxes.js"></script>
 <link href=/css/iphone-style-checkboxes.css rel=stylesheet type=text/css />
+<div id=accordion>
 }
 
 proc setting_toggle {name attr checked {invert 0} {val 0}} {
@@ -141,7 +149,8 @@ proc setting_toggle {name attr checked {invert 0} {val 0}} {
 }
 
 puts "
-	<fieldset style=\"display: inline\">
+	<h4>General Settings</h4>
+	<div><fieldset style=\"display: inline\">
 		<legend>
 			General Settings
 		</legend>
@@ -169,6 +178,12 @@ setting_toggle "HTTPS web server?" "https" \
 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>
@@ -198,9 +213,10 @@ puts "
 "
 
 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>
@@ -292,8 +308,7 @@ setting_toggle "De-duplicate genre search results?" genrededup $genrededup
 
 puts "
 	</table>
-	</fieldset>
-	<br><br>
+	</fieldset></div>
 "
 
 #puts "
@@ -325,6 +340,8 @@ puts "
 #"
 
 puts "
+	<h4>Web Interface User Access Control</h4>
+	<div>
 	<fieldset style=\"display: inline\">
 	<legend> Web Interface User Access Control </legend>
 	<table>
@@ -379,6 +396,7 @@ puts "
 	</table>
 	<div id=aclnewuser_output></div>
 	</fieldset>
+	</div>
 "
 
 puts {
@@ -415,7 +433,8 @@ $('button.pwchange').click(function(el) {
 }
 
 puts -nonewline "
-	<br><br>
+	<h4>Advanced Settings</h4>
+	<div>
 	<fieldset style=\"display: inline\">
 	<legend> Advanced Settings </legend>
 	<table>
@@ -430,9 +449,20 @@ if {[system modversion 1] >= 214} {
 puts "
 	</table>
 	</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

@@ -72,5 +72,15 @@ $(document).ready(function () {
 				    .delay(2000).fadeOut('slow');
 		    });
 	});
+
+	$('#accordion').accordion({
+	    header: 'h4',
+	    collapsible: true,
+	    active: 0,
+	    heightStyle: 'content'
+	});
+
+	// For now - until plugins are updated.
+	$('div.pluginsettings').find('br + br').remove();
 });
 

var/mongoose/cgi-bin/status.jim

@@ -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,9 +2,9 @@
 
 package require cgi
 source /mod/webif/lib/setup
+require settings.class
 
 header
-jqplugin confirmAction
 
 require epg.class spinner.class altrow epg_search totop system.class
 
@@ -14,7 +14,13 @@ puts {
 <link type="text/css" href="/css/xepg.css" rel="Stylesheet" />
 <script type=text/javascript src=/js/enadis.js></script>
 <script type=text/javascript src=xepg.js></script>
-<script type=text/javascript src=/js/chanchange.js></script>
+}
+
+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> }
 }
 
 [spinner new {
@@ -87,7 +93,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)

var/mongoose/cgi-bin/xepg.js

@@ -14,8 +14,8 @@ $('#xepg_dp').datepicker({
         buttonImageOnly: true,
         showOn: 'button',
         dateFormat: '@',
-        minDate: '[expr $now * 1000]',
-        maxDate: '[expr ($now + 7 * 86400) * 1000]',
+        minDate: 0,
+        maxDate: 8,
         onSelect: function(val, sel) {
                 var stt = $(this).attr('stt');
                 // Extract date part

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>

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/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

@@ -20,13 +20,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]
 
@@ -43,7 +47,7 @@ proc directory {file bfile tbfile} {
 	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>"
-	puts "<span class=foldernum></span>"
+	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]\"
@@ -173,9 +177,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

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

@@ -19,7 +19,7 @@ foreach dir [glob -nocomplain "$root"] {
 		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/script.js

@@ -231,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,
@@ -791,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',
@@ -837,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/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/xepg.css

@@ -113,6 +113,6 @@ button#later
 
 .jcaquestion
 {
-	margin-left: 0px;
+	margin-left: 0px !important;
 }
 

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/edit/edit.jim

@@ -46,6 +46,7 @@ class="ui-widget ui-corner-all"></textarea>
 <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/js/chanchangenc.js

@@ -0,0 +1,23 @@
+$(function() {
+
+var signalarray = ['ZERO', 'ONE', 'TWO', 'THREE', 'FOUR',
+                   'FIVE', 'SIX', 'SEVEN', 'EIGHT', 'NINE'];
+
+$('a.chanchange').on('click', function(el) {
+	el.preventDefault();
+	var lcn = $(this).attr('chan');
+
+	var cmd = '';
+	for (i = 0; i < lcn.length; i++)
+	{
+		if (i > 0)
+			cmd += '+';
+		cmd += signalarray[lcn.charAt(i)];
+	}
+	if (lcn < 1000)
+		cmd += '+OK';
+	$.get('/plugin/ir/send.jim?code=' + cmd);
+});
+
+});
+

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

@@ -50,7 +50,8 @@ $.extend($[iphoneStyle].prototype, {
   
   // Disable IE text selection, other browsers are handled in CSS
   disableTextSelection: function() {
-    if (!$.browser.msie) { return; }
+    return;
+//    if (!$.browser.msie) { return; }
 
     // Elements containing text should be unselectable
     $.each([this.handle, this.offLabel, this.onLabel, this.container], function() {
@@ -147,7 +148,8 @@ $.extend($[iphoneStyle].prototype, {
   initialPosition: function() {
     this.offLabel.css({ width: this.container.width() - 5 });
 
-    var offset = ($.browser.msie && $.browser.version < 7) ? 3 : 6;
+//    var offset = ($.browser.msie && $.browser.version < 7) ? 3 : 6;
+    var offset = 6;
     this.rightSide = this.container.width() - this.handle.width() - offset;
 
     if (this.$elem.is(':checked')) {

var/mongoose/html/js/jquery.alerts.js

@@ -81,7 +81,8 @@
 			if( $.alerts.dialogClass ) $("#popup_container").addClass($.alerts.dialogClass);
 			
 			// IE6 Fix
-			var pos = ($.browser.msie && parseInt($.browser.version) <= 6 ) ? 'absolute' : 'fixed'; 
+//			var pos = ($.browser.msie && parseInt($.browser.version) <= 6 ) ? 'absolute' : 'fixed'; 
+			var pos = 'fixed';
 			
 			$("#popup_container").css({
 				position: pos,
@@ -195,7 +196,7 @@
 			if( left < 0 ) left = 0;
 			
 			// IE6 fix
-			if( $.browser.msie && parseInt($.browser.version) <= 6 ) top = top + $(window).scrollTop();
+//			if( $.browser.msie && parseInt($.browser.version) <= 6 ) top = top + $(window).scrollTop();
 			
 			$("#popup_container").css({
 				top: top + 'px',
@@ -232,4 +233,4 @@
 		$.alerts.prompt(message, value, title, callback);
 	};
 	
-})(jQuery);
+})(jQuery);

var/mongoose/html/js/jquery.contextMenu.js

@@ -124,13 +124,13 @@ if (jQuery) (function() {
                 });
 
                 // Disable text selection
-                if ($.browser.mozilla) {
-                    $('#' + o.menu).each(function() { $(this).css({ 'MozUserSelect': 'none' }); });
-                } else if ($.browser.msie) {
-                    $('#' + o.menu).each(function() { $(this).bind('selectstart.disableTextSelect', function() { return false; }); });
-                } else {
+//                if ($.browser.mozilla) {
+//                    $('#' + o.menu).each(function() { $(this).css({ 'MozUserSelect': 'none' }); });
+//                } else if ($.browser.msie) {
+//                    $('#' + o.menu).each(function() { $(this).bind('selectstart.disableTextSelect', function() { return false; }); });
+//                } else {
                     $('#' + o.menu).each(function() { $(this).bind('mousedown.disableTextSelect', function() { return false; }); });
-                }
+//                }
                 // Disable browser context menu (requires both selectors to work in IE/Safari + FF/Chrome)
                 $(el).add('UL.contextMenu').bind('contextmenu', function() { return false; });
 

var/mongoose/html/js/jquery.js

@@ -0,0 +1 @@
+jquery-1.10.2.min.js

var/mongoose/html/lib/header.jim

@@ -18,9 +18,10 @@ puts {
 <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" />
-<link type="text/css" href="/lib/jquery.ui/css/custom-theme/jquery-ui.css"
+<link type="text/css" href="/lib/jquery.ui/css/humax/jquery-ui.css"
     rel="Stylesheet" />     
 <link href="/css/style.css" rel="Stylesheet" type="text/css" />
+<link href="/css/EXTRA.css" rel="Stylesheet" type="text/css" />
 <script type="text/javascript" src="/js/jquery.js"></script>
 <script type="text/javascript" src="/lib/jquery.ui/js/jquery-ui.js"></script>
 </head>

var/mongoose/html/lib/jquery.mobile/index.html

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+
+    <!-- Need to get a proper redirect hooked up. Blech. -->
+    <meta http-equiv="refresh" content="0;url=demos/">
+    <meta name="robots" content="noindex, follow">
+
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>jQuery Mobile</title>
+    <link rel="stylesheet"  href="css/themes/default/jquery.mobile-1.3.2.min.css">
+    <link rel="stylesheet" href="demos/_assets/css/jqm-demos.css">
+    <link rel="shortcut icon" href="demos/_assets/favicon.ico">
+    <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,400,700">
+    <script src="js/jquery.js"></script>
+    <script src="demos/_assets/js/index.js"></script>
+    <script src="js/jquery.mobile-1.3.2.min.js"></script>
+    <script>
+		$( document ).on( "pageshow", function(){
+			$( "p.message" ).hide().delay( 1500 ).show( "fast" );
+		});
+	</script>
+</head>
+<body>
+<div data-role="page" class="jqm-demos">
+
+	<div data-role="content" class="jqm-content">
+
+        <p class="message">Nothing to see here folks. <a href="demos/">View the demo center home page &rarr;</a></p>
+
+	</div><!-- /content -->
+
+</div><!-- /page -->
+</body>
+</html>

var/mongoose/html/lib/jquery.mobile/jquery.mobile.css

@@ -1 +1 @@
-jquery.mobile-1.2.0.min.css
+jquery.mobile-1.3.2.min.css

var/mongoose/html/lib/jquery.mobile/jquery.mobile.js

@@ -1 +1 @@
-jquery.mobile-1.2.0.min.js
+jquery.mobile-1.3.2.min.js

var/mongoose/html/lib/jquery.ui/css/custom-theme/jquery-ui-1.8.24.custom.css

@@ -1,563 +0,0 @@
-/*!
- * jQuery UI CSS Framework 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
-.ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-/*!
- * jQuery UI CSS Framework 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ctl=themeroller&ffDefault=Segoe%20UI,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=8px&bgColorHeader=ccff99&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=45&borderColorHeader=494437&fcHeader=000000&iconColorHeader=554e34&bgColorContent=ffffcc&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=8e846b&fcContent=383838&iconColorContent=d19405&bgColorDefault=fece2f&bgTextureDefault=12_gloss_wave.png&bgImgOpacityDefault=60&borderColorDefault=d19405&fcDefault=4c3000&iconColorDefault=3d3d3d&bgColorHover=ffdd57&bgTextureHover=12_gloss_wave.png&bgImgOpacityHover=70&borderColorHover=a45b13&fcHover=381f00&iconColorHover=bd7b00&bgColorActive=ffffff&bgTextureActive=05_inset_soft.png&bgImgOpacityActive=30&borderColorActive=655e4e&fcActive=0074c7&iconColorActive=eb990f&bgColorHighlight=fff9e5&bgTextureHighlight=12_gloss_wave.png&bgImgOpacityHighlight=90&borderColorHighlight=eeb420&fcHighlight=1f1f1f&iconColorHighlight=ed9f26&bgColorError=d34d17&bgTextureError=07_diagonals_medium.png&bgImgOpacityError=20&borderColorError=ffb73d&fcError=ffffff&iconColorError=ffe180&bgColorOverlay=5c5c5c&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=50&opacityOverlay=80&bgColorShadow=cccccc&bgTextureShadow=01_flat.png&bgImgOpacityShadow=30&opacityShadow=60&thicknessShadow=7px&offsetTopShadow=-7px&offsetLeftShadow=-7px&cornerRadiusShadow=8px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Segoe UI, Arial, sans-serif; font-size: 1.1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Segoe UI, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #8e846b; background: #ffffcc url(images/ui-bg_highlight-soft_100_ffffcc_1x100.png) 50% top repeat-x; color: #383838; }
-.ui-widget-content a { color: #383838; }
-.ui-widget-header { border: 1px solid #494437; background: #ccff99 url(images/ui-bg_gloss-wave_45_ccff99_500x100.png) 50% 50% repeat-x; color: #000000; font-weight: bold; }
-.ui-widget-header a { color: #000000; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d19405; background: #fece2f url(images/ui-bg_gloss-wave_60_fece2f_500x100.png) 50% 50% repeat-x; font-weight: bold; color: #4c3000; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #4c3000; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #a45b13; background: #ffdd57 url(images/ui-bg_gloss-wave_70_ffdd57_500x100.png) 50% 50% repeat-x; font-weight: bold; color: #381f00; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #381f00; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #655e4e; background: #ffffff url(images/ui-bg_inset-soft_30_ffffff_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #0074c7; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #0074c7; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #eeb420; background: #fff9e5 url(images/ui-bg_gloss-wave_90_fff9e5_500x100.png) 50% top repeat-x; color: #1f1f1f; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #1f1f1f; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #ffb73d; background: #d34d17 url(images/ui-bg_diagonals-medium_20_d34d17_40x40.png) 50% 50% repeat; color: #ffffff; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_d19405_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_d19405_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_554e34_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_3d3d3d_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_bd7b00_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_eb990f_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_ed9f26_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffe180_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-start { background-position: -80px -160px; }
-/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 8px; -webkit-border-top-left-radius: 8px; -khtml-border-top-left-radius: 8px; border-top-left-radius: 8px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 8px; -webkit-border-top-right-radius: 8px; -khtml-border-top-right-radius: 8px; border-top-right-radius: 8px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 8px; -webkit-border-bottom-left-radius: 8px; -khtml-border-bottom-left-radius: 8px; border-bottom-left-radius: 8px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 8px; -webkit-border-bottom-right-radius: 8px; -khtml-border-bottom-right-radius: 8px; border-bottom-right-radius: 8px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #5c5c5c url(images/ui-bg_flat_50_5c5c5c_40x100.png) 50% 50% repeat-x; opacity: .80;filter:Alpha(Opacity=80); }
-.ui-widget-shadow { margin: -7px 0 0 -7px; padding: 7px; background: #cccccc url(images/ui-bg_flat_30_cccccc_40x100.png) 50% 50% repeat-x; opacity: .60;filter:Alpha(Opacity=60); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*!
- * jQuery UI Resizable 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizable#theming
- */
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*!
- * jQuery UI Selectable 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectable#theming
- */
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-/*!
- * jQuery UI Accordion 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Accordion#theming
- */
-/* IE/Win - Fix animation bug - #4615 */
-.ui-accordion { width: 100%; }
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
-.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }
-/*!
- * jQuery UI Autocomplete 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete#theming
- */
-.ui-autocomplete { position: absolute; cursor: default; }	
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-
-/*
- * jQuery UI Menu 1.8.24
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menu#theming
- */
-.ui-menu {
-	list-style:none;
-	padding: 2px;
-	margin: 0;
-	display:block;
-	float: left;
-}
-.ui-menu .ui-menu {
-	margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
-	margin:0;
-	padding: 0;
-	zoom: 1;
-	float: left;
-	clear: left;
-	width: 100%;
-}
-.ui-menu .ui-menu-item a {
-	text-decoration:none;
-	display:block;
-	padding:.2em .4em;
-	line-height:1.5;
-	zoom:1;
-}
-.ui-menu .ui-menu-item a.ui-state-hover,
-.ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
-}
-/*!
- * jQuery UI Button 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button#theming
- */
-.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; } 
-button.ui-button-icons-only { width: 3.7em; } 
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4;  }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-/*!
- * jQuery UI Dialog 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog#theming
- */
-.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/*!
- * jQuery UI Slider 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider#theming
- */
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/*!
- * jQuery UI Tabs 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs#theming
- */
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
-/*!
- * jQuery UI Datepicker 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}/*!
- * jQuery UI Progressbar 1.8.24
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar#theming
- */
-.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }

var/mongoose/html/lib/jquery.ui/css/custom-theme/jquery-ui.css

@@ -1 +0,0 @@
-jquery-ui-1.8.24.custom.css

var/mongoose/html/lib/jquery.ui/css/humax/jquery-ui.css

@@ -0,0 +1 @@
+jquery-ui-1.10.3.custom.min.css

var/mongoose/html/lib/jquery.ui/js/jquery-ui.js

@@ -1 +1 @@
-jquery-ui-1.8.24.custom.min.js
+jquery-ui-1.10.3.custom.min.js

var/mongoose/html/m/lib/header.jim

@@ -16,8 +16,7 @@ puts "
 
 puts {
 <meta charset="utf-8">
-<meta name="viewport"
-    content="width=device-width,user-scalable=no,initial-scale=1"> 
+<meta name="viewport" content="user-scalable=no,initial-scale=1"> 
 <meta name=apple-mobile-web-app-capable content=yes>
 <meta name=apple-mobile-web-app-status-bar-style content=black>
 <link rel="stylesheet" href="/lib/jquery.mobile/jquery.mobile.css" />

var/mongoose/html/pkg/script.js

@@ -3,34 +3,41 @@ var opkg = '/cgi-bin/opkg.jim?cmd=';
 $(document).ready(function() {
 
 	var busy = false;
-	var reload = false;
+	var tswitch = false;
 
 	$('#opkgupdate')
 	    .button()
-	    .click(function() { reload = true; execopkg('update'); })
+	    .click(function() { tswitch = 2; execopkg('update'); })
 	    .fadeIn('slow');
 
 	$('#opkgupgradeall')
 	    .button()
-	    .click(function() { reload = true; execopkg('upgrade'); })
+	    .click(function() { tswitch = 2; execopkg('upgrade'); })
 	    .fadeIn('slow');
 
 	$('#pkgtabs').tabs({
-		select: function() {
+		create: function(event, ui) {
+			$(ui.panel).html("<img src=/img/loading.gif>" +
+			    "Loading data... Please wait...");
+			busy = true;
+			$('#pkgtabs').tabs('disable');
+		},
+		activate: function(event, ui) {
 			if (busy)
 			{
 				alert('Please wait until the current ' +
 				    'operation completes.');
 				return false;
 			}
+			$(ui.newPanel).html("<img src=/img/loading.gif>" +
+			    "Loading data... Please wait...");
 			busy = true;
-			$('#pkgtabs')
-			    .tabs('option', 'disabled', [0,1,2]);
+			$('#pkgtabs').tabs('disable');
 		},
 		load: function() {
 			busy = false;
 			setup_buttons();
-			$('#pkgtabs').tabs('option', 'disabled', []);
+			$('#pkgtabs').tabs('enable');
 		},
 		spinner: '<img border=0 src=/img/loading.gif> ' +
 		    '<em>Loading...</em>'
@@ -45,11 +52,22 @@ $(document).ready(function() {
 		buttons: { "Close":
 		    function() {$(this).dialog('close');}},
 		close: function(e,u) {
-			if (reload)
+			if (tswitch)
 			{
-				$('#refreshing').show('slow');
-				$('#pkgtabs').hide('fast');
-				window.location.reload(true);
+				var curtab = $('#pkgtabs')
+				    .tabs('option', 'active');
+				if (curtab != tswitch)
+					$('#pkgtabs').tabs('option',
+					    'active', tswitch);
+				else
+				{
+					$('.ui-tabs-panel')
+					    .html("<img src=/img/loading.gif>" +
+					    "Loading data... Please wait...");
+					$('#pkgtabs').tabs('load', tswitch);
+				}
+				tswitch = false;
+				$('button.va').enable();
 			}
 			else
 			{
@@ -64,18 +82,20 @@ $(document).ready(function() {
 
 	jQuery.ajaxSetup({progressInterval: 1});
 
-	function loaddata(data, isfinal)
+	function loaddata(data, status)
 	{
 		if (window.console)
 		{
-			console.log('loaddata called, final=' + isfinal);
+			console.log('loaddata called, status=' + status);
 			console.log('Data: ' + data);
 		}
-		if (isfinal)
+		if (status)
 		{
 			$('#dresults').text(data);
 			$('#dspinner').hide('slow');
 			$('#complete').show('slow');
+			if (status == 'success')
+				$('#dialogue').dialog('close');
 		}
 		else
 			$('#dresults').append(data);
@@ -101,8 +121,8 @@ $(document).ready(function() {
 			type: "GET",
 			url: opkg + arg,
 			progress: loaddata,
-			success: function(data) {
-				loaddata(data, true);
+			success: function(data, status) {
+				loaddata(data, status);
 			},
 			error: function(_, _, e) {
 				if (window.console)

var/mongoose/html/sched/cleanup.jim

@@ -0,0 +1,28 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+require rsv.class
+
+header
+
+set events [rsv list]
+set n [clock seconds]
+foreach event $events {
+
+	set s [$event get nsttime]
+	set d [$event get nduration]
+	set e $($s + $d)
+
+	if {$n - $e > 7200 && [$event get ersvtype] <= 3} {
+		$event clear_ulslot
+		$event set_delete
+		$event insert
+
+		system restartpending
+
+	}
+
+}
+
+footer
+

var/mongoose/html/sched/sched.jim

@@ -12,6 +12,7 @@ lmap i \
     {
 	set svcmap([lindex $i 1]) [lindex $i 3]
     }
+set svckeys [array names svcmap]
 
 require epg_popup
 
@@ -55,7 +56,7 @@ proc eventheader {{table TBL_RESERVATION} note} {
 }
 
 proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
-	global svcmap
+	global svcmap svckeys
 
 	set name [$event name]
 
@@ -108,9 +109,9 @@ proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
 			--- -- --- ---- --:--<br>
 			<span class=footnote>(Last: $ds)</span>"
 		puts "</td><td>--:--:--</td>"
+		incr ::ended
 	} else {
 		set elist [$event aul]
-
 		set ds "[clock format $s -format {%a %d %b %Y %H:%M}]"
 		puts "<td nowrap class=\"va"
 		if {$n > $e} { puts " blood" }
@@ -118,7 +119,7 @@ proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
 
 		if {[llength $elist] > 0} {
 			lassign [lindex $elist 0] service_id start end event_id
-			if {$start == $s} {
+			if {$start == $s && $service_id in $svckeys} {
 				puts "<a class=event href=#
 				    xs=$svcmap($service_id) xe=$event_id>
 				    $ds</a>"
@@ -142,10 +143,16 @@ proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
 			foreach e $elist {
 				lassign $e service_id start end event_id
 				if {$start == $s} continue
-				puts "<a class=event href=#
+				if {$service_id in $svckeys} {
+				  puts "<a class=event href=#
 				    xs=$svcmap($service_id) xe=$event_id>
 				    [clock format $start \
 				    -format {%a %d %b %Y %H:%M}]</a><br>"
+				} else {
+				  puts "[clock format $start \
+				    -format {%a %d %b %Y %H:%M}]
+				    ($service_id)<br>"
+				}
 			}
 			puts "</div>";
 		}
@@ -192,6 +199,7 @@ proc ekey {event} {
 
 set pmap {}
 set events [rsv list pending]
+set ended 0
 if {[llength $events] > 0} {
 	eventheader pending "Pending Scheduled Events"
 	foreach event $events {
@@ -209,6 +217,7 @@ if {[llength $events] > 0} {
 }
 
 set events [rsv list]
+set ended 0
 eventheader "live" "Scheduled Events"
 foreach event $events {
 	if {[ekey $event] in $pmap} {
@@ -225,6 +234,13 @@ puts {
 	<button onclick="window.location='/backup.shtml';">
 		Backup/Restore Scheduled Recordings/Events
 	</button>
+}
+
+if {$ended} {
+	puts { <button id=schedule_cleanup>Cleanup old recordings</button> }
+}
+
+puts {
 	<button onclick="window.location='/cgi-bin/db.jim?db=rsv.db&tab=TBL_RESERVATION';">
 		Raw database view
 	</button>

var/mongoose/html/sched/script.js

@@ -205,5 +205,12 @@ $('table.schedule tbody tr').hover(
 $('a.smenu')
 	.contextMenu({menu: 'optmenu', leftButton: true, beforeShow: preparemenu}, menuclick);
 
+$('#schedule_cleanup').bind('click', function(e) {
+	if (confirm('Are you sure you want to remove all finished recordings?'))
+		$.get('cleanup.jim',
+		    function() { window.location.reload(true);
+		});
+});
+
 });
 

var/mongoose/include/epg.jim

@@ -31,10 +31,14 @@ if {$::qepg} {
 }
 set got [clock milliseconds]
 
-jqplugin confirmAction
+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 {
-	<script type=text/javascript src=/js/chanchange.js></script>
 	<small><button id=switch>Switch to grid-style Now/Next</button></small>
 	<script type=text/javascript>
 		$('#switch').button().click(function() {

var/mongoose/include/menuicons.jim

@@ -71,10 +71,25 @@ menuitem "Diagnostics" "/img/diagnostics.png" \
 
 eval_plugins menu
 
+if {[$settings notwitfeed] == 0} {
+
+puts {
+<script type="text/javascript" async=true
+    src='http://twitcker.com/ticker/HummyPkg.js?open=true&container=own-container&own-container=twitfeed&speed=3&count=5&background=cccccc'>
+</script>
+
+<div id=twitfeed
+    style="clear: both; padding-top: 3em; width: 100%">
+</div>
+}
+
+}
+
+
 if {[$settings nohelplinks] == 0} {
 
 menuitem "-reset" "" ""
-puts {</div><div style="clear: both; padding-top: 3em">}
+puts {</div><div style="clear: both; padding-top: 2em">}
 
 menuitem "hummy.tv<br>Forums" "/img/forum.png" \
 	"http://hummy.tv/ target=_blank" 0 100 \

var/mongoose/lib/altrow

@@ -1,6 +1,10 @@
 
 if {![exists -proc altrow]} {
 	proc altrow {{attrs ""}} {{i 0}} {
+		if {$attrs eq "reset"} {
+			set i 0
+			return
+		}
 		puts -nonewline "<tr"
 		if {[string first "class=" $attrs] == -1} {
 			case $i {

var/mongoose/lib/bin/auto

@@ -18,7 +18,13 @@ if {[file exists $logfile] && [file size $logfile] > 2097152} {
 	file delete $logfile
 }
 
-set logfd [open "/mod/tmp/auto.log" "a+"]
+if {[lindex $argv 0] eq "-d"} {
+	set argv [lrange $argv 1 end]
+	set loglevel 2
+	set logfd stdout
+} else {
+	set logfd [open "/mod/tmp/auto.log" "a+"]
+}
 proc log {msg {level 1}} {
 	if {$level > $::loglevel} return
 	puts $::logfd "[\
@@ -290,7 +296,7 @@ proc do_decrypt {ts} {
 	dsc $size
 	runplugin predecrypt $ts
 	set flagfile "$tmp/decrypting.$bfile"
-	exec /mod/bin/busybox/touch $flagfile
+	file touch $flagfile
 	startclock
 	log "  DECRYPT: $rfile" 0
 	log "  DLNA: $url" 0
@@ -331,6 +337,8 @@ proc do_decrypt {ts} {
 	file rename $file "$rfile.encrypted"
 	# Move the decrypted copy into place.
 	file rename "$tmp/$bfile" $file
+	# Set the file time to match the old file
+	file touch $file "$rfile.encrypted"
 	# Patch the HMT - quickest way to get back to a playable file.
 	exec /mod/bin/hmt -encrypted "$rfile.hmt"
 
@@ -500,7 +508,7 @@ proc expire {dir} {
 	entries $dir do_expire
 }
 
-proc scan {dir attr {force 0}} {{indent 0}} {
+proc scan {dir attr {force 0} {recurse 1}} {{indent 0}} {
 	global dustbin
 
 	incr indent 2
@@ -509,6 +517,7 @@ proc scan {dir attr {force 0}} {{indent 0}} {
 
 	if {$dir eq $dustbin} {
 		log "Dustbin, skipping." 2
+		incr indent -2
 		return
 	}
 
@@ -517,6 +526,7 @@ proc scan {dir attr {force 0}} {{indent 0}} {
 		file stat "$dir/" st
 		if {$st(dev) != $::rootdev} {
 			log "Special folder on different device, skipping." 2
+			incr indent -2
 			return
 		}
 		if {$force} {
@@ -536,7 +546,7 @@ proc scan {dir attr {force 0}} {{indent 0}} {
 	if {$force || [file exists "$dir/.auto$attr"]} { $attr $dir }
 
 	foreach entry [readdir -nocomplain $dir] {
-		if {[file isdirectory "$dir/$entry"]} {
+		if {$recurse && [file isdirectory "$dir/$entry"]} {
 			scan "$dir/$entry" $attr $force
 		}
 	}
@@ -546,12 +556,50 @@ proc scan {dir attr {force 0}} {{indent 0}} {
 	incr indent -2
 }
 
+proc scanup {dir flag} {
+	global root
+
+	set rl [string length $root]
+	while {[string length $dir] >= $rl} {
+		if {[string match {\[*} [file tail $dir]]} {
+			return -1
+		}
+		if {[file exists "$dir/.auto${flag}r"]} {
+			log "scanup:   Found ${flag}r ($dir)" 2
+			return 1
+		}
+		set dir [file dirname $dir]
+	}
+
+	return 0
+}
+
+proc scansingle {dirs} {
+	global modules root
+
+	foreach dir $dirs {
+		log "Scanning single directory '$dir'"
+		foreach arg $modules {
+			set st [clock milliseconds]
+			set sup [scanup $dir $arg]
+			if {$sup == -1} {
+				log "Encountered special directory."
+				break
+			}
+			scan $dir $arg $sup 0
+			log "$arg scan completed in [elapsed $st] seconds."
+		}
+	}
+}
+
 set root [system mediaroot]
 file stat "$root/" rootstat
 set rootdev $rootstat(dev)
 log "Root device: $rootdev" 2
 
-if {[llength $argv] > 0} {
+if {[lindex $argv 0] eq "-single"} {
+	scansingle [lrange $argv 1 end]
+} elseif {[llength $argv] > 0} {
 	set loglevel 2
 	foreach arg $argv { scan $root $arg }
 } else {

var/mongoose/lib/bin/resetnew

@@ -0,0 +1,25 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+require system.class ts.class
+
+proc scan {dir} {
+	puts "Resetting unwatched count on $dir..."
+	file stat "$dir/" st
+	if {$st(dev) != $::rootdev} { return }
+
+	ts resetnew $dir
+
+	foreach entry [readdir -nocomplain $dir] {
+		if {[file isdirectory "$dir/$entry"]} {
+			scan "$dir/$entry"
+		}
+	}
+}
+
+set root [system mediaroot]
+file stat "$root/" rootstat
+set rootdev $rootstat(dev)
+
+scan $root
+

var/mongoose/lib/epg.class

@@ -218,7 +218,7 @@ epg method icon_set {{height 0}} {
 	set icon [$self type_icon]
 	set set ""
 	if {$icon != ""} {
-		lappend set "<img src=$icon $height
+		lappend set "<img class=genre src=$icon $height
 		    alt=\"$content_type\" title=\"$content_type\">"
 	}
 

var/mongoose/lib/fileops

@@ -39,10 +39,27 @@ proc {file rename} {{force {}} source target} {
 	}
 }
 
+proc {file touch} {target {ref ""}} {
+	try {
+		if {$ref ne ""} {
+			if {![file exists $ref]} {
+				error "ref file does not exist."
+			}
+			exec /mod/bin/busybox/touch -r $ref $target
+		} else {
+			exec /mod/bin/busybox/touch $target
+		}
+	} on error {msg opts} {
+		incr opts(-level)
+		return {*}$opts $msg
+	}
+}
+
 local proc file {cmd args} {
 	switch $cmd {
 	    "rename" { tailcall {file rename} {*}$args }
 	    "copy" { tailcall {file copy} {*}$args }
+	    "touch" { tailcall {file touch} {*}$args }
 	    default { tailcall upcall file $cmd {*}$args }
 	}
 }

var/mongoose/lib/findhsvc

@@ -1,6 +1,6 @@
 
 if {![exists -proc get_channel_attr]} {
-	require rsv.class
+	if {![exists -proc rsv]} { require rsv.class }
 
 	proc get_channel_attr {channel {field hSvc}} {
 		global rsvdb