1.2.9-2

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

CONTROL/control

@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.9-0
+Version: 1.2.9-2
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
 Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76-2),jim-oo,jim-sqlite3(>=0.76),jim-cgi(>=0.7-1),jim-binary(>=0.76),service-control(>=2.1),busybox(>=1.20.2-1),lsof(>=4.87),epg(>=1.2.1-1),hmt(>=2.0.9),ssmtp,cron-daemon(>=1.18.3-3),at(>=3.1.18),anacron,trm(>=1.1),openssl-command,nicesplice,id3v2,file,rsvsync(>=1.0.2),webif-charts(>=1.2-1),stripts(>=1.2.5-3),tmenu(>=1.08),ffmpeg,id3v2,multienv(>=1.6),tcpping(>=1.1),e2fsprogs,wireless-tools(>=29-1),dbupdate,recmon(>=2.0.7)

webif/html/sched/backup/view.jim

@@ -29,7 +29,7 @@ if {[catch { set fd [open $ffile r] } msg]} {
 
 puts "Listing scheduled events from <i>$file</i>..."
 
-set fields [lsort [[rsv] vars]]
+set fields [[rsv] cleanvars]
 
 set data [split [read $fd] "\n"]
 
@@ -52,8 +52,9 @@ foreach line $data {
 
 	set rsv [rsv new $vars]
 
-	puts "  [$rsv name] ([$rsv channel_name] [\
-	    clock format [$rsv start]] - [clock format [$rsv end]])"
+	puts "  [$rsv name] ([$rsv channel_name] - [\
+	    clock format [$rsv start]] - [\
+	    clock format [$rsv end] -format {%H:%M}]"
 }
 
 close $fd

webif/html/sched/script.js

@@ -4,7 +4,7 @@ var spinner = '<div class=spinner><img border=0 src=/img/loading.gif>' +
 
 var LIST_INDEX = 0;
 var VISUAL_INDEX = 1;
-var BACKUP_INDEX = 3;
+var BACKUP_INDEX = 2;
 
 var list_reload_required = true;
 var visual_reload_required = true;

webif/html/xepg/index.jim

@@ -5,7 +5,7 @@ source /mod/webif/lib/setup
 require settings.class
 
 jqplugin enadis qtip
-jscss script.js style.css
+jscss {} style.css
 header
 
 require epg.class spinner.class altrow epg_search totop system.class
@@ -90,9 +90,9 @@ set got [clock milliseconds]
 proc but {label time {active 1}} {
 	puts -nonewline "<button style=\"margin-right: 2em\" tt=$time"
 	if {$active} {
-		puts -nonewline " class=\"nav delayshow\""
+		puts -nonewline " class=\"nav\""
 	} else {
-		puts -nonewline " disabled class=\"nav delayshow ui-state-disabled\""
+		puts -nonewline " disabled class=\"nav ui-state-disabled\""
 	}
 	puts " active=$active>$label</button>"
 }
@@ -170,7 +170,7 @@ for {set i 0} {$i < 8} {incr i} {
 }
 
 puts "</div>"
-puts "<span class=\"footnote delayshow\">&nbsp;
+puts "<span class=\"footnote\">&nbsp;
     (Right-Click to select end hour)</span>"
 puts "</div>"
 
@@ -197,6 +197,13 @@ puts "</div>"
 ######################################################################
 # Events
  
+puts "
+<script type=text/javascript>
+var hours = $hours;
+var stt = [expr $stt + 0];
+</script>
+"
+jscss script.js
 puts "
 <div id=xepgnow></div>
 <div id=xepg style=\"min-width: ${contwidth}px;\">
@@ -295,10 +302,6 @@ puts "
 	Switch to standard now/next display.
 </button></small>
 </div>
-<script type=text/javascript>
-var hours = $hours;
-var stt = [expr $stt + 0];
-</script>
 "
 
 if {$current} {

webif/html/xepg/script.js

@@ -1,24 +1,3 @@
-$(function() {
-
-$('#epgswitch').button().click(function() {
-	window.location = '/epg/list.jim';
-});
-
-$('button.nav').button().click(function() {
-	window.location = '/xepg/?stt=' + $(this).attr('tt') +
-	    '&pos=' + $('#xegrid').scrollTop();
-});
-
-$('div.xeprog').qtip({
-	position: {
-		my: 'bottom center',
-		at: 'top center',
-		viewport: $(window)
-	},
-	style: {
-		classes: 'qtip-rounded qtip-shadow'
-	}
-});
 
 $('.timejump').hover(
     function() {
@@ -72,7 +51,28 @@ $('.dayjump').hover(
 	    '&pos=' + $('#xegrid').scrollTop();
 });
 
-$('.delayshow').show();
+$('button.nav').button().click(function() {
+	window.location = '/xepg/?stt=' + $(this).attr('tt') +
+	    '&pos=' + $('#xegrid').scrollTop();
+});
+
+$(function() {
+
+$('#epgswitch').button().click(function() {
+	window.location = '/epg/list.jim';
+});
+
+$('div.xeprog').qtip({
+	position: {
+		my: 'bottom center',
+		at: 'top center',
+		viewport: $(window)
+	},
+	style: {
+		classes: 'qtip-rounded qtip-shadow'
+	}
+});
+
 
 });
 

webif/lib/rsv.class

@@ -290,6 +290,13 @@ proc {rsv find_hsvc} {lcn channel} {
 	return $_hsvc
 }
 
+rsv method cleanvars {} {
+	return [lsort [lmap i [$self vars] {
+		if {[string index $i 0] eq "_"} continue
+		concat "" $i
+	    }]]
+}
+
 rsv method insert {{table pending} {force 0}} {
 	global rsvdb
 
@@ -328,10 +335,7 @@ rsv method insert {{table pending} {force 0}} {
 		if {$ulslot < 0} { set ulslot 0 }
 	}
 
-	set fields [lsort [lmap i [$self vars] {
-		if {[string index $i 0] eq "_"} continue
-		concat "" $i
-	    }]]
+	set fields [$self cleanvars]
 
 	foreach field {szSvcName usLcn sort} {
 		set df [lsearch $fields $field]
@@ -652,7 +656,7 @@ proc {rsv backup} {file} {
 
 	set events [rsv list]
 
-	set fields [lsort [[rsv] vars]]
+	set fields [[rsv] cleanvars]
 
 	puts $fd "# version 2"
 
@@ -726,7 +730,7 @@ proc {rsv restore} {file} {
 	$rsvdb query {begin transaction;}
 	$rsvdb query {delete from TBL_RESERVATION;}
 
-	set fields [lsort [[rsv] vars]]
+	set fields [[rsv] cleanvars]
 
 	set data [split [read $fd] "\n"]