From 58da098a11700997db1e9597bb109e8a44b1a412 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Tue, 26 Apr 2016 19:54:56 +0000
Subject: [PATCH] 1.2.9 beta

git-svn-id: file:///root/webif/svn/pkg/webif/trunk@2871 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                               |   4 +-
 CONTROL/postinst                              |   2 +-
 webif/cgi-bin/epg/info.jim                    |  16 +-
 webif/cgi-bin/epg/schedule.jim                |   2 +-
 webif/cgi-bin/xepg.js                         |  38 --
 webif/html/backup/backup.js                   |  69 ---
 webif/html/css/style.css                      |  97 +++-
 webif/html/epg/list.jim                       |   2 +-
 webif/html/epg/service.jim                    |   2 +-
 webif/html/go                                 |   2 +-
 webif/html/img/uiTabsArrow.png                | Bin 0 -> 112 bytes
 webif/html/js/epg_popup.js                    |  14 +-
 webif/html/js/icons.js                        |  32 ++
 webif/html/lib/footer.jim                     |   7 +-
 .../lib/jquery.plugin/growl/jquery.growl.css  |  85 ++++
 .../lib/jquery.plugin/growl/jquery.growl.js   | 244 +++++++++
 .../jquery.plugin/qtip/jquery.qtip.min.css    |   3 +
 .../lib/jquery.plugin/qtip/jquery.qtip.min.js |   5 +
 webif/html/lib/noheader.jim                   |  21 +
 webif/html/{ => sched}/backup/backup.jim      |   2 +-
 webif/html/{ => sched}/backup/delete.jim      |   0
 webif/html/{ => sched}/backup/files.jim       |   0
 webif/html/{ => sched}/backup/index.jim       |   9 +-
 webif/html/{ => sched}/backup/restore.jim     |   0
 webif/html/sched/backup/script.js             |  72 +++
 webif/html/{ => sched}/backup/view.jim        |   3 +-
 webif/html/sched/index.jim                    | 288 +----------
 webif/html/sched/{ => list}/assets.jim        |   5 +-
 webif/html/sched/list/index.jim               | 353 +++++++++++++
 webif/html/sched/list/script.js               | 439 ++++++++++++++++
 webif/html/sched/{ => rpc}/ar.jim             |   0
 webif/html/sched/{ => rpc}/cancel.jim         |   0
 webif/html/sched/{ => rpc}/cleanup.jim        |   2 -
 webif/html/sched/{ => rpc}/folder.jim         |   0
 webif/html/sched/{ => rpc}/info.jim           |   0
 webif/html/sched/{ => rpc}/manual.jim         |   0
 webif/html/sched/{ => rpc}/mkdir.jim          |   0
 webif/html/sched/{ => rpc}/pad.jim            |   0
 webif/html/sched/rpc/refresh.jim              |  23 +
 webif/html/sched/rpc/skip.jim                 |  45 ++
 webif/html/sched/script.js                    | 475 +++---------------
 webif/html/sched/visual/assets.jim            |  10 +
 webif/html/sched/visual/index.jim             | 456 +++++++++++++++++
 webif/html/sched/visual/script.js             | 414 +++++++++++++++
 webif/html/sched/visual/style.css             | 115 +++++
 .../{cgi-bin/xepg.jim => html/xepg/index.jim} | 138 +++--
 webif/html/xepg/script.js                     |  78 +++
 webif/html/{css/xepg.css => xepg/style.css}   |  80 +++
 webif/lib/bin/auto                            |   2 +-
 webif/lib/epg_popup                           |   2 +-
 webif/lib/rsv.class                           | 252 ++++++++--
 webif/lib/setup                               |   5 +-
 webif/lib/utils                               |   4 +
 53 files changed, 3030 insertions(+), 887 deletions(-)
 delete mode 100644 webif/cgi-bin/xepg.js
 delete mode 100755 webif/html/backup/backup.js
 create mode 100644 webif/html/img/uiTabsArrow.png
 create mode 100644 webif/html/js/icons.js
 create mode 100644 webif/html/lib/jquery.plugin/growl/jquery.growl.css
 create mode 100644 webif/html/lib/jquery.plugin/growl/jquery.growl.js
 create mode 100644 webif/html/lib/jquery.plugin/qtip/jquery.qtip.min.css
 create mode 100644 webif/html/lib/jquery.plugin/qtip/jquery.qtip.min.js
 create mode 100755 webif/html/lib/noheader.jim
 rename webif/html/{ => sched}/backup/backup.jim (92%)
 rename webif/html/{ => sched}/backup/delete.jim (100%)
 rename webif/html/{ => sched}/backup/files.jim (100%)
 rename webif/html/{ => sched}/backup/index.jim (94%)
 rename webif/html/{ => sched}/backup/restore.jim (100%)
 create mode 100755 webif/html/sched/backup/script.js
 rename webif/html/{ => sched}/backup/view.jim (90%)
 rename webif/html/sched/{ => list}/assets.jim (95%)
 create mode 100755 webif/html/sched/list/index.jim
 create mode 100755 webif/html/sched/list/script.js
 rename webif/html/sched/{ => rpc}/ar.jim (100%)
 rename webif/html/sched/{ => rpc}/cancel.jim (100%)
 rename webif/html/sched/{ => rpc}/cleanup.jim (99%)
 rename webif/html/sched/{ => rpc}/folder.jim (100%)
 rename webif/html/sched/{ => rpc}/info.jim (100%)
 rename webif/html/sched/{ => rpc}/manual.jim (100%)
 rename webif/html/sched/{ => rpc}/mkdir.jim (100%)
 rename webif/html/sched/{ => rpc}/pad.jim (100%)
 create mode 100755 webif/html/sched/rpc/refresh.jim
 create mode 100755 webif/html/sched/rpc/skip.jim
 create mode 100755 webif/html/sched/visual/assets.jim
 create mode 100755 webif/html/sched/visual/index.jim
 create mode 100644 webif/html/sched/visual/script.js
 create mode 100644 webif/html/sched/visual/style.css
 rename webif/{cgi-bin/xepg.jim => html/xepg/index.jim} (63%)
 create mode 100644 webif/html/xepg/script.js
 rename webif/html/{css/xepg.css => xepg/style.css} (60%)

diff --git a/CONTROL/control b/CONTROL/control
index df5717c..4bb80ad 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,10 +1,10 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 1.2.8-16
+Version: 1.2.9-0
 Architecture: mipsel
 Maintainer: af123@hpkg.tv
-Depends: tcpfix,webif-channelicons(>=1.1.20),lighttpd(>=1.4.39-1),jim(>=0.76-1),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)
+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)
 Suggests:
 Description: An evolving web interface for the Humax.
 Tags: http://hummy.tv/forum/threads/6484/
diff --git a/CONTROL/postinst b/CONTROL/postinst
index e89aee5..815198f 100755
--- a/CONTROL/postinst
+++ b/CONTROL/postinst
@@ -29,7 +29,7 @@ fi
 ana=$PKG_ROOT/etc/anacrontab
 egrep -v 'backup/backup.jim|bin/diskattrs' $ana > $tmpf
 cat $tmpf - << EOM > $ana
-1 8 sched_backup /mod/webif/html/backup/backup.jim
+1 8 sched_backup /mod/webif/html/sched/backup/backup.jim
 1 5 diskattrs /mod/webif/lib/bin/diskattrs
 EOM
 
diff --git a/webif/cgi-bin/epg/info.jim b/webif/cgi-bin/epg/info.jim
index e40804e..e74d769 100755
--- a/webif/cgi-bin/epg/info.jim
+++ b/webif/cgi-bin/epg/info.jim
@@ -25,14 +25,20 @@ if {[[settings] chanchangenc]} {
 
 $record process_sched
 if {[$record get sched_type] < 1} {
-	set tuners [system tuners]
-	set conflicts [rsv conflicts [$record get start] [$record get duration]]
-        if {$conflicts >= $tuners} {
+	set conflicts [rsv checkconflict \
+	    [$record get start] [$record get duration] \
+	    [system tuners]]
+	if {[llength $conflicts]} {
 		puts {
 <div class=warningbox style="width: 100%; margin: 0.2em"><div>
-This event conflicts with items in your scheduled recording list.
-</div></div>
+This event conflicts with the following items in your scheduled recording list.
+<ul>
 		}
+		foreach x $conflicts {
+			puts "<li>$x</li>\n"
+		}
+
+		puts "</div></div>"
 	}
 }
 
diff --git a/webif/cgi-bin/epg/schedule.jim b/webif/cgi-bin/epg/schedule.jim
index d40c313..7343f05 100755
--- a/webif/cgi-bin/epg/schedule.jim
+++ b/webif/cgi-bin/epg/schedule.jim
@@ -27,7 +27,7 @@ if {[$event percent] > 0} {
 }
 
 set r [rsv construct $event $type]
-if {[catch {$r insert} msg]} {
+if {[catch {$r insert pending 1} msg]} {
 	puts "Error encountered while scheduling: <i>$msg</i>"
 } else {
 	puts "Successfully scheduled <i>[$event get name]</i>"
diff --git a/webif/cgi-bin/xepg.js b/webif/cgi-bin/xepg.js
deleted file mode 100644
index 65b3854..0000000
--- a/webif/cgi-bin/xepg.js
+++ /dev/null
@@ -1,38 +0,0 @@
-$(function() {
-
-$('#epgswitch').button().click(function() {
-	window.location = '/epg/list.jim';
-});
-
-$('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'); }
-);
-
-});
-
diff --git a/webif/html/backup/backup.js b/webif/html/backup/backup.js
deleted file mode 100755
index 418e580..0000000
--- a/webif/html/backup/backup.js
+++ /dev/null
@@ -1,69 +0,0 @@
-
-function refresh_files()
-{
-	$('#backup_files').load('files.jim', function() {
-		$('input.restore').change(function() {
-			$('#restore_button').removeAttr('disabled')
-			    .button('option', 'disabled', false);
-			$('#delete_button').removeAttr('disabled')
-			    .button('option', 'disabled', false);
-			$('#view_button').removeAttr('disabled')
-			    .button('option', 'disabled', false);
-		});
-	});
-}
-
-$(document).ready(function() {
-	$('button').button();
-
-	refresh_files();
-
-	$('#backup_button').click(function() {
-		$('#backup_working').slideDown();
-		$('#results').load('backup.jim?' +
-		    $('#backup_name').serialize(), function() {
-			$('#results').slideDown(function() {
-				$('#backup_working').slideUp();
-				refresh_files();
-			});
-		});
-	});
-	$('#delete_button').click(function() {
-		var backup = $('input.restore:checked').val();
-		if (confirm('Confirm deletion of ' + backup))
-		{
-			$('#results').load('delete.jim?' +
-			    $('input.restore').serialize(), function() {
-				$('#results').slideDown(function() {
-					refresh_files();
-				});
-			});
-		}
-	});
-	$('#view_button').click(function() {
-		var backup = $('input.restore:checked').val();
-		$('#results').load('view.jim?' +
-		    $('input.restore').serialize(), function() {
-			$('#results').slideDown(function() {
-				refresh_files();
-			});
-		});
-	});
-	$('#restore_button').click(function() {
-		var backup = $('input.restore:checked').val();
-		if (confirm('!!!!!!!!!!!!!!!!!!!!!!!!! PLEASE CONFIRM !!!!!!!!!!!!!!!!!!!!!!!!!\n\nAre you sure you wish to erase all scheduled recordings and favourite channels and then restore them from\n' + backup + '?'))
-		{
-			$('#restore_working').slideDown();
-			$('#results').load('restore.jim?' +
-			    $('input.restore').serialize(), function() {
-				$('#results').slideDown(function() {
-					$('#restore_working').slideUp();
-					refresh_files();
-					$('#restore_warning').slideDown();
-					$('#restart_block').slideDown('slow');
-				});
-			});
-		}
-	});
-});
-
diff --git a/webif/html/css/style.css b/webif/html/css/style.css
index 259cddf..c4da7aa 100644
--- a/webif/html/css/style.css
+++ b/webif/html/css/style.css
@@ -109,7 +109,7 @@ div.warningbox
 	top: -2px;
 	left: -2px;
 	font-weight: bold;
-	z-index: 30;
+	#z-index: 30;
 	box-shadow: 2px 2px 11px #666;
 	-moz-box-shadow: 2px 2px 11px #666;
 	-webkit-box-shadow: 2px 2px 11px #666;
@@ -174,22 +174,22 @@ table.keyval td
 
 pre, .pre, .prelike
 {
-        font-family: Consolas, 'Courier New', Courier, monospace;
-        color: black;
-        background: #f9d9b0 url('/img/prebg.png') repeat-x top;
+	font-family: Consolas, 'Courier New', Courier, monospace;
+	color: black;
+	background: #f9d9b0 url('/img/prebg.png') repeat-x top;
 	line-height: 1.24;
-        padding: 3px 8px;
-        margin: 0 5em 1em 5em;
-        border-color: #f9d9b0;
-        border-bottom: 1px solid #f9bc6d;
-        border-top-left-radius: 4px;
-        -webkit-border-top-left-radius: 4px;
-        -moz-border-radius-topleft: 4px;
-        -khtml-border-top-left-radius: 4px;
-        border-top-right-radius: 4px;
-        -webkit-border-top-right-radius: 4px;
-        -moz-border-radius-topright: 4px;
-        -khtml-border-top-right-radius: 4px;
+	padding: 3px 8px;
+	margin: 0 5em 1em 5em;
+	border-color: #f9d9b0;
+	border-bottom: 1px solid #f9bc6d;
+	border-top-left-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	-khtml-border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	-webkit-border-top-right-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	-khtml-border-top-right-radius: 4px;
 }
 
 pre, .pre
@@ -291,7 +291,7 @@ tr.blueshade > td, .blueshade
 
 .pinkshade
 {
-	background: #ffccff;
+	background: #ffccff !important;
 	color: black;
 }
 
@@ -312,12 +312,18 @@ tr.blueshade > td, .blueshade
 	color: black;
 }
 
-.orangeshade
+tr.orangeshade > td, .orangeshade
 {
-	background: #ffeeaa;
+	background: #ff8040 !important;
 	color: black;
 }
 
+tr.purpleshade > td, .purpleshade
+{
+	background: #7e587e !important;
+	color: white;
+}
+
 .redshade
 {
 	background: #ff4000;
@@ -594,3 +600,56 @@ img.rollimg
 	clear: right;
 }
 
+/* Minimal tabs */
+
+#minimaltabbar
+{
+	background: transparent;
+	border: none;
+	padding: 0 0 0 0;
+	position: relative;
+	top: -40px;
+}
+
+#minimaltabbar .ui-widget-header
+{
+	background: transparent;
+	border: none;
+	border-bottom: 1px solid #c0c0c0;
+	-moz-border-radius: 0px;
+	-webkit-border-radius: 0px;
+	border-radius: 0px;
+}
+
+#minimaltabbar .ui-tabs-nav
+{
+	margin-bottom: 15px;
+}
+
+#minimaltabbar .ui-tabs-nav .ui-state-default
+{
+	background: transparent;
+	border: none;
+}
+
+#minimaltabbar .ui-tabs-nav .ui-state-active
+{
+	background: transparent url(/img/uiTabsArrow.png) no-repeat bottom center;
+	border: none;
+}
+
+#minimaltabbar .ui-tabs-nav .ui-state-default a
+{
+	color: #c0c0c0;
+}
+
+#minimaltabbar .ui-tabs-nav .ui-state-active a
+{
+	color: #000000;
+}
+
+#minimaltabbar .ui-tabs-panel
+{
+	padding: 0 0 0 0;
+}
+
diff --git a/webif/html/epg/list.jim b/webif/html/epg/list.jim
index 14e4d9e..467e5c6 100755
--- a/webif/html/epg/list.jim
+++ b/webif/html/epg/list.jim
@@ -53,7 +53,7 @@ puts {
 	<small><button id=switch>Switch to grid-style Now/Next</button></small>
 	<script type=text/javascript>
 		$('#switch').button().click(function() {
-			window.location = '/cgi-bin/xepg.jim'; });
+			window.location = '/xepg/'; });
 	</script>
 	<table class=borders>
 	<tr>
diff --git a/webif/html/epg/service.jim b/webif/html/epg/service.jim
index dd2ec82..4a25a60 100755
--- a/webif/html/epg/service.jim
+++ b/webif/html/epg/service.jim
@@ -21,7 +21,7 @@ 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')" \
+    -sort "strftime('%%H%%J', start, 'unixepoch', 'localtime'), strftime('%%M', start, 'unixepoch')" \
     -debug 0
 ]
 
diff --git a/webif/html/go b/webif/html/go
index 870ab69..f9a8603 100755
--- a/webif/html/go
+++ b/webif/html/go
@@ -12,7 +12,7 @@ if {[dict exists $env HTTP_COOKIE]} {
 set settings [settings]
 
 if {[$settings epg_style] eq "grid"} {
-        set epglink "/cgi-bin/xepg.jim"
+        set epglink "/xepg/"
 } else {
         set epglink "/epg/list.jim"
 }
diff --git a/webif/html/img/uiTabsArrow.png b/webif/html/img/uiTabsArrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6791d612cb7a372d5f728bd3b794b85611239e2
GIT binary patch
literal 112
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`=AJH&Ar-fh6C_v{H!xTfJUCD<
zpcZY+Ga-j#Q`#ingUe=SIDg1g%iu7aRVd}umB!<I;$lw@2Sc`)u!4|6!f~Jx44$rj
JF6*2UngA$mABO+{

literal 0
HcmV?d00001

diff --git a/webif/html/js/epg_popup.js b/webif/html/js/epg_popup.js
index 93082b0..8431a45 100644
--- a/webif/html/js/epg_popup.js
+++ b/webif/html/js/epg_popup.js
@@ -3,9 +3,9 @@ $(function() {
 	{
 		$('#epginfo_extra').load('/cgi-bin/epg/schedule.jim?' +
 		    'service=' +
-		    encodeURIComponent($('#dialogue').attr('xs')) +
+		    encodeURIComponent($('#epgpopup_dialogue').attr('xs')) +
 		    '&event=' +
-		    encodeURIComponent($('#dialogue').attr('xe')) +
+		    encodeURIComponent($('#epgpopup_dialogue').attr('xe')) +
 		    '&type=' + type, function() {
 			$('#restart_block').slideDown('slow');
 		});
@@ -24,14 +24,14 @@ $(function() {
 	    {"Record Series": function() { doschedule(2) }},
 	    $buttons2);
 
-	var $dialog = $('#dialogue').dialog({
+	var $dialog = $('#epgpopup_dialogue').dialog({
 		title: "Programme Details",
 		modal: false, autoOpen: false,
 		height: 500, width: 700,
 		show: 'scale', hide: 'fade',
 		draggable: true, resizable: true,
 		buttons: $buttons1,
-		close: function(e,u) { $('#dialogue').empty().html(
+		close: function(e,u) { $('#epgpopup_dialogue').empty().html(
 		    '<img src="/img/loading.gif" alt="loading">'); }
 	});
 
@@ -51,15 +51,15 @@ $(function() {
 		var url = '/cgi-bin/epg/info.jim?service=' +
 		    o.attr('xs') + '&event=' +
 		    o.attr('xe') + '&bare=1';
-		$('#dialogue')
+		$('#epgpopup_dialogue')
 		    .html('<img src=/img/loading.gif> Loading details...' +
 			' Please wait...')
 		    .load(url, function() {
-			$('#dialogue a.event').click(function(e) {
+			$('#epgpopup_dialogue a.event').click(function(e) {
 				epgpopup(e, $(this));
 			});
 		});
-		$('#dialogue')
+		$('#epgpopup_dialogue')
 		    .attr('xs', o.attr('xs'))
 		    .attr('xe', o.attr('xe'));
 		$dialog.dialog('open');
diff --git a/webif/html/js/icons.js b/webif/html/js/icons.js
new file mode 100644
index 0000000..85c286b
--- /dev/null
+++ b/webif/html/js/icons.js
@@ -0,0 +1,32 @@
+function schedule_icons(reckind, rsvtype, repeat)
+{
+	var icons = [];
+
+	switch (rsvtype)
+	{
+	    case 1: icons.push("175_1_00_Reservation_Watch"); break;
+	    case 2: icons.push("175_1_00_Reservation_Watch"); break;
+	    case 3: icons.push("175_1_11_Reservation_Record"); break;
+	    case 4: icons.push("175_1_11_Reservation_Record"); break;
+	    case 5: icons.push("745_1_10_Video_2Live"); break;
+	    case 6: icons.push("745_1_11_Video_1REC"); break;
+	    case 7: icons.push("345_6_08_ST_Ad_Hoc"); break;
+	}
+
+	switch (reckind)
+	{
+	    case 2: icons.push("178_1_26_Icon_Split"); break;
+	    case 4: icons.push("175_1_11_Series_Record"); break;
+	    default:
+		switch (repeat)
+		{
+		    case 1: icons.push("521_1_00_RP_Daily_C"); break;
+		    case 2: icons.push("521_1_00_RP_Weekly_C"); break;
+		    case 3: icons.push("521_1_00_RP_Weekdays_C"); break;
+		    case 4: icons.push("521_1_00_RP_Weekend_C"); break;
+		}
+	}
+
+	return icons;
+}
+
diff --git a/webif/html/lib/footer.jim b/webif/html/lib/footer.jim
index 3eab055..b1f1c03 100755
--- a/webif/html/lib/footer.jim
+++ b/webif/html/lib/footer.jim
@@ -5,10 +5,9 @@ puts {
 <div class=footer>
 }
 
-if {![catch {
-    set rendertime [expr [expr [clock milliseconds] - $renderstart] / 1000.0]
-    }]} {
-	puts "<font class=footnote>Rendered in: $rendertime seconds</font>"
+catch {
+	set rendertime [expr ([clock milliseconds] - $renderstart) / 1000.0]
+	puts "<span class=footnote>Rendered in: $rendertime seconds</span>"
 }
 
 puts {
diff --git a/webif/html/lib/jquery.plugin/growl/jquery.growl.css b/webif/html/lib/jquery.plugin/growl/jquery.growl.css
new file mode 100644
index 0000000..98edae6
--- /dev/null
+++ b/webif/html/lib/jquery.plugin/growl/jquery.growl.css
@@ -0,0 +1,85 @@
+/* jQuery Growl
+ * Copyright 2015 Kevin Sylvestre
+ * 1.3.1
+ */
+#growls {
+  z-index: 50000;
+  position: fixed; }
+  #growls.default {
+    top: 10px;
+    right: 10px; }
+  #growls.tl {
+    top: 10px;
+    left: 10px; }
+  #growls.tr {
+    top: 10px;
+    right: 10px; }
+  #growls.bl {
+    bottom: 10px;
+    left: 10px; }
+  #growls.br {
+    bottom: 10px;
+    right: 10px; }
+  #growls.tc {
+    top: 10px;
+    right: 10px;
+    left: 10px; }
+  #growls.bc {
+    bottom: 10px;
+    right: 10px;
+    left: 10px; }
+  #growls.tc .growl, #growls.bc .growl {
+    margin-left: auto;
+    margin-right: auto; }
+
+.growl {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+  position: relative;
+  border-radius: 4px;
+  -webkit-transition: all 0.4s ease-in-out;
+  -moz-transition: all 0.4s ease-in-out;
+  transition: all 0.4s ease-in-out; }
+  .growl.growl-incoming {
+    opacity: 0;
+    filter: alpha(opacity=0); }
+  .growl.growl-outgoing {
+    opacity: 0;
+    filter: alpha(opacity=0); }
+  .growl.growl-small {
+    width: 200px;
+    padding: 5px;
+    margin: 5px; }
+  .growl.growl-medium {
+    width: 250px;
+    padding: 10px;
+    margin: 10px; }
+  .growl.growl-large {
+    width: 300px;
+    padding: 15px;
+    margin: 15px; }
+  .growl.growl-default {
+    color: #FFF;
+    background: #7f8c8d; }
+  .growl.growl-error {
+    color: #FFF;
+    background: #C0392B; }
+  .growl.growl-notice {
+    color: #FFF;
+    background: #2ECC71; }
+  .growl.growl-warning {
+    color: #FFF;
+    background: #F39C12; }
+  .growl .growl-close {
+    cursor: pointer;
+    float: right;
+    font-size: 14px;
+    line-height: 18px;
+    font-weight: normal;
+    font-family: helvetica, verdana, sans-serif; }
+  .growl .growl-title {
+    font-size: 18px;
+    line-height: 24px; }
+  .growl .growl-message {
+    font-size: 14px;
+    line-height: 18px; }
diff --git a/webif/html/lib/jquery.plugin/growl/jquery.growl.js b/webif/html/lib/jquery.plugin/growl/jquery.growl.js
new file mode 100644
index 0000000..f44eb46
--- /dev/null
+++ b/webif/html/lib/jquery.plugin/growl/jquery.growl.js
@@ -0,0 +1,244 @@
+// Generated by CoffeeScript 1.9.3
+
+/*
+jQuery Growl
+Copyright 2015 Kevin Sylvestre
+1.3.1
+ */
+
+(function() {
+  "use strict";
+  var $, Animation, Growl,
+    bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+  $ = jQuery;
+
+  Animation = (function() {
+    function Animation() {}
+
+    Animation.transitions = {
+      "webkitTransition": "webkitTransitionEnd",
+      "mozTransition": "mozTransitionEnd",
+      "oTransition": "oTransitionEnd",
+      "transition": "transitionend"
+    };
+
+    Animation.transition = function($el) {
+      var el, ref, result, type;
+      el = $el[0];
+      ref = this.transitions;
+      for (type in ref) {
+        result = ref[type];
+        if (el.style[type] != null) {
+          return result;
+        }
+      }
+    };
+
+    return Animation;
+
+  })();
+
+  Growl = (function() {
+    Growl.settings = {
+      namespace: 'growl',
+      duration: 3200,
+      close: "&#215;",
+      location: "default",
+      style: "default",
+      size: "medium"
+    };
+
+    Growl.growl = function(settings) {
+      if (settings == null) {
+        settings = {};
+      }
+      this.initialize();
+      return new Growl(settings);
+    };
+
+    Growl.initialize = function() {
+      return $("body:not(:has(#growls))").append('<div id="growls" />');
+    };
+
+    function Growl(settings) {
+      if (settings == null) {
+        settings = {};
+      }
+      this.container = bind(this.container, this);
+      this.content = bind(this.content, this);
+      this.html = bind(this.html, this);
+      this.$growl = bind(this.$growl, this);
+      this.$growls = bind(this.$growls, this);
+      this.animate = bind(this.animate, this);
+      this.remove = bind(this.remove, this);
+      this.dismiss = bind(this.dismiss, this);
+      this.present = bind(this.present, this);
+      this.cycle = bind(this.cycle, this);
+      this.close = bind(this.close, this);
+      this.click = bind(this.click, this);
+      this.unbind = bind(this.unbind, this);
+      this.bind = bind(this.bind, this);
+      this.render = bind(this.render, this);
+      this.settings = $.extend({}, Growl.settings, settings);
+      this.$growls().attr('class', this.settings.location);
+      this.render();
+    }
+
+    Growl.prototype.render = function() {
+      var $growl;
+      $growl = this.$growl();
+      this.$growls().append($growl);
+      if (this.settings.fixed) {
+        this.present();
+      } else {
+        this.cycle();
+      }
+    };
+
+    Growl.prototype.bind = function($growl) {
+      if ($growl == null) {
+        $growl = this.$growl();
+      }
+      $growl.on("click", this.click);
+      return $growl.on("contextmenu", this.close).find("." + this.settings.namespace + "-close").on("click", this.close);
+    };
+
+    Growl.prototype.unbind = function($growl) {
+      if ($growl == null) {
+        $growl = this.$growl();
+      }
+      $growl.off("click", this.click);
+      return $growl.off("contextmenu", this.close).find("." + this.settings.namespace + "-close").off("click", this.close);
+    };
+
+    Growl.prototype.click = function(event) {
+      if (this.settings.url != null) {
+        event.preventDefault();
+        event.stopPropagation();
+        return window.open(this.settings.url);
+      }
+    };
+
+    Growl.prototype.close = function(event) {
+      var $growl;
+      event.preventDefault();
+      event.stopPropagation();
+      $growl = this.$growl();
+      return $growl.stop().queue(this.dismiss).queue(this.remove);
+    };
+
+    Growl.prototype.cycle = function() {
+      var $growl;
+      $growl = this.$growl();
+      return $growl.queue(this.present).delay(this.settings.duration).queue(this.dismiss).queue(this.remove);
+    };
+
+    Growl.prototype.present = function(callback) {
+      var $growl;
+      $growl = this.$growl();
+      this.bind($growl);
+      return this.animate($growl, this.settings.namespace + "-incoming", 'out', callback);
+    };
+
+    Growl.prototype.dismiss = function(callback) {
+      var $growl;
+      $growl = this.$growl();
+      this.unbind($growl);
+      return this.animate($growl, this.settings.namespace + "-outgoing", 'in', callback);
+    };
+
+    Growl.prototype.remove = function(callback) {
+      this.$growl().remove();
+      return callback();
+    };
+
+    Growl.prototype.animate = function($element, name, direction, callback) {
+      var transition;
+      if (direction == null) {
+        direction = 'in';
+      }
+      transition = Animation.transition($element);
+      $element[direction === 'in' ? 'removeClass' : 'addClass'](name);
+      $element.offset().position;
+      $element[direction === 'in' ? 'addClass' : 'removeClass'](name);
+      if (callback == null) {
+        return;
+      }
+      if (transition != null) {
+        $element.one(transition, callback);
+      } else {
+        callback();
+      }
+    };
+
+    Growl.prototype.$growls = function() {
+      return this.$_growls != null ? this.$_growls : this.$_growls = $('#growls');
+    };
+
+    Growl.prototype.$growl = function() {
+      return this.$_growl != null ? this.$_growl : this.$_growl = $(this.html());
+    };
+
+    Growl.prototype.html = function() {
+      return this.container(this.content());
+    };
+
+    Growl.prototype.content = function() {
+      return "<div class='" + this.settings.namespace + "-close'>" + this.settings.close + "</div>\n<div class='" + this.settings.namespace + "-title'>" + this.settings.title + "</div>\n<div class='" + this.settings.namespace + "-message'>" + this.settings.message + "</div>";
+    };
+
+    Growl.prototype.container = function(content) {
+      return "<div class='" + this.settings.namespace + " " + this.settings.namespace + "-" + this.settings.style + " " + this.settings.namespace + "-" + this.settings.size + "'>\n  " + content + "\n</div>";
+    };
+
+    return Growl;
+
+  })();
+
+  this.Growl = Growl;
+
+  $.growl = function(options) {
+    if (options == null) {
+      options = {};
+    }
+    return Growl.growl(options);
+  };
+
+  $.growl.error = function(options) {
+    var settings;
+    if (options == null) {
+      options = {};
+    }
+    settings = {
+      title: "Error!",
+      style: "error"
+    };
+    return $.growl($.extend(settings, options));
+  };
+
+  $.growl.notice = function(options) {
+    var settings;
+    if (options == null) {
+      options = {};
+    }
+    settings = {
+      title: "Notice!",
+      style: "notice"
+    };
+    return $.growl($.extend(settings, options));
+  };
+
+  $.growl.warning = function(options) {
+    var settings;
+    if (options == null) {
+      options = {};
+    }
+    settings = {
+      title: "Warning!",
+      style: "warning"
+    };
+    return $.growl($.extend(settings, options));
+  };
+
+}).call(this);
diff --git a/webif/html/lib/jquery.plugin/qtip/jquery.qtip.min.css b/webif/html/lib/jquery.plugin/qtip/jquery.qtip.min.css
new file mode 100644
index 0000000..27b9729
--- /dev/null
+++ b/webif/html/lib/jquery.plugin/qtip/jquery.qtip.min.css
@@ -0,0 +1,3 @@
+/* qTip2 v2.2.1 | Plugins: tips modal viewport svg imagemap ie6 | Styles: core basic css3 | qtip2.com | Licensed MIT | Sat Sep 06 2014 23:12:07 */
+
+.qtip{position:absolute;left:-28000px;top:-28000px;display:none;max-width:280px;min-width:50px;font-size:10.5px;line-height:12px;direction:ltr;box-shadow:none;padding:0}.qtip-content{position:relative;padding:5px 9px;overflow:hidden;text-align:left;word-wrap:break-word}.qtip-titlebar{position:relative;padding:5px 35px 5px 10px;overflow:hidden;border-width:0 0 1px;font-weight:700}.qtip-titlebar+.qtip-content{border-top-width:0!important}.qtip-close{position:absolute;right:-9px;top:-9px;z-index:11;cursor:pointer;outline:0;border:1px solid transparent}.qtip-titlebar .qtip-close{right:4px;top:50%;margin-top:-9px}* html .qtip-titlebar .qtip-close{top:16px}.qtip-icon .ui-icon,.qtip-titlebar .ui-icon{display:block;text-indent:-1000em;direction:ltr}.qtip-icon,.qtip-icon .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;text-decoration:none}.qtip-icon .ui-icon{width:18px;height:14px;line-height:14px;text-align:center;text-indent:0;font:400 bold 10px/13px Tahoma,sans-serif;color:inherit;background:-100em -100em no-repeat}.qtip-default{border:1px solid #F1D031;background-color:#FFFFA3;color:#555}.qtip-default .qtip-titlebar{background-color:#FFEF93}.qtip-default .qtip-icon{border-color:#CCC;background:#F1F1F1;color:#777}.qtip-default .qtip-titlebar .qtip-close{border-color:#AAA;color:#111}.qtip-light{background-color:#fff;border-color:#E2E2E2;color:#454545}.qtip-light .qtip-titlebar{background-color:#f1f1f1}.qtip-dark{background-color:#505050;border-color:#303030;color:#f3f3f3}.qtip-dark .qtip-titlebar{background-color:#404040}.qtip-dark .qtip-icon{border-color:#444}.qtip-dark .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-cream{background-color:#FBF7AA;border-color:#F9E98E;color:#A27D35}.qtip-cream .qtip-titlebar{background-color:#F0DE7D}.qtip-cream .qtip-close .qtip-icon{background-position:-82px 0}.qtip-red{background-color:#F78B83;border-color:#D95252;color:#912323}.qtip-red .qtip-titlebar{background-color:#F06D65}.qtip-red .qtip-close .qtip-icon{background-position:-102px 0}.qtip-red .qtip-icon,.qtip-red .qtip-titlebar .ui-state-hover{border-color:#D95252}.qtip-green{background-color:#CAED9E;border-color:#90D93F;color:#3F6219}.qtip-green .qtip-titlebar{background-color:#B0DE78}.qtip-green .qtip-close .qtip-icon{background-position:-42px 0}.qtip-blue{background-color:#E5F6FE;border-color:#ADD9ED;color:#5E99BD}.qtip-blue .qtip-titlebar{background-color:#D0E9F5}.qtip-blue .qtip-close .qtip-icon{background-position:-2px 0}.qtip-shadow{-webkit-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);-moz-box-shadow:1px 1px 3px 1px rgba(0,0,0,.15);box-shadow:1px 1px 3px 1px rgba(0,0,0,.15)}.qtip-bootstrap,.qtip-rounded,.qtip-tipsy{-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.qtip-rounded .qtip-titlebar{-moz-border-radius:4px 4px 0 0;-webkit-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.qtip-youtube{-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 3px #333;-moz-box-shadow:0 0 3px #333;box-shadow:0 0 3px #333;color:#fff;border:0 solid transparent;background:#4A4A4A;background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0,#4A4A4A),color-stop(100%,#000));background-image:-webkit-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-moz-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-ms-linear-gradient(top,#4A4A4A 0,#000 100%);background-image:-o-linear-gradient(top,#4A4A4A 0,#000 100%)}.qtip-youtube .qtip-titlebar{background-color:transparent}.qtip-youtube .qtip-content{padding:.75em;font:12px arial,sans-serif;filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr=#4a4a4a, EndColorStr=#000000);-ms-filter:"progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#4a4a4a,EndColorStr=#000000);"}.qtip-youtube .qtip-icon{border-color:#222}.qtip-youtube .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-jtools{background:#232323;background:rgba(0,0,0,.7);background-image:-webkit-gradient(linear,left top,left bottom,from(#717171),to(#232323));background-image:-moz-linear-gradient(top,#717171,#232323);background-image:-webkit-linear-gradient(top,#717171,#232323);background-image:-ms-linear-gradient(top,#717171,#232323);background-image:-o-linear-gradient(top,#717171,#232323);border:2px solid #ddd;border:2px solid rgba(241,241,241,1);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:0 0 12px #333;-moz-box-shadow:0 0 12px #333;box-shadow:0 0 12px #333}.qtip-jtools .qtip-titlebar{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171, endColorstr=#4A4A4A);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#717171,endColorstr=#4A4A4A)"}.qtip-jtools .qtip-content{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A, endColorstr=#232323);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#4A4A4A,endColorstr=#232323)"}.qtip-jtools .qtip-content,.qtip-jtools .qtip-titlebar{background:0 0;color:#fff;border:0 dashed transparent}.qtip-jtools .qtip-icon{border-color:#555}.qtip-jtools .qtip-titlebar .ui-state-hover{border-color:#333}.qtip-cluetip{-webkit-box-shadow:4px 4px 5px rgba(0,0,0,.4);-moz-box-shadow:4px 4px 5px rgba(0,0,0,.4);box-shadow:4px 4px 5px rgba(0,0,0,.4);background-color:#D9D9C2;color:#111;border:0 dashed transparent}.qtip-cluetip .qtip-titlebar{background-color:#87876A;color:#fff;border:0 dashed transparent}.qtip-cluetip .qtip-icon{border-color:#808064}.qtip-cluetip .qtip-titlebar .ui-state-hover{border-color:#696952;color:#696952}.qtip-tipsy{background:#000;background:rgba(0,0,0,.87);color:#fff;border:0 solid transparent;font-size:11px;font-family:'Lucida Grande',sans-serif;font-weight:700;line-height:16px;text-shadow:0 1px #000}.qtip-tipsy .qtip-titlebar{padding:6px 35px 0 10px;background-color:transparent}.qtip-tipsy .qtip-content{padding:6px 10px}.qtip-tipsy .qtip-icon{border-color:#222;text-shadow:none}.qtip-tipsy .qtip-titlebar .ui-state-hover{border-color:#303030}.qtip-tipped{border:3px solid #959FA9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;background-color:#F9F9F9;color:#454545;font-weight:400;font-family:serif}.qtip-tipped .qtip-titlebar{border-bottom-width:0;color:#fff;background:#3A79B8;background-image:-webkit-gradient(linear,left top,left bottom,from(#3A79B8),to(#2E629D));background-image:-webkit-linear-gradient(top,#3A79B8,#2E629D);background-image:-moz-linear-gradient(top,#3A79B8,#2E629D);background-image:-ms-linear-gradient(top,#3A79B8,#2E629D);background-image:-o-linear-gradient(top,#3A79B8,#2E629D);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8, endColorstr=#2E629D);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#3A79B8,endColorstr=#2E629D)"}.qtip-tipped .qtip-icon{border:2px solid #285589;background:#285589}.qtip-tipped .qtip-icon .ui-icon{background-color:#FBFBFB;color:#555}.qtip-bootstrap{font-size:14px;line-height:20px;color:#333;padding:1px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.qtip-bootstrap .qtip-titlebar{padding:8px 14px;margin:0;font-size:14px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.qtip-bootstrap .qtip-titlebar .qtip-close{right:11px;top:45%;border-style:none}.qtip-bootstrap .qtip-content{padding:9px 14px}.qtip-bootstrap .qtip-icon{background:0 0}.qtip-bootstrap .qtip-icon .ui-icon{width:auto;height:auto;float:right;font-size:20px;font-weight:700;line-height:18px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.qtip-bootstrap .qtip-icon .ui-icon:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}.qtip:not(.ie9haxors) div.qtip-content,.qtip:not(.ie9haxors) div.qtip-titlebar{filter:none;-ms-filter:none}.qtip .qtip-tip{margin:0 auto;overflow:hidden;z-index:10}.qtip .qtip-tip,x:-o-prefocus{visibility:hidden}.qtip .qtip-tip,.qtip .qtip-tip .qtip-vml,.qtip .qtip-tip canvas{position:absolute;color:#123456;background:0 0;border:0 dashed transparent}.qtip .qtip-tip canvas{top:0;left:0}.qtip .qtip-tip .qtip-vml{behavior:url(#default#VML);display:inline-block;visibility:visible}#qtip-overlay{position:fixed;left:0;top:0;width:100%;height:100%}#qtip-overlay.blurs{cursor:pointer}#qtip-overlay div{position:absolute;left:0;top:0;width:100%;height:100%;background-color:#000;opacity:.7;filter:alpha(opacity=70);-ms-filter:"alpha(Opacity=70)"}.qtipmodal-ie6fix{position:absolute!important}
\ No newline at end of file
diff --git a/webif/html/lib/jquery.plugin/qtip/jquery.qtip.min.js b/webif/html/lib/jquery.plugin/qtip/jquery.qtip.min.js
new file mode 100644
index 0000000..411a0f8
--- /dev/null
+++ b/webif/html/lib/jquery.plugin/qtip/jquery.qtip.min.js
@@ -0,0 +1,5 @@
+/* qTip2 v2.2.1 | Plugins: tips modal viewport svg imagemap ie6 | Styles: core basic css3 | qtip2.com | Licensed MIT | Sat Sep 06 2014 23:12:07 */
+
+!function(a,b,c){!function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery"],a):jQuery&&!jQuery.fn.qtip&&a(jQuery)}(function(d){"use strict";function e(a,b,c,e){this.id=c,this.target=a,this.tooltip=F,this.elements={target:a},this._id=S+"-"+c,this.timers={img:{}},this.options=b,this.plugins={},this.cache={event:{},target:d(),disabled:E,attr:e,onTooltip:E,lastClass:""},this.rendered=this.destroyed=this.disabled=this.waiting=this.hiddenDuringWait=this.positioning=this.triggering=E}function f(a){return a===F||"object"!==d.type(a)}function g(a){return!(d.isFunction(a)||a&&a.attr||a.length||"object"===d.type(a)&&(a.jquery||a.then))}function h(a){var b,c,e,h;return f(a)?E:(f(a.metadata)&&(a.metadata={type:a.metadata}),"content"in a&&(b=a.content,f(b)||b.jquery||b.done?b=a.content={text:c=g(b)?E:b}:c=b.text,"ajax"in b&&(e=b.ajax,h=e&&e.once!==E,delete b.ajax,b.text=function(a,b){var f=c||d(this).attr(b.options.content.attr)||"Loading...",g=d.ajax(d.extend({},e,{context:b})).then(e.success,F,e.error).then(function(a){return a&&h&&b.set("content.text",a),a},function(a,c,d){b.destroyed||0===a.status||b.set("content.text",c+": "+d)});return h?f:(b.set("content.text",f),g)}),"title"in b&&(d.isPlainObject(b.title)&&(b.button=b.title.button,b.title=b.title.text),g(b.title||E)&&(b.title=E))),"position"in a&&f(a.position)&&(a.position={my:a.position,at:a.position}),"show"in a&&f(a.show)&&(a.show=a.show.jquery?{target:a.show}:a.show===D?{ready:D}:{event:a.show}),"hide"in a&&f(a.hide)&&(a.hide=a.hide.jquery?{target:a.hide}:{event:a.hide}),"style"in a&&f(a.style)&&(a.style={classes:a.style}),d.each(R,function(){this.sanitize&&this.sanitize(a)}),a)}function i(a,b){for(var c,d=0,e=a,f=b.split(".");e=e[f[d++]];)d<f.length&&(c=e);return[c||a,f.pop()]}function j(a,b){var c,d,e;for(c in this.checks)for(d in this.checks[c])(e=new RegExp(d,"i").exec(a))&&(b.push(e),("builtin"===c||this.plugins[c])&&this.checks[c][d].apply(this.plugins[c]||this,b))}function k(a){return V.concat("").join(a?"-"+a+" ":" ")}function l(a,b){return b>0?setTimeout(d.proxy(a,this),b):void a.call(this)}function m(a){this.tooltip.hasClass(ab)||(clearTimeout(this.timers.show),clearTimeout(this.timers.hide),this.timers.show=l.call(this,function(){this.toggle(D,a)},this.options.show.delay))}function n(a){if(!this.tooltip.hasClass(ab)&&!this.destroyed){var b=d(a.relatedTarget),c=b.closest(W)[0]===this.tooltip[0],e=b[0]===this.options.show.target[0];if(clearTimeout(this.timers.show),clearTimeout(this.timers.hide),this!==b[0]&&"mouse"===this.options.position.target&&c||this.options.hide.fixed&&/mouse(out|leave|move)/.test(a.type)&&(c||e))try{a.preventDefault(),a.stopImmediatePropagation()}catch(f){}else this.timers.hide=l.call(this,function(){this.toggle(E,a)},this.options.hide.delay,this)}}function o(a){!this.tooltip.hasClass(ab)&&this.options.hide.inactive&&(clearTimeout(this.timers.inactive),this.timers.inactive=l.call(this,function(){this.hide(a)},this.options.hide.inactive))}function p(a){this.rendered&&this.tooltip[0].offsetWidth>0&&this.reposition(a)}function q(a,c,e){d(b.body).delegate(a,(c.split?c:c.join("."+S+" "))+"."+S,function(){var a=y.api[d.attr(this,U)];a&&!a.disabled&&e.apply(a,arguments)})}function r(a,c,f){var g,i,j,k,l,m=d(b.body),n=a[0]===b?m:a,o=a.metadata?a.metadata(f.metadata):F,p="html5"===f.metadata.type&&o?o[f.metadata.name]:F,q=a.data(f.metadata.name||"qtipopts");try{q="string"==typeof q?d.parseJSON(q):q}catch(r){}if(k=d.extend(D,{},y.defaults,f,"object"==typeof q?h(q):F,h(p||o)),i=k.position,k.id=c,"boolean"==typeof k.content.text){if(j=a.attr(k.content.attr),k.content.attr===E||!j)return E;k.content.text=j}if(i.container.length||(i.container=m),i.target===E&&(i.target=n),k.show.target===E&&(k.show.target=n),k.show.solo===D&&(k.show.solo=i.container.closest("body")),k.hide.target===E&&(k.hide.target=n),k.position.viewport===D&&(k.position.viewport=i.container),i.container=i.container.eq(0),i.at=new A(i.at,D),i.my=new A(i.my),a.data(S))if(k.overwrite)a.qtip("destroy",!0);else if(k.overwrite===E)return E;return a.attr(T,c),k.suppress&&(l=a.attr("title"))&&a.removeAttr("title").attr(cb,l).attr("title",""),g=new e(a,k,c,!!j),a.data(S,g),g}function s(a){return a.charAt(0).toUpperCase()+a.slice(1)}function t(a,b){var d,e,f=b.charAt(0).toUpperCase()+b.slice(1),g=(b+" "+rb.join(f+" ")+f).split(" "),h=0;if(qb[b])return a.css(qb[b]);for(;d=g[h++];)if((e=a.css(d))!==c)return qb[b]=d,e}function u(a,b){return Math.ceil(parseFloat(t(a,b)))}function v(a,b){this._ns="tip",this.options=b,this.offset=b.offset,this.size=[b.width,b.height],this.init(this.qtip=a)}function w(a,b){this.options=b,this._ns="-modal",this.init(this.qtip=a)}function x(a){this._ns="ie6",this.init(this.qtip=a)}var y,z,A,B,C,D=!0,E=!1,F=null,G="x",H="y",I="width",J="height",K="top",L="left",M="bottom",N="right",O="center",P="flipinvert",Q="shift",R={},S="qtip",T="data-hasqtip",U="data-qtip-id",V=["ui-widget","ui-tooltip"],W="."+S,X="click dblclick mousedown mouseup mousemove mouseleave mouseenter".split(" "),Y=S+"-fixed",Z=S+"-default",$=S+"-focus",_=S+"-hover",ab=S+"-disabled",bb="_replacedByqTip",cb="oldtitle",db={ie:function(){for(var a=4,c=b.createElement("div");(c.innerHTML="<!--[if gt IE "+a+"]><i></i><![endif]-->")&&c.getElementsByTagName("i")[0];a+=1);return a>4?a:0/0}(),iOS:parseFloat((""+(/CPU.*OS ([0-9_]{1,5})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent)||[0,""])[1]).replace("undefined","3_2").replace("_",".").replace("_",""))||E};z=e.prototype,z._when=function(a){return d.when.apply(d,a)},z.render=function(a){if(this.rendered||this.destroyed)return this;var b,c=this,e=this.options,f=this.cache,g=this.elements,h=e.content.text,i=e.content.title,j=e.content.button,k=e.position,l=("."+this._id+" ",[]);return d.attr(this.target[0],"aria-describedby",this._id),f.posClass=this._createPosClass((this.position={my:k.my,at:k.at}).my),this.tooltip=g.tooltip=b=d("<div/>",{id:this._id,"class":[S,Z,e.style.classes,f.posClass].join(" "),width:e.style.width||"",height:e.style.height||"",tracking:"mouse"===k.target&&k.adjust.mouse,role:"alert","aria-live":"polite","aria-atomic":E,"aria-describedby":this._id+"-content","aria-hidden":D}).toggleClass(ab,this.disabled).attr(U,this.id).data(S,this).appendTo(k.container).append(g.content=d("<div />",{"class":S+"-content",id:this._id+"-content","aria-atomic":D})),this.rendered=-1,this.positioning=D,i&&(this._createTitle(),d.isFunction(i)||l.push(this._updateTitle(i,E))),j&&this._createButton(),d.isFunction(h)||l.push(this._updateContent(h,E)),this.rendered=D,this._setWidget(),d.each(R,function(a){var b;"render"===this.initialize&&(b=this(c))&&(c.plugins[a]=b)}),this._unassignEvents(),this._assignEvents(),this._when(l).then(function(){c._trigger("render"),c.positioning=E,c.hiddenDuringWait||!e.show.ready&&!a||c.toggle(D,f.event,E),c.hiddenDuringWait=E}),y.api[this.id]=this,this},z.destroy=function(a){function b(){if(!this.destroyed){this.destroyed=D;var a,b=this.target,c=b.attr(cb);this.rendered&&this.tooltip.stop(1,0).find("*").remove().end().remove(),d.each(this.plugins,function(){this.destroy&&this.destroy()});for(a in this.timers)clearTimeout(this.timers[a]);b.removeData(S).removeAttr(U).removeAttr(T).removeAttr("aria-describedby"),this.options.suppress&&c&&b.attr("title",c).removeAttr(cb),this._unassignEvents(),this.options=this.elements=this.cache=this.timers=this.plugins=this.mouse=F,delete y.api[this.id]}}return this.destroyed?this.target:(a===D&&"hide"!==this.triggering||!this.rendered?b.call(this):(this.tooltip.one("tooltiphidden",d.proxy(b,this)),!this.triggering&&this.hide()),this.target)},B=z.checks={builtin:{"^id$":function(a,b,c,e){var f=c===D?y.nextid:c,g=S+"-"+f;f!==E&&f.length>0&&!d("#"+g).length?(this._id=g,this.rendered&&(this.tooltip[0].id=this._id,this.elements.content[0].id=this._id+"-content",this.elements.title[0].id=this._id+"-title")):a[b]=e},"^prerender":function(a,b,c){c&&!this.rendered&&this.render(this.options.show.ready)},"^content.text$":function(a,b,c){this._updateContent(c)},"^content.attr$":function(a,b,c,d){this.options.content.text===this.target.attr(d)&&this._updateContent(this.target.attr(c))},"^content.title$":function(a,b,c){return c?(c&&!this.elements.title&&this._createTitle(),void this._updateTitle(c)):this._removeTitle()},"^content.button$":function(a,b,c){this._updateButton(c)},"^content.title.(text|button)$":function(a,b,c){this.set("content."+b,c)},"^position.(my|at)$":function(a,b,c){"string"==typeof c&&(this.position[b]=a[b]=new A(c,"at"===b))},"^position.container$":function(a,b,c){this.rendered&&this.tooltip.appendTo(c)},"^show.ready$":function(a,b,c){c&&(!this.rendered&&this.render(D)||this.toggle(D))},"^style.classes$":function(a,b,c,d){this.rendered&&this.tooltip.removeClass(d).addClass(c)},"^style.(width|height)":function(a,b,c){this.rendered&&this.tooltip.css(b,c)},"^style.widget|content.title":function(){this.rendered&&this._setWidget()},"^style.def":function(a,b,c){this.rendered&&this.tooltip.toggleClass(Z,!!c)},"^events.(render|show|move|hide|focus|blur)$":function(a,b,c){this.rendered&&this.tooltip[(d.isFunction(c)?"":"un")+"bind"]("tooltip"+b,c)},"^(show|hide|position).(event|target|fixed|inactive|leave|distance|viewport|adjust)":function(){if(this.rendered){var a=this.options.position;this.tooltip.attr("tracking","mouse"===a.target&&a.adjust.mouse),this._unassignEvents(),this._assignEvents()}}}},z.get=function(a){if(this.destroyed)return this;var b=i(this.options,a.toLowerCase()),c=b[0][b[1]];return c.precedance?c.string():c};var eb=/^position\.(my|at|adjust|target|container|viewport)|style|content|show\.ready/i,fb=/^prerender|show\.ready/i;z.set=function(a,b){if(this.destroyed)return this;{var c,e=this.rendered,f=E,g=this.options;this.checks}return"string"==typeof a?(c=a,a={},a[c]=b):a=d.extend({},a),d.each(a,function(b,c){if(e&&fb.test(b))return void delete a[b];var h,j=i(g,b.toLowerCase());h=j[0][j[1]],j[0][j[1]]=c&&c.nodeType?d(c):c,f=eb.test(b)||f,a[b]=[j[0],j[1],c,h]}),h(g),this.positioning=D,d.each(a,d.proxy(j,this)),this.positioning=E,this.rendered&&this.tooltip[0].offsetWidth>0&&f&&this.reposition("mouse"===g.position.target?F:this.cache.event),this},z._update=function(a,b){var c=this,e=this.cache;return this.rendered&&a?(d.isFunction(a)&&(a=a.call(this.elements.target,e.event,this)||""),d.isFunction(a.then)?(e.waiting=D,a.then(function(a){return e.waiting=E,c._update(a,b)},F,function(a){return c._update(a,b)})):a===E||!a&&""!==a?E:(a.jquery&&a.length>0?b.empty().append(a.css({display:"block",visibility:"visible"})):b.html(a),this._waitForContent(b).then(function(a){c.rendered&&c.tooltip[0].offsetWidth>0&&c.reposition(e.event,!a.length)}))):E},z._waitForContent=function(a){var b=this.cache;return b.waiting=D,(d.fn.imagesLoaded?a.imagesLoaded():d.Deferred().resolve([])).done(function(){b.waiting=E}).promise()},z._updateContent=function(a,b){this._update(a,this.elements.content,b)},z._updateTitle=function(a,b){this._update(a,this.elements.title,b)===E&&this._removeTitle(E)},z._createTitle=function(){var a=this.elements,b=this._id+"-title";a.titlebar&&this._removeTitle(),a.titlebar=d("<div />",{"class":S+"-titlebar "+(this.options.style.widget?k("header"):"")}).append(a.title=d("<div />",{id:b,"class":S+"-title","aria-atomic":D})).insertBefore(a.content).delegate(".qtip-close","mousedown keydown mouseup keyup mouseout",function(a){d(this).toggleClass("ui-state-active ui-state-focus","down"===a.type.substr(-4))}).delegate(".qtip-close","mouseover mouseout",function(a){d(this).toggleClass("ui-state-hover","mouseover"===a.type)}),this.options.content.button&&this._createButton()},z._removeTitle=function(a){var b=this.elements;b.title&&(b.titlebar.remove(),b.titlebar=b.title=b.button=F,a!==E&&this.reposition())},z._createPosClass=function(a){return S+"-pos-"+(a||this.options.position.my).abbrev()},z.reposition=function(c,e){if(!this.rendered||this.positioning||this.destroyed)return this;this.positioning=D;var f,g,h,i,j=this.cache,k=this.tooltip,l=this.options.position,m=l.target,n=l.my,o=l.at,p=l.viewport,q=l.container,r=l.adjust,s=r.method.split(" "),t=k.outerWidth(E),u=k.outerHeight(E),v=0,w=0,x=k.css("position"),y={left:0,top:0},z=k[0].offsetWidth>0,A=c&&"scroll"===c.type,B=d(a),C=q[0].ownerDocument,F=this.mouse;if(d.isArray(m)&&2===m.length)o={x:L,y:K},y={left:m[0],top:m[1]};else if("mouse"===m)o={x:L,y:K},(!r.mouse||this.options.hide.distance)&&j.origin&&j.origin.pageX?c=j.origin:!c||c&&("resize"===c.type||"scroll"===c.type)?c=j.event:F&&F.pageX&&(c=F),"static"!==x&&(y=q.offset()),C.body.offsetWidth!==(a.innerWidth||C.documentElement.clientWidth)&&(g=d(b.body).offset()),y={left:c.pageX-y.left+(g&&g.left||0),top:c.pageY-y.top+(g&&g.top||0)},r.mouse&&A&&F&&(y.left-=(F.scrollX||0)-B.scrollLeft(),y.top-=(F.scrollY||0)-B.scrollTop());else{if("event"===m?c&&c.target&&"scroll"!==c.type&&"resize"!==c.type?j.target=d(c.target):c.target||(j.target=this.elements.target):"event"!==m&&(j.target=d(m.jquery?m:this.elements.target)),m=j.target,m=d(m).eq(0),0===m.length)return this;m[0]===b||m[0]===a?(v=db.iOS?a.innerWidth:m.width(),w=db.iOS?a.innerHeight:m.height(),m[0]===a&&(y={top:(p||m).scrollTop(),left:(p||m).scrollLeft()})):R.imagemap&&m.is("area")?f=R.imagemap(this,m,o,R.viewport?s:E):R.svg&&m&&m[0].ownerSVGElement?f=R.svg(this,m,o,R.viewport?s:E):(v=m.outerWidth(E),w=m.outerHeight(E),y=m.offset()),f&&(v=f.width,w=f.height,g=f.offset,y=f.position),y=this.reposition.offset(m,y,q),(db.iOS>3.1&&db.iOS<4.1||db.iOS>=4.3&&db.iOS<4.33||!db.iOS&&"fixed"===x)&&(y.left-=B.scrollLeft(),y.top-=B.scrollTop()),(!f||f&&f.adjustable!==E)&&(y.left+=o.x===N?v:o.x===O?v/2:0,y.top+=o.y===M?w:o.y===O?w/2:0)}return y.left+=r.x+(n.x===N?-t:n.x===O?-t/2:0),y.top+=r.y+(n.y===M?-u:n.y===O?-u/2:0),R.viewport?(h=y.adjusted=R.viewport(this,y,l,v,w,t,u),g&&h.left&&(y.left+=g.left),g&&h.top&&(y.top+=g.top),h.my&&(this.position.my=h.my)):y.adjusted={left:0,top:0},j.posClass!==(i=this._createPosClass(this.position.my))&&k.removeClass(j.posClass).addClass(j.posClass=i),this._trigger("move",[y,p.elem||p],c)?(delete y.adjusted,e===E||!z||isNaN(y.left)||isNaN(y.top)||"mouse"===m||!d.isFunction(l.effect)?k.css(y):d.isFunction(l.effect)&&(l.effect.call(k,this,d.extend({},y)),k.queue(function(a){d(this).css({opacity:"",height:""}),db.ie&&this.style.removeAttribute("filter"),a()})),this.positioning=E,this):this},z.reposition.offset=function(a,c,e){function f(a,b){c.left+=b*a.scrollLeft(),c.top+=b*a.scrollTop()}if(!e[0])return c;var g,h,i,j,k=d(a[0].ownerDocument),l=!!db.ie&&"CSS1Compat"!==b.compatMode,m=e[0];do"static"!==(h=d.css(m,"position"))&&("fixed"===h?(i=m.getBoundingClientRect(),f(k,-1)):(i=d(m).position(),i.left+=parseFloat(d.css(m,"borderLeftWidth"))||0,i.top+=parseFloat(d.css(m,"borderTopWidth"))||0),c.left-=i.left+(parseFloat(d.css(m,"marginLeft"))||0),c.top-=i.top+(parseFloat(d.css(m,"marginTop"))||0),g||"hidden"===(j=d.css(m,"overflow"))||"visible"===j||(g=d(m)));while(m=m.offsetParent);return g&&(g[0]!==k[0]||l)&&f(g,1),c};var gb=(A=z.reposition.Corner=function(a,b){a=(""+a).replace(/([A-Z])/," $1").replace(/middle/gi,O).toLowerCase(),this.x=(a.match(/left|right/i)||a.match(/center/)||["inherit"])[0].toLowerCase(),this.y=(a.match(/top|bottom|center/i)||["inherit"])[0].toLowerCase(),this.forceY=!!b;var c=a.charAt(0);this.precedance="t"===c||"b"===c?H:G}).prototype;gb.invert=function(a,b){this[a]=this[a]===L?N:this[a]===N?L:b||this[a]},gb.string=function(a){var b=this.x,c=this.y,d=b!==c?"center"===b||"center"!==c&&(this.precedance===H||this.forceY)?[c,b]:[b,c]:[b];return a!==!1?d.join(" "):d},gb.abbrev=function(){var a=this.string(!1);return a[0].charAt(0)+(a[1]&&a[1].charAt(0)||"")},gb.clone=function(){return new A(this.string(),this.forceY)},z.toggle=function(a,c){var e=this.cache,f=this.options,g=this.tooltip;if(c){if(/over|enter/.test(c.type)&&e.event&&/out|leave/.test(e.event.type)&&f.show.target.add(c.target).length===f.show.target.length&&g.has(c.relatedTarget).length)return this;e.event=d.event.fix(c)}if(this.waiting&&!a&&(this.hiddenDuringWait=D),!this.rendered)return a?this.render(1):this;if(this.destroyed||this.disabled)return this;var h,i,j,k=a?"show":"hide",l=this.options[k],m=(this.options[a?"hide":"show"],this.options.position),n=this.options.content,o=this.tooltip.css("width"),p=this.tooltip.is(":visible"),q=a||1===l.target.length,r=!c||l.target.length<2||e.target[0]===c.target;return(typeof a).search("boolean|number")&&(a=!p),h=!g.is(":animated")&&p===a&&r,i=h?F:!!this._trigger(k,[90]),this.destroyed?this:(i!==E&&a&&this.focus(c),!i||h?this:(d.attr(g[0],"aria-hidden",!a),a?(this.mouse&&(e.origin=d.event.fix(this.mouse)),d.isFunction(n.text)&&this._updateContent(n.text,E),d.isFunction(n.title)&&this._updateTitle(n.title,E),!C&&"mouse"===m.target&&m.adjust.mouse&&(d(b).bind("mousemove."+S,this._storeMouse),C=D),o||g.css("width",g.outerWidth(E)),this.reposition(c,arguments[2]),o||g.css("width",""),l.solo&&("string"==typeof l.solo?d(l.solo):d(W,l.solo)).not(g).not(l.target).qtip("hide",d.Event("tooltipsolo"))):(clearTimeout(this.timers.show),delete e.origin,C&&!d(W+'[tracking="true"]:visible',l.solo).not(g).length&&(d(b).unbind("mousemove."+S),C=E),this.blur(c)),j=d.proxy(function(){a?(db.ie&&g[0].style.removeAttribute("filter"),g.css("overflow",""),"string"==typeof l.autofocus&&d(this.options.show.autofocus,g).focus(),this.options.show.target.trigger("qtip-"+this.id+"-inactive")):g.css({display:"",visibility:"",opacity:"",left:"",top:""}),this._trigger(a?"visible":"hidden")},this),l.effect===E||q===E?(g[k](),j()):d.isFunction(l.effect)?(g.stop(1,1),l.effect.call(g,this),g.queue("fx",function(a){j(),a()})):g.fadeTo(90,a?1:0,j),a&&l.target.trigger("qtip-"+this.id+"-inactive"),this))},z.show=function(a){return this.toggle(D,a)},z.hide=function(a){return this.toggle(E,a)},z.focus=function(a){if(!this.rendered||this.destroyed)return this;var b=d(W),c=this.tooltip,e=parseInt(c[0].style.zIndex,10),f=y.zindex+b.length;return c.hasClass($)||this._trigger("focus",[f],a)&&(e!==f&&(b.each(function(){this.style.zIndex>e&&(this.style.zIndex=this.style.zIndex-1)}),b.filter("."+$).qtip("blur",a)),c.addClass($)[0].style.zIndex=f),this},z.blur=function(a){return!this.rendered||this.destroyed?this:(this.tooltip.removeClass($),this._trigger("blur",[this.tooltip.css("zIndex")],a),this)},z.disable=function(a){return this.destroyed?this:("toggle"===a?a=!(this.rendered?this.tooltip.hasClass(ab):this.disabled):"boolean"!=typeof a&&(a=D),this.rendered&&this.tooltip.toggleClass(ab,a).attr("aria-disabled",a),this.disabled=!!a,this)},z.enable=function(){return this.disable(E)},z._createButton=function(){var a=this,b=this.elements,c=b.tooltip,e=this.options.content.button,f="string"==typeof e,g=f?e:"Close tooltip";b.button&&b.button.remove(),b.button=e.jquery?e:d("<a />",{"class":"qtip-close "+(this.options.style.widget?"":S+"-icon"),title:g,"aria-label":g}).prepend(d("<span />",{"class":"ui-icon ui-icon-close",html:"&times;"})),b.button.appendTo(b.titlebar||c).attr("role","button").click(function(b){return c.hasClass(ab)||a.hide(b),E})},z._updateButton=function(a){if(!this.rendered)return E;var b=this.elements.button;a?this._createButton():b.remove()},z._setWidget=function(){var a=this.options.style.widget,b=this.elements,c=b.tooltip,d=c.hasClass(ab);c.removeClass(ab),ab=a?"ui-state-disabled":"qtip-disabled",c.toggleClass(ab,d),c.toggleClass("ui-helper-reset "+k(),a).toggleClass(Z,this.options.style.def&&!a),b.content&&b.content.toggleClass(k("content"),a),b.titlebar&&b.titlebar.toggleClass(k("header"),a),b.button&&b.button.toggleClass(S+"-icon",!a)},z._storeMouse=function(a){return(this.mouse=d.event.fix(a)).type="mousemove",this},z._bind=function(a,b,c,e,f){if(a&&c&&b.length){var g="."+this._id+(e?"-"+e:"");return d(a).bind((b.split?b:b.join(g+" "))+g,d.proxy(c,f||this)),this}},z._unbind=function(a,b){return a&&d(a).unbind("."+this._id+(b?"-"+b:"")),this},z._trigger=function(a,b,c){var e=d.Event("tooltip"+a);return e.originalEvent=c&&d.extend({},c)||this.cache.event||F,this.triggering=a,this.tooltip.trigger(e,[this].concat(b||[])),this.triggering=E,!e.isDefaultPrevented()},z._bindEvents=function(a,b,c,e,f,g){var h=c.filter(e).add(e.filter(c)),i=[];h.length&&(d.each(b,function(b,c){var e=d.inArray(c,a);e>-1&&i.push(a.splice(e,1)[0])}),i.length&&(this._bind(h,i,function(a){var b=this.rendered?this.tooltip[0].offsetWidth>0:!1;(b?g:f).call(this,a)}),c=c.not(h),e=e.not(h))),this._bind(c,a,f),this._bind(e,b,g)},z._assignInitialEvents=function(a){function b(a){return this.disabled||this.destroyed?E:(this.cache.event=a&&d.event.fix(a),this.cache.target=a&&d(a.target),clearTimeout(this.timers.show),void(this.timers.show=l.call(this,function(){this.render("object"==typeof a||c.show.ready)},c.prerender?0:c.show.delay)))}var c=this.options,e=c.show.target,f=c.hide.target,g=c.show.event?d.trim(""+c.show.event).split(" "):[],h=c.hide.event?d.trim(""+c.hide.event).split(" "):[];this._bind(this.elements.target,["remove","removeqtip"],function(){this.destroy(!0)},"destroy"),/mouse(over|enter)/i.test(c.show.event)&&!/mouse(out|leave)/i.test(c.hide.event)&&h.push("mouseleave"),this._bind(e,"mousemove",function(a){this._storeMouse(a),this.cache.onTarget=D}),this._bindEvents(g,h,e,f,b,function(){return this.timers?void clearTimeout(this.timers.show):E}),(c.show.ready||c.prerender)&&b.call(this,a)},z._assignEvents=function(){var c=this,e=this.options,f=e.position,g=this.tooltip,h=e.show.target,i=e.hide.target,j=f.container,k=f.viewport,l=d(b),q=(d(b.body),d(a)),r=e.show.event?d.trim(""+e.show.event).split(" "):[],s=e.hide.event?d.trim(""+e.hide.event).split(" "):[];d.each(e.events,function(a,b){c._bind(g,"toggle"===a?["tooltipshow","tooltiphide"]:["tooltip"+a],b,null,g)}),/mouse(out|leave)/i.test(e.hide.event)&&"window"===e.hide.leave&&this._bind(l,["mouseout","blur"],function(a){/select|option/.test(a.target.nodeName)||a.relatedTarget||this.hide(a)}),e.hide.fixed?i=i.add(g.addClass(Y)):/mouse(over|enter)/i.test(e.show.event)&&this._bind(i,"mouseleave",function(){clearTimeout(this.timers.show)}),(""+e.hide.event).indexOf("unfocus")>-1&&this._bind(j.closest("html"),["mousedown","touchstart"],function(a){var b=d(a.target),c=this.rendered&&!this.tooltip.hasClass(ab)&&this.tooltip[0].offsetWidth>0,e=b.parents(W).filter(this.tooltip[0]).length>0;b[0]===this.target[0]||b[0]===this.tooltip[0]||e||this.target.has(b[0]).length||!c||this.hide(a)}),"number"==typeof e.hide.inactive&&(this._bind(h,"qtip-"+this.id+"-inactive",o,"inactive"),this._bind(i.add(g),y.inactiveEvents,o)),this._bindEvents(r,s,h,i,m,n),this._bind(h.add(g),"mousemove",function(a){if("number"==typeof e.hide.distance){var b=this.cache.origin||{},c=this.options.hide.distance,d=Math.abs;(d(a.pageX-b.pageX)>=c||d(a.pageY-b.pageY)>=c)&&this.hide(a)}this._storeMouse(a)}),"mouse"===f.target&&f.adjust.mouse&&(e.hide.event&&this._bind(h,["mouseenter","mouseleave"],function(a){return this.cache?void(this.cache.onTarget="mouseenter"===a.type):E}),this._bind(l,"mousemove",function(a){this.rendered&&this.cache.onTarget&&!this.tooltip.hasClass(ab)&&this.tooltip[0].offsetWidth>0&&this.reposition(a)})),(f.adjust.resize||k.length)&&this._bind(d.event.special.resize?k:q,"resize",p),f.adjust.scroll&&this._bind(q.add(f.container),"scroll",p)},z._unassignEvents=function(){var c=this.options,e=c.show.target,f=c.hide.target,g=d.grep([this.elements.target[0],this.rendered&&this.tooltip[0],c.position.container[0],c.position.viewport[0],c.position.container.closest("html")[0],a,b],function(a){return"object"==typeof a});e&&e.toArray&&(g=g.concat(e.toArray())),f&&f.toArray&&(g=g.concat(f.toArray())),this._unbind(g)._unbind(g,"destroy")._unbind(g,"inactive")},d(function(){q(W,["mouseenter","mouseleave"],function(a){var b="mouseenter"===a.type,c=d(a.currentTarget),e=d(a.relatedTarget||a.target),f=this.options;b?(this.focus(a),c.hasClass(Y)&&!c.hasClass(ab)&&clearTimeout(this.timers.hide)):"mouse"===f.position.target&&f.position.adjust.mouse&&f.hide.event&&f.show.target&&!e.closest(f.show.target[0]).length&&this.hide(a),c.toggleClass(_,b)}),q("["+U+"]",X,o)}),y=d.fn.qtip=function(a,b,e){var f=(""+a).toLowerCase(),g=F,i=d.makeArray(arguments).slice(1),j=i[i.length-1],k=this[0]?d.data(this[0],S):F;return!arguments.length&&k||"api"===f?k:"string"==typeof a?(this.each(function(){var a=d.data(this,S);if(!a)return D;if(j&&j.timeStamp&&(a.cache.event=j),!b||"option"!==f&&"options"!==f)a[f]&&a[f].apply(a,i);else{if(e===c&&!d.isPlainObject(b))return g=a.get(b),E;a.set(b,e)}}),g!==F?g:this):"object"!=typeof a&&arguments.length?void 0:(k=h(d.extend(D,{},a)),this.each(function(a){var b,c;return c=d.isArray(k.id)?k.id[a]:k.id,c=!c||c===E||c.length<1||y.api[c]?y.nextid++:c,b=r(d(this),c,k),b===E?D:(y.api[c]=b,d.each(R,function(){"initialize"===this.initialize&&this(b)}),void b._assignInitialEvents(j))}))},d.qtip=e,y.api={},d.each({attr:function(a,b){if(this.length){var c=this[0],e="title",f=d.data(c,"qtip");if(a===e&&f&&"object"==typeof f&&f.options.suppress)return arguments.length<2?d.attr(c,cb):(f&&f.options.content.attr===e&&f.cache.attr&&f.set("content.text",b),this.attr(cb,b))}return d.fn["attr"+bb].apply(this,arguments)},clone:function(a){var b=(d([]),d.fn["clone"+bb].apply(this,arguments));return a||b.filter("["+cb+"]").attr("title",function(){return d.attr(this,cb)}).removeAttr(cb),b}},function(a,b){if(!b||d.fn[a+bb])return D;var c=d.fn[a+bb]=d.fn[a];d.fn[a]=function(){return b.apply(this,arguments)||c.apply(this,arguments)}}),d.ui||(d["cleanData"+bb]=d.cleanData,d.cleanData=function(a){for(var b,c=0;(b=d(a[c])).length;c++)if(b.attr(T))try{b.triggerHandler("removeqtip")}catch(e){}d["cleanData"+bb].apply(this,arguments)}),y.version="2.2.1",y.nextid=0,y.inactiveEvents=X,y.zindex=15e3,y.defaults={prerender:E,id:E,overwrite:D,suppress:D,content:{text:D,attr:"title",title:E,button:E},position:{my:"top left",at:"bottom right",target:E,container:E,viewport:E,adjust:{x:0,y:0,mouse:D,scroll:D,resize:D,method:"flipinvert flipinvert"},effect:function(a,b){d(this).animate(b,{duration:200,queue:E})}},show:{target:E,event:"mouseenter",effect:D,delay:90,solo:E,ready:E,autofocus:E},hide:{target:E,event:"mouseleave",effect:D,delay:0,fixed:E,inactive:E,leave:"window",distance:E},style:{classes:"",widget:E,width:E,height:E,def:D},events:{render:F,move:F,show:F,hide:F,toggle:F,visible:F,hidden:F,focus:F,blur:F}};var hb,ib="margin",jb="border",kb="color",lb="background-color",mb="transparent",nb=" !important",ob=!!b.createElement("canvas").getContext,pb=/rgba?\(0, 0, 0(, 0)?\)|transparent|#123456/i,qb={},rb=["Webkit","O","Moz","ms"];if(ob)var sb=a.devicePixelRatio||1,tb=function(){var a=b.createElement("canvas").getContext("2d");return a.backingStorePixelRatio||a.webkitBackingStorePixelRatio||a.mozBackingStorePixelRatio||a.msBackingStorePixelRatio||a.oBackingStorePixelRatio||1}(),ub=sb/tb;else var vb=function(a,b,c){return"<qtipvml:"+a+' xmlns="urn:schemas-microsoft.com:vml" class="qtip-vml" '+(b||"")+' style="behavior: url(#default#VML); '+(c||"")+'" />'};d.extend(v.prototype,{init:function(a){var b,c;c=this.element=a.elements.tip=d("<div />",{"class":S+"-tip"}).prependTo(a.tooltip),ob?(b=d("<canvas />").appendTo(this.element)[0].getContext("2d"),b.lineJoin="miter",b.miterLimit=1e5,b.save()):(b=vb("shape",'coordorigin="0,0"',"position:absolute;"),this.element.html(b+b),a._bind(d("*",c).add(c),["click","mousedown"],function(a){a.stopPropagation()},this._ns)),a._bind(a.tooltip,"tooltipmove",this.reposition,this._ns,this),this.create()},_swapDimensions:function(){this.size[0]=this.options.height,this.size[1]=this.options.width},_resetDimensions:function(){this.size[0]=this.options.width,this.size[1]=this.options.height},_useTitle:function(a){var b=this.qtip.elements.titlebar;return b&&(a.y===K||a.y===O&&this.element.position().top+this.size[1]/2+this.options.offset<b.outerHeight(D))},_parseCorner:function(a){var b=this.qtip.options.position.my;return a===E||b===E?a=E:a===D?a=new A(b.string()):a.string||(a=new A(a),a.fixed=D),a},_parseWidth:function(a,b,c){var d=this.qtip.elements,e=jb+s(b)+"Width";return(c?u(c,e):u(d.content,e)||u(this._useTitle(a)&&d.titlebar||d.content,e)||u(d.tooltip,e))||0},_parseRadius:function(a){var b=this.qtip.elements,c=jb+s(a.y)+s(a.x)+"Radius";return db.ie<9?0:u(this._useTitle(a)&&b.titlebar||b.content,c)||u(b.tooltip,c)||0},_invalidColour:function(a,b,c){var d=a.css(b);return!d||c&&d===a.css(c)||pb.test(d)?E:d},_parseColours:function(a){var b=this.qtip.elements,c=this.element.css("cssText",""),e=jb+s(a[a.precedance])+s(kb),f=this._useTitle(a)&&b.titlebar||b.content,g=this._invalidColour,h=[];return h[0]=g(c,lb)||g(f,lb)||g(b.content,lb)||g(b.tooltip,lb)||c.css(lb),h[1]=g(c,e,kb)||g(f,e,kb)||g(b.content,e,kb)||g(b.tooltip,e,kb)||b.tooltip.css(e),d("*",c).add(c).css("cssText",lb+":"+mb+nb+";"+jb+":0"+nb+";"),h},_calculateSize:function(a){var b,c,d,e=a.precedance===H,f=this.options.width,g=this.options.height,h="c"===a.abbrev(),i=(e?f:g)*(h?.5:1),j=Math.pow,k=Math.round,l=Math.sqrt(j(i,2)+j(g,2)),m=[this.border/i*l,this.border/g*l];return m[2]=Math.sqrt(j(m[0],2)-j(this.border,2)),m[3]=Math.sqrt(j(m[1],2)-j(this.border,2)),b=l+m[2]+m[3]+(h?0:m[0]),c=b/l,d=[k(c*f),k(c*g)],e?d:d.reverse()},_calculateTip:function(a,b,c){c=c||1,b=b||this.size;var d=b[0]*c,e=b[1]*c,f=Math.ceil(d/2),g=Math.ceil(e/2),h={br:[0,0,d,e,d,0],bl:[0,0,d,0,0,e],tr:[0,e,d,0,d,e],tl:[0,0,0,e,d,e],tc:[0,e,f,0,d,e],bc:[0,0,d,0,f,e],rc:[0,0,d,g,0,e],lc:[d,0,d,e,0,g]};return h.lt=h.br,h.rt=h.bl,h.lb=h.tr,h.rb=h.tl,h[a.abbrev()]},_drawCoords:function(a,b){a.beginPath(),a.moveTo(b[0],b[1]),a.lineTo(b[2],b[3]),a.lineTo(b[4],b[5]),a.closePath()},create:function(){var a=this.corner=(ob||db.ie)&&this._parseCorner(this.options.corner);return(this.enabled=!!this.corner&&"c"!==this.corner.abbrev())&&(this.qtip.cache.corner=a.clone(),this.update()),this.element.toggle(this.enabled),this.corner},update:function(b,c){if(!this.enabled)return this;var e,f,g,h,i,j,k,l,m=this.qtip.elements,n=this.element,o=n.children(),p=this.options,q=this.size,r=p.mimic,s=Math.round;b||(b=this.qtip.cache.corner||this.corner),r===E?r=b:(r=new A(r),r.precedance=b.precedance,"inherit"===r.x?r.x=b.x:"inherit"===r.y?r.y=b.y:r.x===r.y&&(r[b.precedance]=b[b.precedance])),f=r.precedance,b.precedance===G?this._swapDimensions():this._resetDimensions(),e=this.color=this._parseColours(b),e[1]!==mb?(l=this.border=this._parseWidth(b,b[b.precedance]),p.border&&1>l&&!pb.test(e[1])&&(e[0]=e[1]),this.border=l=p.border!==D?p.border:l):this.border=l=0,k=this.size=this._calculateSize(b),n.css({width:k[0],height:k[1],lineHeight:k[1]+"px"}),j=b.precedance===H?[s(r.x===L?l:r.x===N?k[0]-q[0]-l:(k[0]-q[0])/2),s(r.y===K?k[1]-q[1]:0)]:[s(r.x===L?k[0]-q[0]:0),s(r.y===K?l:r.y===M?k[1]-q[1]-l:(k[1]-q[1])/2)],ob?(g=o[0].getContext("2d"),g.restore(),g.save(),g.clearRect(0,0,6e3,6e3),h=this._calculateTip(r,q,ub),i=this._calculateTip(r,this.size,ub),o.attr(I,k[0]*ub).attr(J,k[1]*ub),o.css(I,k[0]).css(J,k[1]),this._drawCoords(g,i),g.fillStyle=e[1],g.fill(),g.translate(j[0]*ub,j[1]*ub),this._drawCoords(g,h),g.fillStyle=e[0],g.fill()):(h=this._calculateTip(r),h="m"+h[0]+","+h[1]+" l"+h[2]+","+h[3]+" "+h[4]+","+h[5]+" xe",j[2]=l&&/^(r|b)/i.test(b.string())?8===db.ie?2:1:0,o.css({coordsize:k[0]+l+" "+(k[1]+l),antialias:""+(r.string().indexOf(O)>-1),left:j[0]-j[2]*Number(f===G),top:j[1]-j[2]*Number(f===H),width:k[0]+l,height:k[1]+l}).each(function(a){var b=d(this);b[b.prop?"prop":"attr"]({coordsize:k[0]+l+" "+(k[1]+l),path:h,fillcolor:e[0],filled:!!a,stroked:!a}).toggle(!(!l&&!a)),!a&&b.html(vb("stroke",'weight="'+2*l+'px" color="'+e[1]+'" miterlimit="1000" joinstyle="miter"'))})),a.opera&&setTimeout(function(){m.tip.css({display:"inline-block",visibility:"visible"})},1),c!==E&&this.calculate(b,k)},calculate:function(a,b){if(!this.enabled)return E;var c,e,f=this,g=this.qtip.elements,h=this.element,i=this.options.offset,j=(g.tooltip.hasClass("ui-widget"),{});return a=a||this.corner,c=a.precedance,b=b||this._calculateSize(a),e=[a.x,a.y],c===G&&e.reverse(),d.each(e,function(d,e){var h,k,l;
+e===O?(h=c===H?L:K,j[h]="50%",j[ib+"-"+h]=-Math.round(b[c===H?0:1]/2)+i):(h=f._parseWidth(a,e,g.tooltip),k=f._parseWidth(a,e,g.content),l=f._parseRadius(a),j[e]=Math.max(-f.border,d?k:i+(l>h?l:-h)))}),j[a[c]]-=b[c===G?0:1],h.css({margin:"",top:"",bottom:"",left:"",right:""}).css(j),j},reposition:function(a,b,d){function e(a,b,c,d,e){a===Q&&j.precedance===b&&k[d]&&j[c]!==O?j.precedance=j.precedance===G?H:G:a!==Q&&k[d]&&(j[b]=j[b]===O?k[d]>0?d:e:j[b]===d?e:d)}function f(a,b,e){j[a]===O?p[ib+"-"+b]=o[a]=g[ib+"-"+b]-k[b]:(h=g[e]!==c?[k[b],-g[b]]:[-k[b],g[b]],(o[a]=Math.max(h[0],h[1]))>h[0]&&(d[b]-=k[b],o[b]=E),p[g[e]!==c?e:b]=o[a])}if(this.enabled){var g,h,i=b.cache,j=this.corner.clone(),k=d.adjusted,l=b.options.position.adjust.method.split(" "),m=l[0],n=l[1]||l[0],o={left:E,top:E,x:0,y:0},p={};this.corner.fixed!==D&&(e(m,G,H,L,N),e(n,H,G,K,M),(j.string()!==i.corner.string()||i.cornerTop!==k.top||i.cornerLeft!==k.left)&&this.update(j,E)),g=this.calculate(j),g.right!==c&&(g.left=-g.right),g.bottom!==c&&(g.top=-g.bottom),g.user=this.offset,(o.left=m===Q&&!!k.left)&&f(G,L,N),(o.top=n===Q&&!!k.top)&&f(H,K,M),this.element.css(p).toggle(!(o.x&&o.y||j.x===O&&o.y||j.y===O&&o.x)),d.left-=g.left.charAt?g.user:m!==Q||o.top||!o.left&&!o.top?g.left+this.border:0,d.top-=g.top.charAt?g.user:n!==Q||o.left||!o.left&&!o.top?g.top+this.border:0,i.cornerLeft=k.left,i.cornerTop=k.top,i.corner=j.clone()}},destroy:function(){this.qtip._unbind(this.qtip.tooltip,this._ns),this.qtip.elements.tip&&this.qtip.elements.tip.find("*").remove().end().remove()}}),hb=R.tip=function(a){return new v(a,a.options.style.tip)},hb.initialize="render",hb.sanitize=function(a){if(a.style&&"tip"in a.style){var b=a.style.tip;"object"!=typeof b&&(b=a.style.tip={corner:b}),/string|boolean/i.test(typeof b.corner)||(b.corner=D)}},B.tip={"^position.my|style.tip.(corner|mimic|border)$":function(){this.create(),this.qtip.reposition()},"^style.tip.(height|width)$":function(a){this.size=[a.width,a.height],this.update(),this.qtip.reposition()},"^content.title|style.(classes|widget)$":function(){this.update()}},d.extend(D,y.defaults,{style:{tip:{corner:D,mimic:E,width:6,height:6,border:D,offset:0}}});var wb,xb,yb="qtip-modal",zb="."+yb;xb=function(){function a(a){if(d.expr[":"].focusable)return d.expr[":"].focusable;var b,c,e,f=!isNaN(d.attr(a,"tabindex")),g=a.nodeName&&a.nodeName.toLowerCase();return"area"===g?(b=a.parentNode,c=b.name,a.href&&c&&"map"===b.nodeName.toLowerCase()?(e=d("img[usemap=#"+c+"]")[0],!!e&&e.is(":visible")):!1):/input|select|textarea|button|object/.test(g)?!a.disabled:"a"===g?a.href||f:f}function c(a){k.length<1&&a.length?a.not("body").blur():k.first().focus()}function e(a){if(i.is(":visible")){var b,e=d(a.target),h=f.tooltip,j=e.closest(W);b=j.length<1?E:parseInt(j[0].style.zIndex,10)>parseInt(h[0].style.zIndex,10),b||e.closest(W)[0]===h[0]||c(e),g=a.target===k[k.length-1]}}var f,g,h,i,j=this,k={};d.extend(j,{init:function(){return i=j.elem=d("<div />",{id:"qtip-overlay",html:"<div></div>",mousedown:function(){return E}}).hide(),d(b.body).bind("focusin"+zb,e),d(b).bind("keydown"+zb,function(a){f&&f.options.show.modal.escape&&27===a.keyCode&&f.hide(a)}),i.bind("click"+zb,function(a){f&&f.options.show.modal.blur&&f.hide(a)}),j},update:function(b){f=b,k=b.options.show.modal.stealfocus!==E?b.tooltip.find("*").filter(function(){return a(this)}):[]},toggle:function(a,e,g){var k=(d(b.body),a.tooltip),l=a.options.show.modal,m=l.effect,n=e?"show":"hide",o=i.is(":visible"),p=d(zb).filter(":visible:not(:animated)").not(k);return j.update(a),e&&l.stealfocus!==E&&c(d(":focus")),i.toggleClass("blurs",l.blur),e&&i.appendTo(b.body),i.is(":animated")&&o===e&&h!==E||!e&&p.length?j:(i.stop(D,E),d.isFunction(m)?m.call(i,e):m===E?i[n]():i.fadeTo(parseInt(g,10)||90,e?1:0,function(){e||i.hide()}),e||i.queue(function(a){i.css({left:"",top:""}),d(zb).length||i.detach(),a()}),h=e,f.destroyed&&(f=F),j)}}),j.init()},xb=new xb,d.extend(w.prototype,{init:function(a){var b=a.tooltip;return this.options.on?(a.elements.overlay=xb.elem,b.addClass(yb).css("z-index",y.modal_zindex+d(zb).length),a._bind(b,["tooltipshow","tooltiphide"],function(a,c,e){var f=a.originalEvent;if(a.target===b[0])if(f&&"tooltiphide"===a.type&&/mouse(leave|enter)/.test(f.type)&&d(f.relatedTarget).closest(xb.elem[0]).length)try{a.preventDefault()}catch(g){}else(!f||f&&"tooltipsolo"!==f.type)&&this.toggle(a,"tooltipshow"===a.type,e)},this._ns,this),a._bind(b,"tooltipfocus",function(a,c){if(!a.isDefaultPrevented()&&a.target===b[0]){var e=d(zb),f=y.modal_zindex+e.length,g=parseInt(b[0].style.zIndex,10);xb.elem[0].style.zIndex=f-1,e.each(function(){this.style.zIndex>g&&(this.style.zIndex-=1)}),e.filter("."+$).qtip("blur",a.originalEvent),b.addClass($)[0].style.zIndex=f,xb.update(c);try{a.preventDefault()}catch(h){}}},this._ns,this),void a._bind(b,"tooltiphide",function(a){a.target===b[0]&&d(zb).filter(":visible").not(b).last().qtip("focus",a)},this._ns,this)):this},toggle:function(a,b,c){return a&&a.isDefaultPrevented()?this:void xb.toggle(this.qtip,!!b,c)},destroy:function(){this.qtip.tooltip.removeClass(yb),this.qtip._unbind(this.qtip.tooltip,this._ns),xb.toggle(this.qtip,E),delete this.qtip.elements.overlay}}),wb=R.modal=function(a){return new w(a,a.options.show.modal)},wb.sanitize=function(a){a.show&&("object"!=typeof a.show.modal?a.show.modal={on:!!a.show.modal}:"undefined"==typeof a.show.modal.on&&(a.show.modal.on=D))},y.modal_zindex=y.zindex-200,wb.initialize="render",B.modal={"^show.modal.(on|blur)$":function(){this.destroy(),this.init(),this.qtip.elems.overlay.toggle(this.qtip.tooltip[0].offsetWidth>0)}},d.extend(D,y.defaults,{show:{modal:{on:E,effect:D,blur:D,stealfocus:D,escape:D}}}),R.viewport=function(c,d,e,f,g,h,i){function j(a,b,c,e,f,g,h,i,j){var k=d[f],s=u[a],t=v[a],w=c===Q,x=s===f?j:s===g?-j:-j/2,y=t===f?i:t===g?-i:-i/2,z=q[f]+r[f]-(n?0:m[f]),A=z-k,B=k+j-(h===I?o:p)-z,C=x-(u.precedance===a||s===u[b]?y:0)-(t===O?i/2:0);return w?(C=(s===f?1:-1)*x,d[f]+=A>0?A:B>0?-B:0,d[f]=Math.max(-m[f]+r[f],k-C,Math.min(Math.max(-m[f]+r[f]+(h===I?o:p),k+C),d[f],"center"===s?k-x:1e9))):(e*=c===P?2:0,A>0&&(s!==f||B>0)?(d[f]-=C+e,l.invert(a,f)):B>0&&(s!==g||A>0)&&(d[f]-=(s===O?-C:C)+e,l.invert(a,g)),d[f]<q&&-d[f]>B&&(d[f]=k,l=u.clone())),d[f]-k}var k,l,m,n,o,p,q,r,s=e.target,t=c.elements.tooltip,u=e.my,v=e.at,w=e.adjust,x=w.method.split(" "),y=x[0],z=x[1]||x[0],A=e.viewport,B=e.container,C=(c.cache,{left:0,top:0});return A.jquery&&s[0]!==a&&s[0]!==b.body&&"none"!==w.method?(m=B.offset()||C,n="static"===B.css("position"),k="fixed"===t.css("position"),o=A[0]===a?A.width():A.outerWidth(E),p=A[0]===a?A.height():A.outerHeight(E),q={left:k?0:A.scrollLeft(),top:k?0:A.scrollTop()},r=A.offset()||C,("shift"!==y||"shift"!==z)&&(l=u.clone()),C={left:"none"!==y?j(G,H,y,w.x,L,N,I,f,h):0,top:"none"!==z?j(H,G,z,w.y,K,M,J,g,i):0,my:l}):C},R.polys={polygon:function(a,b){var c,d,e,f={width:0,height:0,position:{top:1e10,right:0,bottom:0,left:1e10},adjustable:E},g=0,h=[],i=1,j=1,k=0,l=0;for(g=a.length;g--;)c=[parseInt(a[--g],10),parseInt(a[g+1],10)],c[0]>f.position.right&&(f.position.right=c[0]),c[0]<f.position.left&&(f.position.left=c[0]),c[1]>f.position.bottom&&(f.position.bottom=c[1]),c[1]<f.position.top&&(f.position.top=c[1]),h.push(c);if(d=f.width=Math.abs(f.position.right-f.position.left),e=f.height=Math.abs(f.position.bottom-f.position.top),"c"===b.abbrev())f.position={left:f.position.left+f.width/2,top:f.position.top+f.height/2};else{for(;d>0&&e>0&&i>0&&j>0;)for(d=Math.floor(d/2),e=Math.floor(e/2),b.x===L?i=d:b.x===N?i=f.width-d:i+=Math.floor(d/2),b.y===K?j=e:b.y===M?j=f.height-e:j+=Math.floor(e/2),g=h.length;g--&&!(h.length<2);)k=h[g][0]-f.position.left,l=h[g][1]-f.position.top,(b.x===L&&k>=i||b.x===N&&i>=k||b.x===O&&(i>k||k>f.width-i)||b.y===K&&l>=j||b.y===M&&j>=l||b.y===O&&(j>l||l>f.height-j))&&h.splice(g,1);f.position={left:h[0][0],top:h[0][1]}}return f},rect:function(a,b,c,d){return{width:Math.abs(c-a),height:Math.abs(d-b),position:{left:Math.min(a,c),top:Math.min(b,d)}}},_angles:{tc:1.5,tr:7/4,tl:5/4,bc:.5,br:.25,bl:.75,rc:2,lc:1,c:0},ellipse:function(a,b,c,d,e){var f=R.polys._angles[e.abbrev()],g=0===f?0:c*Math.cos(f*Math.PI),h=d*Math.sin(f*Math.PI);return{width:2*c-Math.abs(g),height:2*d-Math.abs(h),position:{left:a+g,top:b+h},adjustable:E}},circle:function(a,b,c,d){return R.polys.ellipse(a,b,c,c,d)}},R.svg=function(a,c,e){for(var f,g,h,i,j,k,l,m,n,o=(d(b),c[0]),p=d(o.ownerSVGElement),q=o.ownerDocument,r=(parseInt(c.css("stroke-width"),10)||0)/2;!o.getBBox;)o=o.parentNode;if(!o.getBBox||!o.parentNode)return E;switch(o.nodeName){case"ellipse":case"circle":m=R.polys.ellipse(o.cx.baseVal.value,o.cy.baseVal.value,(o.rx||o.r).baseVal.value+r,(o.ry||o.r).baseVal.value+r,e);break;case"line":case"polygon":case"polyline":for(l=o.points||[{x:o.x1.baseVal.value,y:o.y1.baseVal.value},{x:o.x2.baseVal.value,y:o.y2.baseVal.value}],m=[],k=-1,i=l.numberOfItems||l.length;++k<i;)j=l.getItem?l.getItem(k):l[k],m.push.apply(m,[j.x,j.y]);m=R.polys.polygon(m,e);break;default:m=o.getBBox(),m={width:m.width,height:m.height,position:{left:m.x,top:m.y}}}return n=m.position,p=p[0],p.createSVGPoint&&(g=o.getScreenCTM(),l=p.createSVGPoint(),l.x=n.left,l.y=n.top,h=l.matrixTransform(g),n.left=h.x,n.top=h.y),q!==b&&"mouse"!==a.position.target&&(f=d((q.defaultView||q.parentWindow).frameElement).offset(),f&&(n.left+=f.left,n.top+=f.top)),q=d(q),n.left+=q.scrollLeft(),n.top+=q.scrollTop(),m},R.imagemap=function(a,b,c){b.jquery||(b=d(b));var e,f,g,h,i,j=(b.attr("shape")||"rect").toLowerCase().replace("poly","polygon"),k=d('img[usemap="#'+b.parent("map").attr("name")+'"]'),l=d.trim(b.attr("coords")),m=l.replace(/,$/,"").split(",");if(!k.length)return E;if("polygon"===j)h=R.polys.polygon(m,c);else{if(!R.polys[j])return E;for(g=-1,i=m.length,f=[];++g<i;)f.push(parseInt(m[g],10));h=R.polys[j].apply(this,f.concat(c))}return e=k.offset(),e.left+=Math.ceil((k.outerWidth(E)-k.width())/2),e.top+=Math.ceil((k.outerHeight(E)-k.height())/2),h.position.left+=e.left,h.position.top+=e.top,h};var Ab,Bb='<iframe class="qtip-bgiframe" frameborder="0" tabindex="-1" src="javascript:\'\';"  style="display:block; position:absolute; z-index:-1; filter:alpha(opacity=0); -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";"></iframe>';d.extend(x.prototype,{_scroll:function(){var b=this.qtip.elements.overlay;b&&(b[0].style.top=d(a).scrollTop()+"px")},init:function(c){var e=c.tooltip;d("select, object").length<1&&(this.bgiframe=c.elements.bgiframe=d(Bb).appendTo(e),c._bind(e,"tooltipmove",this.adjustBGIFrame,this._ns,this)),this.redrawContainer=d("<div/>",{id:S+"-rcontainer"}).appendTo(b.body),c.elements.overlay&&c.elements.overlay.addClass("qtipmodal-ie6fix")&&(c._bind(a,["scroll","resize"],this._scroll,this._ns,this),c._bind(e,["tooltipshow"],this._scroll,this._ns,this)),this.redraw()},adjustBGIFrame:function(){var a,b,c=this.qtip.tooltip,d={height:c.outerHeight(E),width:c.outerWidth(E)},e=this.qtip.plugins.tip,f=this.qtip.elements.tip;b=parseInt(c.css("borderLeftWidth"),10)||0,b={left:-b,top:-b},e&&f&&(a="x"===e.corner.precedance?[I,L]:[J,K],b[a[1]]-=f[a[0]]()),this.bgiframe.css(b).css(d)},redraw:function(){if(this.qtip.rendered<1||this.drawing)return this;var a,b,c,d,e=this.qtip.tooltip,f=this.qtip.options.style,g=this.qtip.options.position.container;return this.qtip.drawing=1,f.height&&e.css(J,f.height),f.width?e.css(I,f.width):(e.css(I,"").appendTo(this.redrawContainer),b=e.width(),1>b%2&&(b+=1),c=e.css("maxWidth")||"",d=e.css("minWidth")||"",a=(c+d).indexOf("%")>-1?g.width()/100:0,c=(c.indexOf("%")>-1?a:1)*parseInt(c,10)||b,d=(d.indexOf("%")>-1?a:1)*parseInt(d,10)||0,b=c+d?Math.min(Math.max(b,d),c):b,e.css(I,Math.round(b)).appendTo(g)),this.drawing=0,this},destroy:function(){this.bgiframe&&this.bgiframe.remove(),this.qtip._unbind([a,this.qtip.tooltip],this._ns)}}),Ab=R.ie6=function(a){return 6===db.ie?new x(a):E},Ab.initialize="render",B.ie6={"^content|style$":function(){this.redraw()}}})}(window,document);
+//# sourceMappingURL=jquery.qtip.min.js.map
\ No newline at end of file
diff --git a/webif/html/lib/noheader.jim b/webif/html/lib/noheader.jim
new file mode 100755
index 0000000..cfa4f08
--- /dev/null
+++ b/webif/html/lib/noheader.jim
@@ -0,0 +1,21 @@
+#!/mod/bin/jimsh
+
+source /mod/webif/lib/setup
+require system.class
+
+puts {
+<!doctype html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1" />
+}
+
+incr ::mws::headerdone
+::mws::emit_jscss
+
+puts {
+</head>
+<body>
+}
+
diff --git a/webif/html/backup/backup.jim b/webif/html/sched/backup/backup.jim
similarity index 92%
rename from webif/html/backup/backup.jim
rename to webif/html/sched/backup/backup.jim
index 1bb48df..e8e2fe0 100755
--- a/webif/html/backup/backup.jim
+++ b/webif/html/sched/backup/backup.jim
@@ -14,7 +14,7 @@ set file [file tail [cgi_get file \
     [clock format $now -format "auto-%Y-%b-%d-%H:%M"]]]
 
 if {[string match {auto-*} $file]} {
-	# Delete any automatic backups over 7 days old.
+	# Delete any automatic backups over 15 days old.
 	set mt $(15 * 86400)
 	foreach af [glob -nocomplain "$dir/auto-*"] {
 		set aft [file mtime $af]
diff --git a/webif/html/backup/delete.jim b/webif/html/sched/backup/delete.jim
similarity index 100%
rename from webif/html/backup/delete.jim
rename to webif/html/sched/backup/delete.jim
diff --git a/webif/html/backup/files.jim b/webif/html/sched/backup/files.jim
similarity index 100%
rename from webif/html/backup/files.jim
rename to webif/html/sched/backup/files.jim
diff --git a/webif/html/backup/index.jim b/webif/html/sched/backup/index.jim
similarity index 94%
rename from webif/html/backup/index.jim
rename to webif/html/sched/backup/index.jim
index e6ec8f2..d781798 100755
--- a/webif/html/backup/index.jim
+++ b/webif/html/sched/backup/index.jim
@@ -1,13 +1,12 @@
 #!/mod/bin/jimsh
 
 source /mod/webif/lib/setup
-require altrow rsv.class
+require rsv.class
 
-jscss backup.js
-header
+noheader
 
 puts {
-<h2>Backup/Restore</h2>
+<h2>Recording Schedule Backup &amp; Restore</h2>
 
 <div id=restore_warning class="hidden warningbox">
 <div>
@@ -60,7 +59,7 @@ puts {
 </div>
 
 
-<div id=results class=pre
+<div id=backup_results class=pre
     style="display: none; clear: both; float: left; padding: 1em;
     margin-top: 1em; border: 1px solid grey; width: 70%">
 </div>
diff --git a/webif/html/backup/restore.jim b/webif/html/sched/backup/restore.jim
similarity index 100%
rename from webif/html/backup/restore.jim
rename to webif/html/sched/backup/restore.jim
diff --git a/webif/html/sched/backup/script.js b/webif/html/sched/backup/script.js
new file mode 100755
index 0000000..8824536
--- /dev/null
+++ b/webif/html/sched/backup/script.js
@@ -0,0 +1,72 @@
+
+function refresh_backup_files()
+{
+	$('#backup_files').load('backup/files.jim', function() {
+		$('input.restore').change(function() {
+			$('#restore_button').removeAttr('disabled')
+			    .button('option', 'disabled', false);
+			$('#delete_button').removeAttr('disabled')
+			    .button('option', 'disabled', false);
+			$('#view_button').removeAttr('disabled')
+			    .button('option', 'disabled', false);
+		});
+	});
+}
+
+function backup_loaded()
+{
+
+$('button').button();
+
+refresh_backup_files();
+
+$('#backup_button').click(function() {
+	$('#backup_working').slideDown();
+	$('#backup_results').load('backup/backup.jim?' +
+	    $('#backup_name').serialize(), function() {
+		$('#backup_results').slideDown(function() {
+			$('#backup_working').slideUp();
+			refresh_backup_files();
+		});
+	});
+});
+$('#delete_button').click(function() {
+	var backup = $('input.restore:checked').val();
+	if (confirm('Confirm deletion of ' + backup))
+	{
+		$('#backup_results').load('backup/delete.jim?' +
+		    $('input.restore').serialize(), function() {
+			$('#backup_results').slideDown(function() {
+				refresh_backup_files();
+			});
+		});
+	}
+});
+$('#view_button').click(function() {
+	var backup = $('input.restore:checked').val();
+	$('#backup_results').load('backup/view.jim?' +
+	    $('input.restore').serialize(), function() {
+		$('#backup_results').slideDown(function() {
+			refresh_backup_files();
+		});
+	});
+});
+$('#restore_button').click(function() {
+	var backup = $('input.restore:checked').val();
+	if (confirm('!!!!!!!!!!!!!!!!!!!!!!!!! PLEASE CONFIRM !!!!!!!!!!!!!!!!!!!!!!!!!\n\nAre you sure you wish to erase all scheduled recordings and favourite channels and then restore them from\n' + backup + '?'))
+	{
+		$('#restore_working').slideDown();
+		$('#backup_results').load('backup/restore.jim?' +
+		    $('input.restore').serialize(), function() {
+			$('#backup_results').slideDown(function() {
+				$('#restore_working').slideUp();
+				refresh_backup_files();
+				$('#restore_warning').slideDown();
+				$('#restart_block').slideDown('slow');
+			});
+		});
+	}
+});
+
+}
+
diff --git a/webif/html/backup/view.jim b/webif/html/sched/backup/view.jim
similarity index 90%
rename from webif/html/backup/view.jim
rename to webif/html/sched/backup/view.jim
index 8a7d158..796c61a 100755
--- a/webif/html/backup/view.jim
+++ b/webif/html/sched/backup/view.jim
@@ -52,7 +52,8 @@ foreach line $data {
 
 	set rsv [rsv new $vars]
 
-	puts "  [$rsv name] ([$rsv channel_name])"
+	puts "  [$rsv name] ([$rsv channel_name] [\
+	    clock format [$rsv start]] - [clock format [$rsv end]])"
 }
 
 close $fd
diff --git a/webif/html/sched/index.jim b/webif/html/sched/index.jim
index fd02de1..042fd73 100755
--- a/webif/html/sched/index.jim
+++ b/webif/html/sched/index.jim
@@ -2,281 +2,31 @@
 
 package require cgi
 source /mod/webif/lib/setup
-require altrow rsv.class progressbar epg.class system.class
 
 jqplugin tablesorter2 contextMenu form blockui confirmAction \
-    timepicker datepair
-jscss script.js
+    timepicker datepair growl qtip
+
+jscss {
+	/js/icons.js
+	list/script.js
+	visual/script.js
+	backup/script.js
+	script.js
+} visual/style.css
+
 header
-
-set svcmap {}
-lmap i \
-    [$::channeldb query {select hSvc, usSvcid from TBL_SVC}] \
-    {
-	set svcmap([lindex $i 1]) [lindex $i 3]
-    }
-set svckeys [array names svcmap]
-
-require epg_popup
+# Prevent render time being shown in footer
+unset renderstart
 
 puts {
-<div id=output class=hidden></div>
-<div id=sdialogue></div>
+<div id=minimaltabbar>
+	<ul>
+		<li><a href=list/>Recording List</a></li>
+		<li><a href=visual/>Visual Schedule</a></li>
+		<li><a href=backup/>Backup/Restore</a></li>
+	</ul>
+</div>
 }
 
-proc eventheader {{table TBL_RESERVATION} note} {
-	if {$table eq "pending"} {
-		set sortlist {[[6,0]]}
-	} else {
-		set sortlist {[[5,0]]}
-	}
-
-	puts {
-		<fieldset id=sched_fs_$table
-		    style="display: inline; padding: 1em">
-		<legend>
-	}
-	puts "<h3>$note</h3>"
-	puts "
-		</legend>
-	<table class=\"schedule tablesorter\" data-sortlist=\"$sortlist\">
-		<thead>
-		<tr>
-		<th data-sorter=false>&nbsp;</th>
-	"
-
-	if {$table eq "pending"} { puts "<th>Action</th>" }
-
-	puts {
-			<th>&nbsp;</th>
-			<th data-sorter=false>&nbsp;</th>
-			<th>Channel</th>
-			<th data-sorter=programme>Programme</th>
-			<th data-sorter=xdate>Start Time</th>
-			<th>Duration</th>
-			<th data-sorter=false>Mode</th>
-			<th data-sorter=false>&nbsp;</th>
-		</tr>
-		</thead>
-		<tbody>
-	}
-}
-
-proc eventrow {event {table TBL_RESERVATION} {pending 0}} {
-	global svcmap svckeys num_ended
-
-	set name [$event name]
-
-	set s [$event start]
-	set d [$event get nduration]
-	set e $($s + $d)
-	set n [clock seconds]
-
-	if {$n > $e && [$event get ersvtype] <= 3} {
-		set ended 1
-		incr num_ended
-	} else {
-		set ended 0
-	}
-
-	set attrs "table=$table sid=[$event get ulslot] \
-	    reckind=[$event get ucRecKind] rsvtype=[$event get ersvtype] \
-	    ar=[expr ! [$event padded]] ended=$ended"
-	if {$pending} {
-		append attrs " class=\"blueshade strike\""
-	}
-	altrow $attrs
-	#puts "<tr $attrs>"
-
-	# Checkbox
-	puts "<td><input type=checkbox class=schedselect></td>";
-
-	if {$table eq "pending"} {
-		puts "<td align=center>[$event pendingicon]</td>"
-	}
-
-	puts "<td>[$event get ulslot]</td>"
-
-	if {[$event get usLcn] ne ""} {
-		puts "
-		<td>
-			[epg channelicon [$event channel_name] 50]
-		</td>
-		<td nowrap>[$event get usLcn]<br>
-			[$event channel_name]</td>
-		"
-	} else {
-		puts "<td>&nbsp;<br><br></td><td>&nbsp;</td>"
-	}
-
-	puts "<td nowrap>
-		<a slot=[$event get ulslot] table=$table
-		href=# class=schedule>$name</a>"
-	if {
-	    ([$event get ucRecKind] == 4 && $name ne [$event folder]) ||
-	    ([$event get ucRecKind] == 1 && [$event folder] ne "")
-	} {
-		puts "<br><span class=also>&nbsp;(Folder: [$event folder])</span>"
-	}
-
-	puts "</td>"
-
-	if {$ended} {
-		set ds "[clock format $s -format {%a %d %b %Y %H:%M}]"
-		puts "<td nowrap class=va>
-			--- -- --- ---- --:--<br>
-			<span class=footnote>(Last: $ds)</span>"
-		puts "</td><td>--:--:--</td>"
-	} 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" }
-		puts "\">"
-
-		if {[llength $elist] > 0} {
-			lassign [lindex $elist 0] service_id start end event_id
-			if {$start == $s && $service_id in $svckeys} {
-				puts "<a class=event href=#
-				    xs=$svcmap($service_id) xe=$event_id>
-				    <span class=ds>$ds</span></a>"
-			} else {
-				puts "<span class=ds>$ds</span>"
-			}
-		} else {
-			puts "<span class=ds>$ds</span>"
-		}
-
-		if {$d > 0 && $n > $s && $n < $e} {
-			puts "<br>"
-			set perc [expr [expr $n - $s] * 100 / $d]
-			puts "<img class=va
-			    src=/images/745_1_11_Video_1REC.png>"
-			puts [progressbar $perc]
-		}
-
-		if {[llength $elist] > 1} {
-			puts "<div class=also style=\"margin-top: 0.5em\">"
-			foreach e $elist {
-				lassign $e service_id start end event_id
-				if {$start == $s} continue
-				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>"
-				  if {$service_id != [$event get hsvc]} {
-					set ch [system strip [\
-					    get_channel_attr_byhsvc \
-					    $service_id szSvcName]]
-					puts "<img width=15 src=\"[\
-					    epg channeliconpath $ch]\""
-					puts "title=\"$ch\" alt=\"$ch\">"
-				  }
-				  puts "<br>"
-				} else {
-				  puts "[clock format $start \
-				    -format {%a %d %b %Y %H:%M}]
-				    ($service_id)<br>"
-				}
-			}
-			puts "</div>";
-		}
-
-		puts "</td><td align=center>"
-		set xndur [$event get nduration]
-		if {$xndur > 0} {
-			puts "[clock format $xndur -format %H:%M]"
-		} else {
-			puts "--:--:--"
-		}
-		if {[llength $elist] > 1} {
-			puts "<div class=also style=\"margin-top: 0.5em\">"
-			foreach e $elist {
-				lassign $e service_id start end event_id
-				if {$start == $s} continue
-				puts "[clock format $($end - $start) \
-				    -format {%H:%M}]<br>"
-			}
-			puts "</div>";
-		}
-
-		puts "</td>"
-	}
-
-	puts "<td nowrap>[join [$event iconset] ""]</td>"
-
-	puts "<td><a href=# class=smenu sid=[$event get ulslot]>
-	    <img border=0 src=/img/more_btn.gif></a></td>"
-	puts "</tr>"
-}
-
-proc eventfooter {rawlink} {
-	global num_ended
-
-	puts "</tbody></table>"
-	puts "
-		<br>
-		<button class=selall>Select All</button>
-		<button class=selnone>Select None</button>
-	"
-	if {$num_ended} {
-		puts "
-		<button class=selended>Select Finished</button>
-		"
-	}
-	puts "
-		<button class=\"delselected red\">Delete Selected
-		    <span class=delselcnt></span>
-		</button>
-		<button class=\"manual_rsv blue\">Manual Event</button>
-		<button class=rawview
-		    path=\"$rawlink\"
-		    >Raw Database</button>
-		</fieldset>
-	"
-}
-
-proc ekey {event} {
-	set ret ""
-	foreach key {ersvtype nsttime nduration hsvc usevtid} {
-		append ret ".[$event get $key]"
-	}
-	return $ret
-}
-
-set pmap {}
-set events [rsv list pending]
-set num_ended 0
-if {[llength $events] > 0} {
-	eventheader pending "Pending Actions"
-	foreach event $events {
-		eventrow $event pending
-		lappend pmap [ekey $event]
-	}
-	eventfooter "db=rsvp.db&tab=pending"
-}
-
-set events [rsv list]
-set num_ended 0
-eventheader live "Scheduled Events"
-foreach event $events {
-	if {[ekey $event] in $pmap} {
-		eventrow $event TBL_RESERVATION 1
-	} else {
-		eventrow $event
-	}
-}
-eventfooter "db=rsv.db&tab=TBL_RESERVATION"
-
-puts {
-	<br><br>
-	<button class=backup>
-		Backup/Restore Scheduled Recordings/Events
-	</button>
-}
-
-source assets.jim
-
 footer
 
diff --git a/webif/html/sched/assets.jim b/webif/html/sched/list/assets.jim
similarity index 95%
rename from webif/html/sched/assets.jim
rename to webif/html/sched/list/assets.jim
index 11dd554..c99d844 100755
--- a/webif/html/sched/assets.jim
+++ b/webif/html/sched/list/assets.jim
@@ -1,5 +1,7 @@
 #!/mod/bin/jimsh
 
+puts "<div id=sdialogue></div>"
+
 lassign [system padding] pre post
 
 proc padval {num str def} {
@@ -14,12 +16,13 @@ puts {
 <ul id=optmenu class=contextMenu style="width: 200px">
 	<li class=delete><a href=#delete>Delete</a></li>
 	<li class=separator><a href=#ar>Enable AR</a></li>
+	<li class=separator><a href=#refresh>Refresh Events</a></li>
 	<li class=separator><a href=#folder>Change Folder</a></li>
 	<li class=separator><a href=#mkfolder>Create Folder</a></li>
 </ul>
 
 <div id=padding style="display: none">
-<form id=paddingf method=post action=pad.jim>
+<form id=paddingf method=post action=rpc/pad.jim>
 <input type=hidden id=paddingsid name=slot value=0>
 <table class=keyval>
 <tr>
diff --git a/webif/html/sched/list/index.jim b/webif/html/sched/list/index.jim
new file mode 100755
index 0000000..41c07a9
--- /dev/null
+++ b/webif/html/sched/list/index.jim
@@ -0,0 +1,353 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require altrow rsv.class progressbar epg.class system.class
+
+noheader
+set renderstart [clock milliseconds]
+
+set svcmap {}
+lmap i \
+    [$::channeldb query {select hSvc, usSvcid from TBL_SVC}] \
+    {
+	set svcmap([lindex $i 1]) [lindex $i 3]
+    }
+set svckeys [array names svcmap]
+
+set conflictstart [clock milliseconds]
+set conflicts [rsv newconflicts [system tuners] "xlist"]
+set conflicttime [expr ([clock milliseconds] - $conflictstart) / 1000.0]
+
+if {[llength $conflicts] > 1} {
+	puts "<div class=warningbox><div><center>
+		Your recording schedule contains conflicts; shown in pink below.
+		</center></div></div>"
+}
+
+require epg_popup
+
+set pkey_tags {
+        1 "Pending unschedule"
+        2 "Pending padding change"
+        3 "Pending padding change"
+        4 "Pending folder change"
+        5 "Pending episode skip"
+        6 "Pending refresh"
+}
+
+proc eventheader {{table TBL_RESERVATION} note} {
+	if {$table eq "pending"} {
+		set sortlist {[[6,0]]}
+	} else {
+		set sortlist {[[5,0]]}
+	}
+
+	puts "
+		<fieldset id=sched_fs_$table
+		    style=\"display: inline; padding: 1em\">
+		<legend>
+	"
+	puts "<h3>$note</h3>"
+	puts "
+		</legend>
+	<table class=\"schedule tablesorter\" data-sortlist=\"$sortlist\">
+		<thead>
+		<tr>
+		<th data-sorter=false>&nbsp;</th>
+	"
+
+	if {$table eq "pending"} { puts "<th>Action</th>" }
+
+	puts {
+			<th>&nbsp;</th>
+			<th data-sorter=false>&nbsp;</th>
+			<th>Channel</th>
+			<th data-sorter=programme>Programme</th>
+			<th data-sorter=xdate>Start Time</th>
+			<th>Duration</th>
+			<th data-sorter=false>Mode</th>
+			<th data-sorter=false>&nbsp;</th>
+		</tr>
+		</thead>
+		<tbody>
+	}
+}
+
+proc eventrow {event {table TBL_RESERVATION}} {
+	global svcmap svckeys num_ended conflicts pmap pkey_tags
+
+	set name [$event name]
+
+	set s [$event start]
+	set d [$event get nduration]
+	set e $($s + $d)
+	set n [clock seconds]
+
+	if {$n > $e && [$event get ersvtype] <= 3} {
+		set ended 1
+		incr num_ended
+	} else {
+		set ended 0
+	}
+
+	set attrs "table=$table sid=[$event get ulslot] \
+	    reckind=[$event get ucRecKind] rsvtype=[$event get ersvtype] \
+	    ar=[expr ! [$event padded]] ended=$ended"
+
+	set ek [ekey $event]
+	set opts 1
+	set tag ""
+	if {[dict exists $pmap $ek]} {
+		set act $pmap($ek)
+
+		switch $act {
+			1 -
+			5 {
+				append attrs " class=\"blueshade strike\""
+                        	set opts 0
+			}
+			2 -
+			3 -
+			4 {
+				set opts 0
+				append attrs " class=orangeshade"
+			}
+			6 {
+				append attrs " class=orangeshade"
+			}
+                }
+		if {[dict exists $pkey_tags $act]} {
+			set tag $pkey_tags($act)
+		}
+
+	}
+
+	altrow $attrs
+
+	# Checkbox
+	puts "<td><input type=checkbox class=schedselect></td>";
+
+	if {$table eq "pending"} {
+		puts "<td align=center>[$event pendingicon]</td>"
+	}
+
+	puts "<td>[$event get ulslot]</td>"
+
+	if {[$event get usLcn] ne ""} {
+		puts "
+		<td>
+			[epg channelicon [$event channel_name] 50]
+		</td>
+		<td nowrap>[$event get usLcn]<br>
+			[$event channel_name]</td>
+		"
+	} else {
+		puts "<td>&nbsp;<br><br></td><td>&nbsp;</td>"
+	}
+
+	puts "<td nowrap>
+		<a slot=[$event get ulslot] table=$table
+		href=# class=schedule>$name</a>"
+	if {
+	    ([$event get ucRecKind] == 4 && $name ne [$event folder]) ||
+	    ([$event get ucRecKind] == 1 && [$event folder] ne "")
+	} {
+		puts "<br><span class=also>&nbsp;(Folder: [$event folder])</span>"
+	}
+
+	if {$tag ne ""} {
+		puts "<br><span class=blood>&nbsp;$tag</span>"
+	}
+
+	puts "</td>"
+
+	if {$ended} {
+		set ds "[clock format $s -format {%a %d %b %Y %H:%M}]"
+		puts "<td nowrap class=va>
+			--- -- --- ---- --:--<br>
+			<span class=footnote>(Last: $ds)</span>"
+		puts "</td><td>--:--:--</td>"
+	} 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 -nonewline " blood" }
+		if {"[$event get ulslot][$event end]" in $conflicts} {
+			puts -nonewline " pinkshade"
+		}
+		puts "\">"
+
+		if {[llength $elist] > 0} {
+			lassign [lindex $elist 0] service_id start end event_id
+			if {$start == $s && $service_id in $svckeys} {
+				puts "<a class=event href=#
+				    xs=$svcmap($service_id) xe=$event_id>
+				    <span class=ds>$ds</span></a>"
+			} else {
+				puts "<span class=ds>$ds</span>"
+			}
+		} else {
+			puts "<span class=ds>$ds</span>"
+		}
+
+		if {$d > 0 && $n > $s && $n < $e} {
+			puts "<br>"
+			set perc [expr [expr $n - $s] * 100 / $d]
+			puts "<img class=va
+			    src=/images/745_1_11_Video_1REC.png>"
+			puts [progressbar $perc]
+		}
+
+		if {[llength $elist] > 1} {
+			set i 0
+			set c [llength $elist]
+			set max 5
+			foreach e $elist {
+				lassign $e service_id start end event_id
+				if {$start == $s} continue
+
+				if {[incr i] == $max} {
+					set remain $($c - $i)
+					puts "
+				<div class=\"moretoshow footnote\">
+                                    <center>
+                                    Click for $remain more...
+                                    </center>
+                                </div>
+                                <div class=\"hidden moretoshowc\">
+					"
+				} else {
+					puts "<br>"
+				}
+
+				set xcl "also"
+				if {"[$event get ulslot]${end}" in $conflicts} {
+					append xcl " pinkshade"
+				}
+
+				puts "<span class=\"$xcl\">"
+				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>"
+				  if {$service_id != [$event get hsvc]} {
+					set ch [system strip [\
+					    get_channel_attr_byhsvc \
+					    $service_id szSvcName]]
+					puts "<img width=15 src=\"[\
+					    epg channeliconpath $ch]\""
+					puts "title=\"$ch\" alt=\"$ch\">"
+				  }
+				} else {
+				  puts "[clock format $start \
+				    -format {%a %d %b %Y %H:%M}]
+				    ($service_id)<br>"
+				}
+				puts "</span>"
+			}
+			if {$i >= $max} {
+				puts "</div>"
+			}
+		}
+
+		puts "</td><td align=center>"
+		set xndur [$event get nduration]
+		if {$xndur > 0} {
+			puts "[clock format $xndur -format %H:%M]"
+		} else {
+			puts "--:--:--"
+		}
+		if {[llength $elist] > 1} {
+			set i 0
+			foreach e $elist {
+				lassign $e service_id start end event_id
+				if {$start == $s} continue
+				if {[incr i] == $max} {
+				    puts "<div class=\"hidden moretoshowc\">"
+				} else {
+				    puts "<br>"
+				}
+				puts "<span class=also>
+				    [clock format $($end - $start) \
+				    -format {%H:%M}]</span>"
+			}
+			if {$i >= $max} {
+				puts "</div>"
+			}
+		}
+
+		puts "</td>"
+	}
+
+	puts "<td nowrap>[join [$event iconset] ""]</td>"
+
+	puts "<td>"
+	if {$opts} {
+		puts "<a href=# class=smenu sid=[$event get ulslot]>
+		    <img border=0 src=/img/more_btn.gif></a>"
+	}
+	puts "</td></tr>"
+}
+
+proc eventfooter {rawlink} {
+	global num_ended
+
+	puts "</tbody></table>"
+	puts "
+		<br>
+		<button class=selall>Select All</button>
+		<button class=selnone>Select None</button>
+	"
+	if {$num_ended} {
+		puts "
+		<button class=selended>Select Finished</button>
+		"
+	}
+	puts "
+		<button class=\"delselected red\">Delete Selected
+		    <span class=delselcnt></span>
+		</button>
+		<button class=\"manual_rsv blue\">Manual Event</button>
+		<button class=rawview
+		    path=\"$rawlink\"
+		    >Raw Database</button>
+		</fieldset>
+	"
+}
+
+proc ekey {event} {
+	set ret ""
+	foreach key {ersvtype nsttime nduration hsvc usevtid} {
+		append ret ".[$event get $key]"
+	}
+	return $ret
+}
+
+set pmap {}
+set events [rsv list pending]
+set num_ended 0
+if {[llength $events] > 0} {
+	eventheader pending "Pending Actions"
+	foreach event $events {
+		eventrow $event pending
+		set pmap([ekey $event]) [$event get action]
+	}
+	eventfooter "db=rsvp.db&tab=pending"
+}
+
+set events [rsv list]
+set num_ended 0
+eventheader live "Scheduled Events"
+foreach event $events {
+	eventrow $event TBL_RESERVATION
+}
+eventfooter "db=rsv.db&tab=TBL_RESERVATION"
+
+source assets.jim
+
+puts "<div class=footnote>Conflict evaluation: $conflicttime seconds</div>"
+
+footer
+
diff --git a/webif/html/sched/list/script.js b/webif/html/sched/list/script.js
new file mode 100755
index 0000000..5c318ef
--- /dev/null
+++ b/webif/html/sched/list/script.js
@@ -0,0 +1,439 @@
+
+function list_loaded()
+{
+
+$('table.tablesorter')
+    .tablesorter({
+	theme: 'webif',
+	widthFixed: false,
+	widgets: ['zebra', 'stickyHeaders']
+    });
+
+function docancel()
+{
+	var table = $('#sdialogue').attr('table');
+	var slot = $('#sdialogue').attr('slot');
+
+	if (confirm('Really remove scheduled event?'))
+	{
+		$.get('rpc/cancel.jim?slot=' + slot +
+		    '&table=' + table, function() {
+			page_refresh();
+		});
+		$('#sdialogue').dialog('close');
+	}
+}
+
+var $buttons1 = {
+    "Close" : function() {$(this).dialog('close');}
+};
+var $buttons2 = $.extend(
+    {"Cancel Event": function() { docancel() }},
+    $buttons1);
+
+var $dialog = $('#sdialogue').dialog({
+	title: "Schedule Details",
+	modal: false, autoOpen: false,
+	height: 500, width: 700,
+	show: 'scale', hide: 'fade',
+	draggable: true, resizable: true,
+	buttons: $buttons2,
+	close: function(e,u) { $('#sdialogue').empty().html(
+	    '<img src="/img/loading.gif" alt="loading">'); }
+});
+
+function schedpopup(e, o)
+{
+	e.preventDefault();
+	var slot = o.attr('slot');
+	var table = o.attr('table');
+	$('#sdialogue').attr('slot', slot).attr('table', table);
+
+	var url = 'rpc/info.jim?slot=' + slot +
+	    '&table=' + table;
+	$('#sdialogue').load(url);
+	$dialog.dialog('open');
+}
+$('a.schedule').click(function(e) { schedpopup(e, $(this)) });
+
+$('.schedselect:checked').prop('checked', false);
+
+$('button.delselected').button({icons:{primary:"ui-icon-trash"}})
+    .button('disable')
+    .on('click', function() {
+	$(this).dojConfirmAction({
+		question: 'Delete selected?',
+		yesAnswer: 'Yes',
+		cancelAnswer: 'No'
+		}, function(el) {
+			$.blockUI({
+		message: '<h1><img src=/img/loading.gif> Deleting... </h1>'
+			});
+
+			var els = $(el).parent().find('.schedselect:checked');
+			var tab = $(els).first().closest('tr').attr('table');
+			var slots = $.map(els, function(v) {
+				return $(v).closest('tr').attr('sid');
+			});
+			$.get('rpc/cancel.jim?slot=' + slots.join(',') +
+			    '&table=' + tab, function() {
+				page_refresh();
+			});
+    });
+});
+
+$('.schedselect').on('change', function() {
+	var num = $(this).closest('table').find('.schedselect:checked').size();
+	var but = $(this).closest('fieldset').find('button.delselected');
+	if (num)
+		$(but).button('enable').find('.delselcnt')
+		    .text('(' + num + ')');
+	else
+		$(but).button('disable').find('.delselcnt').empty();
+    });
+
+$('button.selall').button({icons:{primary:"ui-icon-check"}})
+    .on('click', function() {
+	$(this).parent().find('table .schedselect').prop('checked', true)
+	    .first().trigger('change');
+    });
+
+$('button.selnone').button({icons:{primary:"ui-icon-close"}})
+    .on('click', function() {
+	$(this).parent().find('table .schedselect').prop('checked', false)
+	    .first().trigger('change');
+    });
+
+$('button.selended').button({icons:{primary:"ui-icon-stop"}})
+    .on('click', function() {
+	$(this).parent().find('table .schedselect').prop('checked', false);
+	$(this).parent().find('table tr[ended="1"] .schedselect')
+	    .prop('checked', true).first().trigger('change');
+
+    });
+
+$('button.rawview').button({icons:{primary:"ui-icon-wrench"}})
+    .on('click', function() {
+	window.location = '/db/index.jim?' + $(this).attr('path');
+    });
+
+
+// Menu
+
+var $paddialog = $('#padding').dialog({
+	title: "Padding values",
+	modal: true, autoOpen: false,
+	height: 'auto', width: 'auto',
+	show: 'scale', hide: 'fade',
+	draggable: false, resizable: false,
+	buttons: {
+	    "Confirm": function() {
+		$('#paddingf').ajaxSubmit({
+			dataType: 'text',
+			success: function(data) {
+				page_refresh();
+			}
+		});
+	    },
+	    "Cancel": function() { $(this).dialog('close'); }
+	}
+});
+
+$('#fchange').dialog({
+	autoOpen: false,
+	height: 'auto', width: 'auto',
+	modal: true,
+	buttons: {
+	    "Update": function() {
+		var s = $('#fchangeform').serialize();
+		$.get('rpc/folder.jim?' + s,
+		    function() { page_refresh(); });
+	    },
+	    "Close": function() {
+		$(this).dialog('close');
+	    }
+	},
+	close: function() {
+		$('#changeslot').val(0);
+		$('#fchangename').val('');
+	}
+});
+
+function preparemenu(el, menu)
+{
+	if (!$(el).is("tr"))
+		el = $(el).closest('tr');
+
+	table = $(el).attr('table');
+	rsvtype = $(el).attr('rsvtype');
+	reckind = $(el).attr('reckind');
+
+	if (table != 'pending' && rsvtype == 3)
+	{
+		if ($(el).attr('ar') == 1)
+			$('#optmenu').changeContextMenuItem('#ar',
+			    'Disable AR');
+		else
+			$('#optmenu').changeContextMenuItem('#ar',
+			    'Enable AR');
+		$('#optmenu').enableContextMenuItems('#ar');
+	}
+	else
+		$('#optmenu').disableContextMenuItems('#ar');
+
+	if (reckind == 4)
+		$('#optmenu').enableContextMenuItems('#mkfolder');
+	else
+		$('#optmenu').disableContextMenuItems('#mkfolder');
+
+	if (table != 'pending' && rsvtype == 3 && reckind == 4)
+		$('#optmenu').enableContextMenuItems('#refresh');
+	else
+		$('#optmenu').disableContextMenuItems('#refresh');
+		
+	if (reckind == 4)
+		$('#optmenu').enableContextMenuItems('#folder');
+	else
+		$('#optmenu').disableContextMenuItems('#folder');
+}
+
+function menuclick(action, el, pos)
+{
+	if (!$(el).is("tr"))
+		el = $(el).closest('tr');
+	var sid = $(el).attr('sid');
+	var table = $(el).attr('table');
+	//if (window.console)
+	      //console.log("Got %s, el: %o, id: %d", action, el, sid);
+
+	switch (action)
+	{   
+	    case 'delete':
+		if (confirm('Are you sure you want to delete this entry?'))
+			$.get('rpc/cancel.jim?slot=' + sid +
+			    '&table=' + table,
+			    function() {
+				page_refresh();
+			});
+		break;
+
+	    case 'ar':
+		if ($(el).attr('ar') == 1)
+		{
+			$('#paddingsid').val(sid);
+			$paddialog.dialog('open');
+		}
+		else
+			$.get('rpc/ar.jim?slot=' + sid,
+			    function() {
+				page_refresh();
+			});
+		break;
+
+	    case 'folder':
+		$('#fchangeslot').val(sid);
+		$('#fchangename').val($(el).find('a.schedule').text());
+		$('#fchangetable').val($(el).attr('table'));
+		$('#fchange').dialog('open');
+		break;
+
+	    case 'mkfolder':
+		$('#list_output')
+		    .empty()
+		    .show('slow')
+		    .load('rpc/mkdir.jim?slot=' + sid + '&table=' + table,
+			function() {
+				$('#list_output')
+				    .css('font-style', 'italic')
+				    .delay(5000).fadeOut('slow');
+		    });
+		break;
+
+	    case 'refresh':
+		if (confirm('Are you sure you want to refresh events ' +
+		    'for this entry?'))
+			$.get('rpc/refresh.jim?slot=' + sid,
+			    function() {
+				visual_reload_required = true;
+				$.growl.warning({ title: 'Success',
+				    message: "The schedule entry will be " +
+				    "refreshed." });
+				$epgpopup.dialog('close');
+				page_refresh();
+			});
+		break;
+
+	    default:
+		alert('Unhandled menu event, ' + action);
+	}
+}
+
+$('table.schedule tbody tr').hover(
+	function() { $(this).addClass('hover'); },
+	function() { $(this).removeClass('hover'); })
+	.contextMenu({menu: 'optmenu', beforeShow: preparemenu}, menuclick);
+
+$('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('rpc/cleanup.jim',
+		    function() { page_refresh(); }
+		);
+});
+
+// Manual reservation
+
+$('#manrsv').dialog({
+	autoOpen: false,
+	height: 'auto', width: 'auto',
+	modal: true,
+	buttons: {
+	    "Create event": function() {
+		var data = $('#mrform').serializeArray();
+
+		var s = $('#mrstime').timepicker('getTime',
+		    $('#mrsdate').datepicker('getDate'));
+		if (s)
+			data.push({ name: "start", value: s.getTime() / 1000});
+
+		var e = $('#mretime').timepicker('getTime',
+		    $('#mredate').datepicker('getDate'));
+		if (e)
+			data.push({ name: "end", value: e.getTime() / 1000});
+
+		if (s.getTime() >= e.getTime())
+		{
+			$('#mrerr').html('Invalid time range...');
+			return;
+		}
+
+		$('#mrerr')
+		    .html('<img src=/img/loading.gif> Creating event...');
+		
+		$.getJSON('rpc/manual.jim', data, function(d) {
+			if (d.status)
+				page_refresh();
+			else if (d.errfields)
+			{
+				d.errfields.forEach(function(item) {
+					$('#mrform input[name=' + item + ']')
+					    .addClass('error');
+				});
+				$('#mrerr').html('The start and end times '
+				    + 'must be provided.');
+			}
+			else if (d.err)
+				$('#mrerr').html(d.err);
+		});
+	    },
+	    "Cancel": function() {
+		$(this).dialog('close');
+	    }
+	}
+});
+
+$('button.manual_rsv').button({icons:{primary:"ui-icon-clock"}})
+    .on('click', function() {
+	$('#mrform').get(0).reset();
+	$('#mrform input.date').datepicker('setDate', null);
+	$('#mrform input.time').timepicker('setTime', null);
+	$('#manrsv').dialog('open');
+
+//	$("#manrsv .ui-dialog-buttonpane button:contains('Create')")
+//	    .button('disable')
+
+	if ($('#mrlcn').hasClass('blood'))
+	{
+		var $s = $('#mrlcn');
+		$.getJSON('/cgi-bin/chanlist.jim', function(data) {
+			$s.find('option').remove();
+			$.each(data, function(lcn, name) {
+				$('<option>')
+				    .val(lcn)
+				    .text(lcn + ' - ' + name)
+				    .appendTo($s);
+			});
+			$('#mrlcn').removeClass('blood');
+		});
+	}
+});
+
+$('#mrform input.time').timepicker({
+	showDuration: true,
+	timeFormat: 'g:ia',
+	step:5
+});
+
+function dayfilter(date)
+{
+	var cur = $('#mrrepeat').val();
+	if (cur < 3) return [1, ""];
+
+	var day = date.getDay();
+	if (cur == 3) // Weekdays only
+		return [(day > 0 && day < 6), ""];
+	else	// Weekends only
+		return [day == 0 || day >= 6, ""];
+}
+
+$('#mrsdate').datepicker({
+	firstDay: 1,
+	defaultDate: 0,
+	minDate: 0,
+	maxDate: "+1Y",
+	dateFormat: "D, dd/mm/yy",
+	autoclose: true,
+	beforeShowDay: dayfilter,
+	onClose: function(s) {
+		var dat = $(this).datepicker('getDate');
+		if (dat)
+			dat.setDate(dat.getDate() + 1);
+		$('#mredate')
+		    .datepicker('setDate', s)
+		    .datepicker('option', 'minDate', s)
+		    .datepicker('option', 'maxDate', dat);
+	}
+});
+
+$('#mredate').datepicker({
+	firstDay: 1,
+	defaultDate: 0,
+	minDate: 0,
+	maxDate: "+1Y",
+	autoclose: true,
+	dateFormat: "D, dd/mm/yy",
+	beforeShowDay: dayfilter
+});
+
+$('#mrrepeat').on('change', function() {
+	$('#mrform input.date').datepicker('refresh');
+});
+
+$('#mrform').datepair({
+	defaultDateDelta: null,
+	defaultTimeDelta: 3600000,
+	parseDate: function (el) {
+		var utc = new Date($(el).datepicker('getDate'));
+		return utc && new Date(utc.getTime() +
+		    (utc.getTimezoneOffset() * 60000));
+	},
+	updateDate: function (el, v) {
+		$(el).datepicker('setDate', v);
+	}
+});
+
+$('.moretoshow')
+	.hover(
+	    function() { $(this).css('cursor', 'pointer'); },
+	    function() { $(this).css('cursor', 'auto'); }
+	)
+	.on('click', function() {
+		el = $(this).closest('tr');
+		$(el).find('.moretoshow').hide();
+		$(el).find('.moretoshowc').slideDown('slow');
+	});
+
+}
+
diff --git a/webif/html/sched/ar.jim b/webif/html/sched/rpc/ar.jim
similarity index 100%
rename from webif/html/sched/ar.jim
rename to webif/html/sched/rpc/ar.jim
diff --git a/webif/html/sched/cancel.jim b/webif/html/sched/rpc/cancel.jim
similarity index 100%
rename from webif/html/sched/cancel.jim
rename to webif/html/sched/rpc/cancel.jim
diff --git a/webif/html/sched/cleanup.jim b/webif/html/sched/rpc/cleanup.jim
similarity index 99%
rename from webif/html/sched/cleanup.jim
rename to webif/html/sched/rpc/cleanup.jim
index 6eb62f6..dd42ce1 100755
--- a/webif/html/sched/cleanup.jim
+++ b/webif/html/sched/rpc/cleanup.jim
@@ -19,9 +19,7 @@ foreach event $events {
 		$event insert
 
 		system restartpending
-
 	}
-
 }
 
 footer
diff --git a/webif/html/sched/folder.jim b/webif/html/sched/rpc/folder.jim
similarity index 100%
rename from webif/html/sched/folder.jim
rename to webif/html/sched/rpc/folder.jim
diff --git a/webif/html/sched/info.jim b/webif/html/sched/rpc/info.jim
similarity index 100%
rename from webif/html/sched/info.jim
rename to webif/html/sched/rpc/info.jim
diff --git a/webif/html/sched/manual.jim b/webif/html/sched/rpc/manual.jim
similarity index 100%
rename from webif/html/sched/manual.jim
rename to webif/html/sched/rpc/manual.jim
diff --git a/webif/html/sched/mkdir.jim b/webif/html/sched/rpc/mkdir.jim
similarity index 100%
rename from webif/html/sched/mkdir.jim
rename to webif/html/sched/rpc/mkdir.jim
diff --git a/webif/html/sched/pad.jim b/webif/html/sched/rpc/pad.jim
similarity index 100%
rename from webif/html/sched/pad.jim
rename to webif/html/sched/rpc/pad.jim
diff --git a/webif/html/sched/rpc/refresh.jim b/webif/html/sched/rpc/refresh.jim
new file mode 100755
index 0000000..1f0cfd1
--- /dev/null
+++ b/webif/html/sched/rpc/refresh.jim
@@ -0,0 +1,23 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require rsv.class system.class
+
+httpheader
+
+set slots [cgi_get slot 0]
+set table [cgi_get table TBL_RESERVATION]
+
+if {$table eq "pending"} exit
+
+foreach slot [split $slots ","] {
+	set event [rsv slot $table $slot]
+
+	$event clear_ulslot
+	$event set_refresh
+	$event insert
+}
+
+system restartpending
+
diff --git a/webif/html/sched/rpc/skip.jim b/webif/html/sched/rpc/skip.jim
new file mode 100755
index 0000000..7dd4bed
--- /dev/null
+++ b/webif/html/sched/rpc/skip.jim
@@ -0,0 +1,45 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require rsv.class epg.class system.class
+
+httpheader
+
+set slots [cgi_get slot -]
+set xservice [cgi_get service 0]
+set xevent [cgi_get event 0]
+
+if {$slots eq "-"} exit
+
+foreach slot [split $slots ","] {
+puts "SLOT: $slot"
+	set event [rsv slot $slot]
+
+	lassign [epg fetch dump -service $xservice -event $xevent] epg
+
+	if {$epg eq ""} {
+		puts "!Cannot find event in EPG."
+		break
+	}
+	$epg get_channel_info
+
+	# First check to see if there is already a pending skip for this
+	# event and, if so, update that one.
+	set crid "[$epg get channel_crid][$epg get series_crid]"
+	set ev [rsv fetch pending [$event get ersvtype] \
+	    [$event get hsvc] 0 [$event get usevtid] $crid]
+	if {$ev eq "0"} {
+		# No pending event
+		puts "No pending event."
+		set ev $event
+		$ev clear_ulslot
+	}
+
+	puts "Set skip $xevent"
+	$ev set_skip $epg
+	$ev insert
+}
+
+system restartpending
+
diff --git a/webif/html/sched/script.js b/webif/html/sched/script.js
index f5f1007..1de0815 100755
--- a/webif/html/sched/script.js
+++ b/webif/html/sched/script.js
@@ -1,4 +1,14 @@
 
+var spinner = '<div class=spinner><img border=0 src=/img/loading.gif>' +
+    '&nbsp;Retrieving data... Please wait...</div>';
+
+var LIST_INDEX = 0;
+var VISUAL_INDEX = 1;
+var BACKUP_INDEX = 3;
+
+var list_reload_required = true;
+var visual_reload_required = true;
+
 $.tablesorter.addParser({
 	id: 'programme',
 	is: function () { return false; },
@@ -20,410 +30,77 @@ $.tablesorter.addParser({
 	type: 'numeric'
 });
 
+function page_refresh(msg)
+{
+	if (!msg)
+		msg = 'Refreshing page...';
+	$.blockUI({
+		message: '<h1><img src=/img/loading.gif> ' + msg + '</h1>'
+	});
+	window.location.reload(true);
+}
+
 $(function() {
 
-$('table.tablesorter')
-    .tablesorter({
-        theme: 'webif',
-	widthFixed: false,
-	widgets: ['zebra', 'stickyHeaders']
-    });
+// Retrieve the stored selected tab from the hash portion of the URL.
+var curtab = ~~(window.location.hash.slice(1));
+if (curtab < 0 || curtab > 2)
+        curtab = 0;
 
-function docancel()
-{
-	var table = $('#sdialogue').attr('table');
-	var slot = $('#sdialogue').attr('slot');
-
-	if (confirm('Really remove scheduled event?'))
-	{
-		$.get('cancel.jim?slot=' + slot +
-		    '&table=' + table, function() {
-			window.location.reload(true);
-		});
-		$('#sdialogue').dialog('close');
-	}
-}
-
-var $buttons1 = {
-    "Close" : function() {$(this).dialog('close');}
-};
-var $buttons2 = $.extend(
-    {"Cancel Event": function() { docancel() }},
-    $buttons1);
-
-var $dialog = $('#sdialogue').dialog({
-	title: "Schedule Details",
-	modal: false, autoOpen: false,
-	height: 500, width: 700,
-	show: 'scale', hide: 'fade',
-	draggable: true, resizable: true,
-	buttons: $buttons2,
-	close: function(e,u) { $('#sdialogue').empty().html(
-	    '<img src="/img/loading.gif" alt="loading">'); }
-});
-
-function schedpopup(e, o)
-{
-	e.preventDefault();
-	var slot = o.attr('slot');
-	var table = o.attr('table');
-	$('#sdialogue').attr('slot', slot).attr('table', table);
-
-	var url = 'info.jim?slot=' + slot +
-	    '&table=' + table;
-	$('#sdialogue').load(url);
-	$dialog.dialog('open');
-}
-$('a.schedule').click(function(e) { schedpopup(e, $(this)) });
-
-$('.schedselect:checked').prop('checked', false);
-
-$('button.delselected').button({icons:{primary:"ui-icon-trash"}})
-    .button('disable')
-    .on('click', function() {
-        $(this).dojConfirmAction({
-                question: 'Delete selected?',
-                yesAnswer: 'Yes',
-                cancelAnswer: 'No'
-                }, function(el) {
-			$.blockUI({
-		message: '<h1><img src=/img/loading.gif> Deleting... </h1>'
-			});
-
-			var els = $(el).parent().find('.schedselect:checked');
-			var tab = $(els).first().closest('tr').attr('table');
-			var slots = $.map(els, function(v) {
-				return $(v).closest('tr').attr('sid');
-			});
-			$.get('cancel.jim?slot=' + slots.join(',') +
-			    '&table=' + tab, function() {
-				window.location.reload(true);
-			});
-    });
-});
-
-$('.schedselect').on('change', function() {
-	var num = $(this).closest('table').find('.schedselect:checked').size();
-	var but = $(this).closest('fieldset').find('button.delselected');
-	if (num)
-		$(but).button('enable').find('.delselcnt')
-		    .text('(' + num + ')');
-	else
-		$(but).button('disable').find('.delselcnt').empty();
-    });
-
-$('button.selall').button({icons:{primary:"ui-icon-check"}})
-    .on('click', function() {
-	$(this).parent().find('table .schedselect').prop('checked', true)
-	    .first().trigger('change');
-    });
-
-$('button.selnone').button({icons:{primary:"ui-icon-close"}})
-    .on('click', function() {
-	$(this).parent().find('table .schedselect').prop('checked', false)
-	    .first().trigger('change');
-    });
-
-$('button.selended').button({icons:{primary:"ui-icon-stop"}})
-    .on('click', function() {
-	$(this).parent().find('table .schedselect').prop('checked', false);
-	$(this).parent().find('table tr[ended="1"] .schedselect')
-	    .prop('checked', true).first().trigger('change');
-
-    });
-
-$('button.rawview').button({icons:{primary:"ui-icon-wrench"}})
-    .on('click', function() {
-	window.location = '/db/index.jim?' + $(this).attr('path');
-    });
-
-$('button.backup').button({icons:{primary:"ui-icon-disk"}})
-    .on('click', function() {
-	window.location = '/backup/index.jim';
-    });
-
-
-// Menu
-
-var $paddialog = $('#padding').dialog({
-	title: "Padding values",
-	modal: true, autoOpen: false,
-	height: 'auto', width: 'auto',
-	show: 'scale', hide: 'fade',
-	draggable: false, resizable: false,
-	buttons: {
-	    "Confirm": function() {
-		$('#paddingf').ajaxSubmit({
-			dataType: 'text',
-			success: function(data) {
-				window.location.reload(true);
-			}
-		});
-	    },
-	    "Cancel": function() { $(this).dialog('close'); }
-	}
-});
-
-$('#fchange').dialog({
-	autoOpen: false,
-	height: 'auto', width: 'auto',
-	modal: true,
-	buttons: {
-	    "Update": function() {
-		var s = $('#fchangeform').serialize();
-		$.get('folder.jim?' + s,
-		    function() { window.location.reload(true); });
-	    },
-	    "Close": function() {
-		$(this).dialog('close');
-	    }
+$('#minimaltabbar').tabs({
+	active: curtab,
+	heightStyle: "auto",
+        spinner: spinner,
+	create: function(event, ui) {
+		$(ui.panel).html(spinner);
 	},
-	close: function() {
-		$('#changeslot').val(0);
-		$('#fchangename').val('');
-	}
-});
-
-function preparemenu(el, menu)
-{
-	if (!$(el).is("tr"))
-		el = $(el).closest('tr');
-
-	if ($(el).attr('table') != 'pending' && $(el).attr('rsvtype') == 3)
-	{
-		if ($(el).attr('ar') == 1)
-			$('#optmenu').changeContextMenuItem('#ar',
-			    'Disable AR');
-		else
-			$('#optmenu').changeContextMenuItem('#ar',
-			    'Enable AR');
-		$('#optmenu').enableContextMenuItems('#ar');
-	}
-	else
-		$('#optmenu').disableContextMenuItems('#ar');
-
-	if ($(el).attr('reckind') == 4)
-		$('#optmenu').enableContextMenuItems('#mkfolder');
-	else
-		$('#optmenu').disableContextMenuItems('#mkfolder');
-
-//	if ($(el).attr('table') != 'pending' && $(el).attr('reckind') == 4)
-	if ($(el).attr('reckind') == 4)
-		$('#optmenu').enableContextMenuItems('#folder');
-	else
-		$('#optmenu').disableContextMenuItems('#folder');
-}
-
-function menuclick(action, el, pos)
-{
-	if (!$(el).is("tr"))
-		el = $(el).closest('tr');
-	var sid = $(el).attr('sid');
-	var table = $(el).attr('table');
-	//if (window.console)
-	      //console.log("Got %s, el: %o, id: %d", action, el, sid);
-
-	switch (action)
-	{   
-	    case 'delete':
-		if (confirm('Are you sure you want to delete this entry?'))
-			$.get('cancel.jim?slot=' + sid +
-			    '&table=' + table,
-			    function() {
-				window.location.reload(true);
-			});
-		break;
-
-	    case 'ar':
-		if ($(el).attr('ar') == 1)
-		{
-			$('#paddingsid').val(sid);
-			$paddialog.dialog('open');
-		}
-		else
-			$.get('ar.jim?slot=' + sid,
-			    function() {
-				window.location.reload(true);
-			});
-		break;
-
-	    case 'folder':
-		$('#fchangeslot').val(sid);
-		$('#fchangename').val($(el).find('a.schedule').text());
-		$('#fchangetable').val($(el).attr('table'));
-		$('#fchange').dialog('open');
-		break;
-
-	    case 'mkfolder':
-		$('#output')
-                    .empty()
-                    .show('slow')
-                    .load('mkdir.jim?slot=' + sid + '&table=' + table,
-                        function() {
-                                $(output)
-                                    .css('font-style', 'italic')
-                                    .delay(5000).fadeOut('slow');
-                    });
-		break;
-
-	    default:
-		alert('Unhandled menu event, ' + action);
-	}
-}
-
-$('table.schedule tbody tr').hover(
-	function() { $(this).addClass('hover'); },
-	function() { $(this).removeClass('hover'); })
-	.contextMenu({menu: 'optmenu', beforeShow: preparemenu}, menuclick);
-
-$('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);
-		});
-});
-
-// Manual reservation
-
-$('#manrsv').dialog({
-	autoOpen: false,
-	height: 'auto', width: 'auto',
-	modal: true,
-	buttons: {
-	    "Create event": function() {
-		var data = $('#mrform').serializeArray();
-
-		var s = $('#mrstime').timepicker('getTime',
-		    $('#mrsdate').datepicker('getDate'));
-		if (s)
-			data.push({ name: "start", value: s.getTime() / 1000});
-
-		var e = $('#mretime').timepicker('getTime',
-		    $('#mredate').datepicker('getDate'));
-		if (e)
-			data.push({ name: "end", value: e.getTime() / 1000});
-
-		if (s.getTime() >= e.getTime())
-		{
-			$('#mrerr').html('Invalid time range...');
-			return;
-		}
-
-		$('#mrerr')
-		    .html('<img src=/img/loading.gif> Creating event...');
-		
-		$.getJSON('manual.jim', data, function(d) {
-			if (d.status)
-				window.location.reload(true);
-			else if (d.errfields)
-			{
-				d.errfields.forEach(function(item) {
-					$('#mrform input[name=' + item + ']')
-					    .addClass('error');
-				});
-				$('#mrerr').html('The start and end times '
-				    + 'must be provided.');
-			}
-			else if (d.err)
-				$('#mrerr').html(d.err);
-		});
-	    },
-	    "Cancel": function() {
-		$(this).dialog('close');
-	    }
-	}
-});
-
-$('button.manual_rsv').button({icons:{primary:"ui-icon-clock"}})
-    .on('click', function() {
-	$('#mrform').get(0).reset();
-	$('#mrform input.date').datepicker('setDate', null);
-	$('#mrform input.time').timepicker('setTime', null);
-	$('#manrsv').dialog('open');
-
-//	$("#manrsv .ui-dialog-buttonpane button:contains('Create')")
-//	    .button('disable')
-
-	if ($('#mrlcn').hasClass('blood'))
-	{
-		var $s = $('#mrlcn');
-		$.getJSON('/cgi-bin/chanlist.jim', function(data) {
-			$s.find('option').remove();
-			$.each(data, function(lcn, name) {
-				$('<option>')
-				    .val(lcn)
-				    .text(lcn + ' - ' + name)
-				    .appendTo($s);
-			});
-			$('#mrlcn').removeClass('blood');
-		});
-	}
-});
-
-$('#mrform input.time').timepicker({
-	showDuration: true,
-	timeFormat: 'g:ia',
-	step:5
-});
-
-function dayfilter(date)
-{
-	var cur = $('#mrrepeat').val();
-	if (cur < 3) return [1, ""];
-
-	var day = date.getDay();
-	if (cur == 3) // Weekdays only
-		return [(day > 0 && day < 6), ""];
-	else	// Weekends only
-		return [day == 0 || day >= 6, ""];
-}
-
-$('#mrsdate').datepicker({
-	firstDay: 1,
-	defaultDate: 0,
-	minDate: 0,
-	maxDate: "+1Y",
-	dateFormat: "D, dd/mm/yy",
-	autoclose: true,
-	beforeShowDay: dayfilter,
-	onClose: function(s) {
-		var dat = $(this).datepicker('getDate');
-		if (dat)
-			dat.setDate(dat.getDate() + 1);
-		$('#mredate')
-		    .datepicker('setDate', s)
-		    .datepicker('option', 'minDate', s)
-		    .datepicker('option', 'maxDate', dat);
-	}
-});
-
-$('#mredate').datepicker({
-	firstDay: 1,
-	defaultDate: 0,
-	minDate: 0,
-	maxDate: "+1Y",
-	autoclose: true,
-	dateFormat: "D, dd/mm/yy",
-	beforeShowDay: dayfilter
-});
-
-$('#mrrepeat').on('change', function() {
-	$('#mrform input.date').datepicker('refresh');
-});
-
-$('#mrform').datepair({
-	defaultDateDelta: null,
-	defaultTimeDelta: 3600000,
-	parseDate: function (el) {
-		var utc = new Date($(el).datepicker('getDate'));
-		return utc && new Date(utc.getTime() +
-		    (utc.getTimezoneOffset() * 60000));
+	activate: function(event, ui) {
+		window.location.hash = ui.newTab.index();
 	},
-	updateDate: function (el, v) {
-		$(el).datepicker('setDate', v);
+	beforeLoad: function (event, ui) {
+
+		var content = $(ui.panel).html();
+
+		switch (ui.tab.index())
+		{
+		    case LIST_INDEX:
+			if (list_reload_required)
+				content = false;
+			break;
+		    case VISUAL_INDEX:
+			if (visual_reload_required)
+				content = false;
+			break;
+		    case BACKUP_INDEX:
+			break;
+		    default:
+			alert('Unknown tab just loaded.');
+		}
+		// Don't reload if content exists.
+		if (content)
+			event.preventDefault();
+		else
+		{
+			list_reload_required = false;
+			visual_reload_required = false;
+			$(ui.panel).html(spinner);
+		}
+        },
+	load: function(event, ui) {
+		switch (ui.tab.index())
+		{
+		    case LIST_INDEX:
+			list_loaded(ui.panel);
+			break;
+		    case VISUAL_INDEX:
+			visual_loaded(ui.panel);
+			break;
+		    case BACKUP_INDEX:
+			backup_loaded(ui.panel);
+			break;
+		    default:
+			alert('Unknown tab just loaded.');
+		}
 	}
 });
 
diff --git a/webif/html/sched/visual/assets.jim b/webif/html/sched/visual/assets.jim
new file mode 100755
index 0000000..41bec3a
--- /dev/null
+++ b/webif/html/sched/visual/assets.jim
@@ -0,0 +1,10 @@
+#!/mod/bin/jimsh
+
+puts {
+<div id=epgpopup></div>
+
+<ul id=optmenu class=contextMenu style="width: 200px">
+        <li class=separator><a href=#refresh>Refresh Events</a></li>
+</ul>
+}
+
diff --git a/webif/html/sched/visual/index.jim b/webif/html/sched/visual/index.jim
new file mode 100755
index 0000000..307b914
--- /dev/null
+++ b/webif/html/sched/visual/index.jim
@@ -0,0 +1,456 @@
+#!/mod/bin/jimsh
+
+package require cgi
+source /mod/webif/lib/setup
+require rsv.class epg.class system.class classdump
+
+set debug 0
+
+noheader
+set renderstart [clock milliseconds]
+
+set events [rsv allevents]
+set pending [rsv list pending]
+
+# hSvc -> usSvcId map
+lmap i \
+    [$::channeldb query {select hSvc, usSvcid from TBL_SVC}] \
+    {
+	set hmap([lindex $i 1]) [lindex $i 3]
+    }
+
+# usSvcId -> hSvc map
+#set svcmap [lreverse $hmap]
+
+proc pop_event {{debug 0}} {
+	uplevel {
+		lassign [lindex $events $eindex] \
+		    start end hsvc eid slotid kind sclass
+		incr eindex
+		if {$debug} {
+			puts "
+			--------------------------------------------------
+			EVENT$eindex
+			START:  $start [clock format $start]
+			END:    $end [clock format $end]
+			HSVC:   $hsvc
+			EID:    $eid
+			SID:    $slotid
+			KIND:   $kind
+			SCLASS: $sclass
+			"
+		}
+	}
+}
+
+set pendingclasses {
+	1    "pending-unschedule"
+	2    "pending-ar"
+	3    "pending-ar"
+	4    "pending-folder"
+	5    "pending-skip"
+	6    "pending-refresh"
+}
+
+foreach p $pending {
+	set action [$p get action]
+
+	# Add - already handled.
+	if {$action eq "0"} continue
+
+	set s [rsv fetch "TBL_RESERVATION" \
+	    [$p get ersvtype] [$p get hsvc] 0 [$p get usevtid]]
+
+	if {$s eq "0"} continue
+
+	set slot [$s get ulslot]
+
+	set elen [llength $events]
+	set eindex 0
+	while {$eindex < $elen} {
+		pop_event 1
+
+		if {$slotid ne [$s get ulslot]} continue
+
+		if {$action eq "5" && $start != [$p start]} continue
+		lset events $($eindex - 1) 6 $pendingclasses($action)
+	}
+}
+
+#foreach ev $events {
+#	puts $ev
+#}
+
+# Event array keys:
+#      0:      start
+#      1:      end
+#      2:      hSvc
+#      3:      event_id
+#      4:      Schedule Slot ID
+#      5:      ucRecKind
+#      6:      class (live, pending)
+
+# Sort final events array
+set events [lsort -index 0 -integer $events]
+
+######################################################################
+# Visualisation functions
+
+# Intend 40 pixels / hour for fully populated timeline.
+set width $(40 * 24)
+# This is the total padding/margin/border width.
+set pad 4
+set padadj 0
+
+# Returns an absolute number of pixels from the left corresponding
+# to a number of seconds into the day.
+proc secstopx {daysecs hourpx usedhours} {
+	# No floor() in Humax jim
+	#set max [expr floor($daysecs / 3600)]
+	set max [expr int($daysecs / 3600)]
+	# Subtract any unused hours from $daysecs.
+	for {set i 0} {$i < $max} {incr i} {
+		if {$i >= 24} break
+		if {![lindex $usedhours $i]} {
+			incr daysecs -3600
+		}
+	}
+	#return [expr floor($daysecs / 3600 * $hourpx)]
+	return [expr int($daysecs * $hourpx / 3600)]
+}
+
+# daysecs - absolute number of seconds into the day that needs to be reached.
+# pxpos   - current pixel position.
+proc showpad {daysecs hourpx &pxpos usedhours} {
+	global debug pad padadj
+
+	# Determine required pixel position.
+	set newpos [set p [secstopx $daysecs $hourpx $usedhours]]
+
+	# Calculate required width of spacer
+	incr p -$pxpos
+
+	# Account for padding and any pending adjustment
+	incr p $(-($pad + $padadj))
+
+	if {$p <= 0} {
+		# If too narrow, show bare skip at full required width.
+		incr p $($pad + $padadj)
+		# Bare skip
+		set class "ct_bskip"
+	} else {
+		set class "ct_skip"
+		if {$debug} { append class " ct_debug" }
+	}
+
+	if {$p > 0} {
+		puts -nonewline \
+		    "<div class=\"$class\" style=\"width: ${p}px;\">"
+		if {$debug} {
+			puts [format "@%d-%d s=%d w=%dpx @%dpx" \
+			    $pxpos $padadj $daysecs $p $newpos]
+		}
+		puts -nonewline "</div>"
+		set pxpos $newpos
+		set padadj 0
+	}
+}
+
+proc showevent {s class &overflow &tomorrow &pxpos start end usedhours daystart dayend hourpx service event sclass} {
+
+	global debug pad padadj dev
+
+	# Required pixel position of event start.
+	set p [secstopx $($start - $daystart) $hourpx $usedhours]
+
+	if {$p < $pxpos} {
+		# Backwards move => tuner conflict.
+		lappend overflow [list $s $start $end $service $event $sclass]
+		return
+	}
+
+	# Show padding up to event.
+	showpad $($start - $daystart) $hourpx pxpos $usedhours
+
+	# And now the event itself.
+
+	set name [set channel "Unknown"]
+	set slotid -1
+	if {$s ne "0"} {
+		set name [$s name]
+		set channel [$s channel_name]
+		set slotid [$s get ulslot]
+	}
+	if {$service > 0} {
+		set epgs [epg dbfetch dump -service $service -event $event]
+		if {[llength $epgs] == 1} {
+			lassign $epgs epg
+			set name [$epg get name]
+			$epg get_channel_info
+			set channel [$epg get channel_name]
+		}
+	}
+
+	if {[string match -nocase "New:*" $name]} {
+		set name [string trim [string range $name 4 end]]
+	}
+	set name [cgi_quote_html $name]
+
+	if {$sclass == "pending"} {
+		append class " purpleshade"
+	} elseif {$sclass == "pending-unschedule" ||
+		  $sclass == "pending-skip"} {
+		append class " strike purpleshade"
+	} elseif {[string match "*pending*" $sclass]} {
+		append class " orangeshade"
+	}
+
+	if {$end > $dayend + 1} {
+		# Push event into tomorrow.
+		if {$s ne "0"} { $s setorigstart $start }
+		lappend tomorrow [list $s $($dayend + 1) $end \
+		    $service $event $sclass]
+		set newpos [set p [secstopx 86400 $hourpx $usedhours]]
+		append name "..."
+	} else {
+		set newpos [set p [\
+		    secstopx $($end - $daystart) $hourpx $usedhours]]
+		if {$start == $daystart && $s ne "0" &&
+		    [$s get _origstart] > 0} {
+			set name "..$name"
+			set start [$s get _origstart]
+			$s setorigstart 0
+		}
+	}
+
+	# Calculate width
+	incr p -$pxpos
+
+	# Account for padding
+	incr p -$pad
+
+	if {$p < 8} {
+		# Event too narrow, force to 8 pixels.
+		set padadj $(8 - $p)
+		set p 8
+	} else {
+		set padadj 0
+	}
+
+	puts -nonewline "<div class=\"$class ct_event\" style=\"width: ${p}px;\" sid=\"${slotid}\" sclass=\"$sclass\" period=\"[clock format $start -format {%H:%M}] - [clock format $end -format {%H:%M}]\" xs=$service xe=$event"
+	if {$s ne "0"} {
+		puts -nonewline " rc=\"[$s get ucRecKind]\" et=\"[$s get ersvtype]\" rt=\"[$s get erepeat]\""
+		if {[$s get szCRID] ne ""} {
+			puts " crid=\"[$s get szCRID]\""
+		}
+	}
+	puts -nonewline " sz=\"[cgi_quote_html $channel]\""
+	puts -nonewline ">"
+
+	if {$debug} {
+		puts -nonewline [format "@%d s=%d w=%dpx @%dpx /=%d" \
+		    $pxpos $($end - $start) $p $newpos $padadj]
+	}
+
+	puts -nonewline "$name</div>"
+
+	set pxpos $newpos
+}
+
+proc render_timeline {usedhours} {
+	global debug events width pad hmap padadj
+
+	puts "<div class=ct_visual>\n"
+
+	set tothours [ladd $usedhours]
+
+	if {!$tothours} {
+		puts "No schedule data found."
+		return
+	}
+
+	# calculate pixels per hour
+	#set hourpx [expr floor($width / $tothours)]
+	set hourpx [expr int($width / $tothours)]
+
+	if {$debug} {
+		puts "USEDHOURS: $usedhours<br>\n"
+		puts "HOURPX: $hourpx (tothours: $tothours)<br>\n"
+	}
+
+	# Show the hour bar.
+	puts "<div class=ct_header><div class=ct_row>"
+	puts "<div class=ct_dayname>&nbsp;</div>"
+	# Account for element padding and margin
+	set px $($hourpx - $pad)
+	for {set i 0} {$i < 25} {incr i} {
+		if {[lindex $usedhours $i] ne "1"} continue
+		puts -nonewline \
+		    "<div class=ct_hour style=\"width:${px}px\"><center>[\
+		    format "%02dh" $i]</center></div>"
+	}
+	puts "</div></div>\n"
+
+	# To store events which overflow into tomorrow.
+	set tomorrow {}
+
+	# Midnight today.
+	set day [clock scan \
+	    [clock format [clock seconds] -format "%Y:%m:%d:0:0:0"] \
+	    -format "%Y:%m:%d:%T"]
+
+	set elength [llength $events]
+	set eindex 0
+	set start 0
+	while {$start < $day} { pop_event }
+	
+	for {set i 0} {$i < 8} {incr i} {
+		# To store things that need to move to the next row.
+		set rows {}
+
+		if {$i % 2} {
+			set class "odd"
+		} else {
+			set class "even"
+		}
+		set eclass "blueshade"
+
+		set dayend [set daystart $day]
+		incr dayend 86399
+
+		# Row 1
+		puts "<div class=\"ct_day $class\">"
+		puts "<div class=\"ct_row\">"
+
+		puts "<div class=ct_dayname>[clock format $day \
+		    -format {%a %d/%m/%Y}]</div>"
+
+		set pxpos [set padadj 0]
+
+		if {[llength $tomorrow]} {
+			set dummy {}
+			foreach row $tomorrow {
+				lassign $row s xstart xend xs xe xsclass
+				showevent $s $eclass rows dummy \
+				    pxpos $xstart $xend $usedhours \
+				    $daystart $dayend $hourpx \
+				    $xs $xe $xsclass
+			}
+
+			set tomorrow {}
+		}
+
+		while {$start >= $daystart && $start <= $dayend} {
+			if {$slotid ne "-1"} {
+				set tab "TBL_RESERVATION"
+				if {$sclass eq "pending"} {
+					set tab "pending"
+				}
+				set s [rsv slot $tab $slotid]
+			} else {
+				set s "0"
+			}
+
+			if {[dict exists $hmap $hsvc]} {
+				set service $hmap($hsvc)
+			} else {
+				set service 0
+			}
+
+			showevent $s $eclass rows tomorrow pxpos \
+			    $start $end $usedhours \
+			    $daystart $dayend $hourpx \
+			    $service $eid $sclass
+
+			pop_event
+		}
+
+		# Close row
+		showpad 86400 $hourpx pxpos $usedhours
+		puts "</div>"
+
+		# Output other rows if necessary
+		while {[llength $rows]} {
+			set nrows {}
+			puts "<div class=\"ct_row $class\"><div class=ct_dayname></div>"
+			set pxpos [set padadj 0]
+			foreach row $rows {
+				lassign $row s xstart xend xs xe xsclass
+				showevent $s $eclass nrows tomorrow \
+				    pxpos $xstart $xend $usedhours \
+				    $daystart $dayend $hourpx \
+				    $xs $xe $xsclass
+			}
+			showpad 86400 $hourpx pxpos $usedhours
+			puts "</div>"
+			set rows $nrows
+			set eclass "pinkshade"
+		}
+
+		incr day 86400
+		# Close ct_day
+		puts "</div>"
+	}
+
+	puts "\n</div>\n"
+}
+
+######################################################################
+# Compressed Day Schedule Visualisation
+
+set usedhours [lrepeat 24 0]
+
+# Determine which hours are usde.
+foreach e $events {
+	lassign $e start end
+	set shour [clock format $start -format "%H"]
+	set ehour [clock format $end -format "%H"]
+	if {$ehour < $shour} {
+		incr ehour 24
+	}
+	for {set i $shour} {$i <= $ehour} {incr i} {
+		set index $i
+		if {$i > 23} { incr index -24 }
+		lset usedhours $index 1
+	}
+}
+
+# To show 24 hours
+# set usedhours [lrepeat 24 1]
+
+puts "
+<fieldset id=sched_timeline class=visual>
+<legend>
+        <h3>Schedule</h3>
+</legend>
+"
+
+render_timeline $usedhours
+
+puts "</fieldset>"
+
+puts {
+<div id=legend>
+<h3 style="display: inline-block">Key:</h3>
+<div class="ct_key blueshade">
+        Scheduled event
+</div>
+<div class="ct_key pinkshade">
+        Conflict
+</div>
+<div class="ct_key orangeshade">
+        Pending change
+</div>
+<div class="ct_key purpleshade">
+        Pending <b>schedule</b>
+</div>
+<div class="ct_key purpleshade strike">
+        Pending <b>unschedule</b>
+</div>
+</div>
+}
+
+source assets.jim
+
+footer
+
diff --git a/webif/html/sched/visual/script.js b/webif/html/sched/visual/script.js
new file mode 100644
index 0000000..43a50ba
--- /dev/null
+++ b/webif/html/sched/visual/script.js
@@ -0,0 +1,414 @@
+
+var visual_notes = {
+    'pending': 'Pending schedule command',
+    'pending-unschedule': 'Pending unschedule',
+    'pending-folder': 'Pending folder change',
+    'pending-ar': 'Pending padding change',
+    'pending-refresh': 'Pending refresh',
+    'pending-skip': 'Pending episode skip'
+};
+
+function visual_loaded()
+{
+
+$epgpopup = $('#epgpopup').dialog({
+	title: "Programme Details",
+	modal: false, autoOpen: false,
+	height: 500, width: 700,
+	show: 'scale', hide: 'fade',
+	draggable: true, resizable: true,
+	buttons: [
+	    {
+		text: 'Cancel Entire Recording',
+		id: 'b_cancel',
+		class: 'ep_button',
+		icons: { primary: "ui-icon-trash" },
+		click: cancel_recording
+	    },
+	    {
+		text: 'Skip This Episode',
+		id: 'b_skip',
+		class: 'ep_button',
+		icons: { primary: "ui-icon-seek-next" },
+		click: skip_episode
+	    },
+	    {
+		text: 'Record This Showing Instead',
+		id: 'b_alternate',
+		class: 'ep_button',
+		icons: { primary: "ui-icon-transfer-e-w" },
+		click: alternate_recording
+	    },
+	    {
+		text: 'Switch to This Series',
+		id: 'b_alternateseries',
+		class: 'ep_button',
+		icons: { primary: "ui-icon-shuffle" },
+		click: alternate_series
+	    },
+	    {
+		text: 'More',
+		id: 'b_more',
+		class: 'ep_button',
+		icons: { primary: "ui-icon-arrowthick-1-s" },
+		click: function(e) { e.preventDefault(); }
+	    },
+	    {
+		text: 'Close',
+		icons: { primary: "ui-icon-close" },
+		click: function() { $(this).dialog('close'); }
+	    },
+	]
+});
+
+function cancel_recording()
+{
+	$('#b_cancel').dojConfirmAction({
+		question: 'Cancel Recording?',
+		yesAnswer: 'Yes',
+		cancelAnswer: 'No'
+		}, function(el) {
+			var sid = $epgpopup.attr('sid');
+			$.get('rpc/cancel.jim?slot=' + sid,
+			    function() {
+				$('.ct_event[sid=' + sid + ']')
+				    .attr('sclass', 'pending-unschedule')
+				    .addClass('purpleshade strike');
+				$epgpopup.dialog('close');
+				$.growl.error({ title: 'Success',
+				    message:
+				    "The recording has been cancelled." });
+				list_reload_required = true;
+			});
+	});
+}
+
+function skip_episode()
+{
+	$('#b_skip').dojConfirmAction({
+		question: 'Skip Episode?',
+		yesAnswer: 'Yes',
+		cancelAnswer: 'No'
+		}, function(el) {
+			var sid = $epgpopup.attr('sid');
+			var xs = $epgpopup.attr('xs');
+			var xe = $epgpopup.attr('xe');
+			$.get('rpc/skip.jim?slot=' + sid +
+			    '&service=' + xs + '&event=' + xe,
+			    function() {
+				$('.ct_event[sid=' + sid + ']')
+				    .filter('[xe=' + xe + ']')
+				    .attr('sclass', 'pending-skip')
+				    .addClass('purpleshade strike');
+				$epgpopup.dialog('close');
+				$.growl.warning({ title: 'Success',
+				    message: "The episode will be skipped." });
+				list_reload_required = true;
+			});
+	});
+}
+
+function alternate_series()
+{
+	$('#b_alternateseries').dojConfirmAction({
+		question: 'Switch Series?',
+		yesAnswer: 'Yes',
+		cancelAnswer: 'No'
+		}, function(el) {
+
+//////////////////////////////////////////////////////////////////////
+
+var sid = $epgpopup.attr('sid');
+var xs = $epgpopup.attr('xs');
+var xe = $epgpopup.attr('xe');
+var reckind = $epgpopup.attr('reckind');
+
+if (reckind != 4)
+{
+	alert('Not a series!');
+	return;
+}
+
+$.blockUI({message: '<h1><img src=/img/loading.gif> ' +
+    'Re-scheduling series... </h1>'});
+
+$.get('/cgi-bin/epg/schedule.jim?type=2&service=' + xs + '&event=' + xe,
+    function() {
+	$.growl.notice({ title: 'Success', message: "Scheduled new series." });
+	$.get('rpc/cancel.jim?slot=' + sid, function() {
+		$epgpopup.dialog('close');
+		$('.ct_event[sid=' + sid + ']')
+		    .addClass('purpleshade strike');
+		$.unblockUI();
+		$.growl.error({ title: 'Success',
+		    message: "Unscheduled old series." });
+		page_refresh();
+	});
+});
+
+//////////////////////////////////////////////////////////////////////
+
+	});
+}
+
+function alternate_recording()
+{
+	$('#b_alternate').dojConfirmAction({
+		question: 'Move Recording?',
+		yesAnswer: 'Yes',
+		cancelAnswer: 'No'
+		}, function(el) {
+
+//////////////////////////////////////////////////////////////////////
+
+var sid = $epgpopup.attr('sid');
+var xs = $epgpopup.attr('xs');
+var xe = $epgpopup.attr('xe');
+var oxs = $epgpopup.attr('oxs');
+var oxe = $epgpopup.attr('oxe');
+var reckind = $epgpopup.attr('reckind');
+
+// If it's a one-off event, schedule the new one and then cancel the old.
+
+if (reckind != 4)
+{
+	$.blockUI({message: '<h1><img src=/img/loading.gif> ' +
+	    'Re-scheduling one-off event... </h1>'});
+
+	$.get('/cgi-bin/epg/schedule.jim?type=1&service=' + xs + '&event=' + xe,
+	    function() {
+		$.growl.notice({ title: 'Success',
+		    message: "Scheduled replacement event." });
+		$.get('rpc/cancel.jim?slot=' + sid, function() {
+			$epgpopup.dialog('close');
+			$('.ct_event[sid=' + sid + ']')
+			    .attr('sclass', 'pending-unschedule')
+			    .addClass('purpleshade strike');
+			$.unblockUI();
+			$.growl.error({ title: 'Success',
+			    message: "Unscheduled original event." });
+			page_refresh();
+		});
+	});
+}
+else
+{
+	$.blockUI({message: '<h1><img src=/img/loading.gif> ' +
+	    'Re-scheduling series event... </h1>'});
+
+	$.get('/cgi-bin/epg/schedule.jim?type=1&service=' + xs + '&event=' + xe,
+	    function() {
+		$.growl.notice({ title: 'Success',
+		    message: "Scheduled replacement event." });
+		$.get('rpc/skip.jim?slot=' + sid +
+		    '&service=' + oxs + '&event=' + oxe, function() {
+			$epgpopup.dialog('close');
+			$('.ct_event[sid=' + sid + ']')
+			    .attr('sclass', 'pending-skip')
+			    .addClass('purpleshade strike');
+			$.unblockUI();
+			$.growl.warning({ title: 'Success',
+			    message: "Skipped unwanted episode." });
+			page_refresh();
+		});
+	});
+}
+
+//////////////////////////////////////////////////////////////////////
+
+	});
+
+}
+
+function menuclick(action, el, pos)
+{
+	var sid = $epgpopup.attr('sid');
+
+	switch (action)
+	{
+            case 'refresh':
+		if (confirm('Are you sure you want to refresh events ' +
+		    'for this entry?'))
+			$.get('rpc/refresh.jim?slot=' + sid,
+			    function() {
+				$('.ct_event[sid=' + sid + ']')
+				    .attr('sclass', 'pending-refresh')
+				    .addClass('orangeshade');
+				$.growl.warning({ title: 'Success',
+				    message: "The schedule entry will be " +
+				    "refreshed." });
+				$epgpopup.dialog('close');
+				list_reload_required = true;
+			});
+		break;
+	}
+}
+
+function update_buttons(xs, xe)
+{
+	var oxs = $epgpopup.attr('oxs');
+	var oxe = $epgpopup.attr('oxe');
+	var sid = $epgpopup.attr('sid');
+	var reckind = $epgpopup.attr('reckind');
+	var ocrid = $epgpopup.attr('crid');
+	var sclass = $epgpopup.attr('sclass');
+	var crid = $.trim($epgpopup.find('span.scrid').text());
+
+	if (sid == 0 || sclass != 'tbl_reservation')
+	{
+		$('.ep_button').hide();
+		return;
+	}
+
+	$('#b_more').show().contextMenu({
+		menu: 'optmenu',
+		leftButton: true,
+		position: {
+                    my: "center top",
+                    at: "center bottom+5",
+                    of: $('#b_more'),
+                    collision: "fit"
+		}
+	}, menuclick);
+
+	if (oxs == xs && oxe == xe)
+	{
+		// Viewing original event.
+		$('#b_alternate,#b_alternateseries').hide();
+		$('#b_cancel').show();
+		if (reckind == 4)
+			$('#b_skip').show();
+		else
+			$('#b_skip').hide();
+	}
+	else
+	{
+		// Viewing alternate event.
+		$('#b_alternate').show();
+		$('#b_cancel,#b_skip').hide();
+		if (reckind == 4 &&crid.toLowerCase() != ocrid.toLowerCase())
+			$('#b_alternateseries').show();
+		else
+			$('#b_alternateseries').hide();
+	}
+}
+
+function epgpopup(e, o, first)
+{
+	if (e)
+		e.preventDefault();
+	var xs = o.attr('xs');
+	var xe = o.attr('xe');
+
+	if (!xs || xs == 0 || !xe || xe == 0)
+		return;
+
+	if (first)
+		$epgpopup.attr('oxs', xs).attr('oxe', xe);
+	
+	var url = '/cgi-bin/epg/info.jim?bare&service=' + xs + '&event=' + xe +
+	    '&bare=1';
+	$epgpopup
+	    .empty().html('<img src="/img/loading.gif" alt="loading"> ' +
+	    'Retrieving details...')
+	    .load(url, function() {
+		update_buttons(xs, xe);
+		$epgpopup.find('a.event').on('click', function(e) {
+			epgpopup(e, $(this));
+		});
+	    })
+	    .attr('xs', xs)
+	    .attr('xe', xe)
+	    .dialog('open');
+}
+
+$('.ct_event, .ct_debug')
+	.hover(
+	    function() { $(this).css('cursor', 'pointer'); },
+	    function() { $(this).css('cursor', 'auto'); }
+	)
+	.qtip({
+		position: {
+			my: 'bottom center',
+			at: 'top center',
+			viewport: $(window)
+		},
+		style: {
+			classes: 'qtip-rounded qtip-shadow'
+		},
+		content: {
+			title: function() {
+				var reckind = $(this).attr('rc');
+				var rsvtype = $(this).attr('et');
+				var repeat = $(this).attr('rt');
+				var channel = $(this).attr('sz');
+				var period = $(this).attr('period');
+				var s = '';
+
+				schedule_icons(~~reckind, ~~rsvtype, ~~repeat)
+				    .forEach(function(item, index) {
+					s += '<img class=visualicon '
+					    + 'src=/images/'
+					    + item + '.png>';
+				});
+				return "<span>" + s +
+				    '<img class=visualicon ' +
+				    'src="/img/channels/out/' +
+				    channel + '.png"></span> ' +
+				    "<span>" + channel +
+				    ' (' + period + ')</span>';
+			},
+			text:  function() {
+				var t = '<center>' + $(this).html();
+				var s = $(this).attr('sclass');
+
+				x = visual_notes[s];
+
+				if (x)
+					t += '<div class=blood>' + x + '</div>';
+				else if ($(this).hasClass('strike') ||
+				    $(this).hasClass('orangeshade'))
+					t += '<div class=blood>' +
+					    'Changes pending</div>';
+
+				t += '</center>';
+				return t;
+			}
+		},
+		events: {
+			show: function(event, api) {
+				var sid = api.target.attr('sid');
+				$('.ct_event[sid=' + sid + ']')
+				    .addClass('visual_hover');
+			},
+			hide: function(event, api) {
+				var sid = api.target.attr('sid');
+				$('.ct_event[sid=' + sid + ']')
+				    .removeClass('visual_hover');
+			}
+		}
+	})
+	.on('click', function(e) {
+		var reckind = ~~$(this).attr('rc');
+		if (reckind == 4)	// Series record
+		{
+			$('#b_skip').show();
+			$('#b_cancel .ui-button-text')
+			    .text('Cancel Entire Series');
+		}
+		else
+		{
+			$('#b_skip').hide();
+			$('#b_cancel .ui-button-text')
+			    .text('Cancel Recording');
+		}
+		$('.ep_button').hide();
+		$epgpopup.attr('reckind', reckind);
+		$epgpopup.attr('sid', $(this).attr('sid'));
+		$epgpopup.attr('crid', $(this).attr('crid'));
+		$epgpopup.attr('sclass', $(this).attr('sclass'));
+		epgpopup(e, $(this), true);
+	});
+
+}
+
diff --git a/webif/html/sched/visual/style.css b/webif/html/sched/visual/style.css
new file mode 100644
index 0000000..759aca7
--- /dev/null
+++ b/webif/html/sched/visual/style.css
@@ -0,0 +1,115 @@
+
+fieldset.visual
+{
+	margin: 1em 0;
+}
+
+.ct_visual
+{
+	xborder: 1px solid red;
+	min-width: 1100px;
+}
+
+.ct_header
+{
+	padding: 2px 6px;
+}
+
+.ct_day
+{
+	padding: 2px 5px;
+	border-width: 2px 1px 0 1px;
+	border-color: #999;
+	border-style: solid;
+}
+
+.ct_row
+{
+	width: 100%;
+	height: 40px;
+}
+
+.ct_dayname
+{
+	xborder: 1px solid blue;
+	width: 120px;
+	display: inline-block;
+}
+
+.ct_hour
+{
+	display: inline-block;
+	overflow: hidden;
+	white-space: nowrap;
+	vertical-align: middle;
+	height: 25px;
+	padding: 4px 0 3px 3px;
+	margin: 3px 0 3px 0;
+	border-right: 1px solid #ccc;
+}
+
+.ct_skip, .ct_event, .ct_key
+{
+	display: inline-block;
+	overflow: hidden;
+	white-space: nowrap;
+	vertical-align: middle;
+	height: 25px;
+	padding: 4px 0 3px 0;
+	margin: 3px 2px 3px 0;
+	border: 1px solid #ccc;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+}
+
+.ct_bskip
+{
+	display: inline-block;
+	overflow: hidden;
+	white-space: nowrap;
+	vertical-align: middle;
+	height: 25px;
+	padding: 0;
+	margin: 0;
+	border: 0;
+}
+
+.visual_schedule
+{
+	position: absolute;
+	width: 400px;
+	padding: 3px;
+	margin: 5px;
+	border: black solid 1px;
+}
+
+img.visualicon
+{
+	height: 20px;
+	vertical-align: middle;
+}
+
+#optprogname
+{
+	color: #999;
+	font-style: italic;
+	text-align: center;
+	border-bottom: 1px solid #999;
+}
+
+.qtip
+{
+	max-width: 350px;
+}
+
+.qtip span
+{
+	white-space: nowrap;
+}
+
+.visual_hover
+{
+	background: #f6ff5b !important;
+	color: black;
+}
+
diff --git a/webif/cgi-bin/xepg.jim b/webif/html/xepg/index.jim
similarity index 63%
rename from webif/cgi-bin/xepg.jim
rename to webif/html/xepg/index.jim
index 7fc4ad9..bf504e8 100755
--- a/webif/cgi-bin/xepg.jim
+++ b/webif/html/xepg/index.jim
@@ -4,8 +4,8 @@ package require cgi
 source /mod/webif/lib/setup
 require settings.class
 
-jqplugin enadis
-jscss xepg.js /css/xepg.css
+jqplugin enadis qtip
+jscss script.js style.css
 header
 
 require epg.class spinner.class altrow epg_search totop system.class
@@ -46,8 +46,15 @@ if {$stt <= $now} {
 
 set favgroup [$s channel_group]
 
-set hours [expr 1.0 * [[settings] xepghours]]
+set hours [cgi_get hours -]
+if {$hours eq "-"} {
+	set hours [expr 1.0 * [[settings] xepghours]]
+}
+
 if {$hours == 0} { set hours 4.0 }
+if {$hours < 1} { set hours 1.0 }
+if {$hours > 8} { set hours 8.0 }
+
 set seconds $($hours * 3600)
 
 set ostt $stt
@@ -83,49 +90,119 @@ 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"
+		puts -nonewline " class=\"nav delayshow\""
 	} else {
-		puts -nonewline " disabled class=\"nav ui-state-disabled\""
+		puts -nonewline " disabled class=\"nav delayshow ui-state-disabled\""
 	}
 	puts " active=$active>$label</button>"
 }
 
 puts "<!-- Hours $hours ($seconds) -->"
-puts "<div id=buttons style=\"width: $eventpx; margin-left: ${chanpx}px;\">"
 
-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
-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)
+puts "<div id=timeline style=\"min-width: ${contwidth}px;\">"
 
-puts "</div>"
+######################################################################
+# Time-jump bar
 
-puts "
-<script type=text/javascript>
-\$('button.nav').button();
-</script>
-<div id=xepg style=\"min-width: ${contwidth}px; overflow: auto\">
-<div id=xepgnow></div>
-<div id=xegrid>
+puts "<div class=timejump_outer>
+<div class=timejump_label style=\"width: ${chanpx}px;\">
+	Jump to:&nbsp;
+</div>
+<div class=timejump_bar>
 "
 
-puts "<div id=epgdate style=\"width: ${eventpx}px; margin-left: ${chanpx}px;\">"
-puts [clock format $stt -format {%a %d/%m/%Y}]
-puts "<input type=hidden id=xepg_dp stt=$stt>"
+set starthour [clock format $stt -format "%H"]
+for {set i 0} {$i < 24} {incr i} {
+	if {$i < 13} { set disp $i } else { set disp $($i - 12) }
+	if {!$disp} { set disp 12 }
+
+	set xclass ""
+
+	if {$i == $starthour} {
+		append xclass " tjstart"
+	} elseif {$i > $starthour && $i < [expr $starthour + $hours]} {
+		append xclass " tjother"
+	}
+
+	set tt [expr $starthour + $stt + 3600 * ($i - $starthour)]
+	# Back to start of hour (no floor() in Humax Jim)
+	set tt $(3600 * round(1 + $tt / 3600))
+
+	if {$xclass ne "" || $i == 0 || $i == 12} {
+		append disp "<br>[clock format $tt -format %p]"
+	}
+
+	puts "<div tt=$tt class=\"timejump$xclass\">$disp</div>\n"
+}
+
+puts "</div>&nbsp;"
+but "Now" $now
 puts "</div>"
 
-puts "<div class=xechan style=\"width: ${chanpx}px;\">&nbsp;</div>"
+######################################################################
+# Day-jump bar
+
+puts "<div class=dayjump_outer>
+<div class=dayjump_label style=\"width: ${chanpx}px;\"></div>
+<div class=dayjump_bar>
+"
+
+set stt_time [clock format $stt -format "%H:%M"]
+for {set i 0} {$i < 8} {incr i} {
+	set day $($now + $i * 86400)
+	if {!$i} {
+		set s "Today"
+	} else {
+		set s [clock format $day -format "%A"]
+	}
+	set xclass ""
+	if {[clock format $day -format "%j"] == \
+	    [clock format $stt -format "%j"]} {
+		append xclass " dayjump_current"
+	}
+
+	set tt [clock scan \
+	    [clock format $day -format "%Y:%m:%d:$stt_time"] \
+	    -format "%Y:%m:%d:%H:%M"]
+	set alt [clock format $tt -format "%e %B"]
+
+	puts "<div tt=$tt title=\"$alt\" class=\"dayjump$xclass\">$s</div>\n"
+}
+
+puts "</div>"
+puts "<span class=\"footnote delayshow\">&nbsp;
+    (Right-Click to select end hour)</span>"
+puts "</div>"
+
+######################################################################
+# Time-line bar
+
+# Displays the top border above the timeline.
+puts "
+    <div id=epgdate style=\"width: ${eventpx}px; margin-left: ${chanpx}px;\">
+    </div>
+<div class=xedate style=\"width: ${chanpx}px;\">
+    [clock format $stt -format "%A %e %B"]&nbsp;&nbsp;</div>
+"
+
 for {set i 0} {$i < $hours * 2} {incr i} {
 	puts "<div class=xetime id=xe$i
 	    style=\"width: [expr $minpx * 30]px\">"
 	puts "[clock format $($stt + 1800 * $i) -format "%H:%M"]</div>"
 }
 
+# Close timeline div
+puts "</div>"
+
+######################################################################
+# Events
+ 
+puts "
+<div id=xepgnow></div>
+<div id=xepg style=\"min-width: ${contwidth}px;\">
+<div id=xegrid>
+"
+
 set lim 0
 set lcn 0
 set bg "odd"
@@ -218,6 +295,10 @@ 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} {
@@ -231,13 +312,14 @@ var kt = $('#xe0');
 var ktpos = kt.position();
 
 var height = $('#keypos').position().top - ktpos.top;
+var top = ktpos.top - 25;
 
 	}
 	puts "var nowpos = ktpos.left + (kt.width() * $offset);"
 	puts {
 $('#xepgnow')
 	.css('left', nowpos + 'px')
-	.css('top', ktpos.top)
+	.css('top', top)
 	.height(height)
 	.show('slow');
 	}
diff --git a/webif/html/xepg/script.js b/webif/html/xepg/script.js
new file mode 100644
index 0000000..e55a213
--- /dev/null
+++ b/webif/html/xepg/script.js
@@ -0,0 +1,78 @@
+$(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() {
+	$(this).css('cursor', 'pointer');
+	$(this).addClass('timejump_hover')
+	$(this).nextAll('.timejump').slice(0,hours-1)
+	    .addClass('timejump_hover');
+    },
+    function() {
+	$(this).css('cursor', 'auto');
+	$(this).removeClass('timejump_hover')
+	$(this).nextAll('.timejump').slice(0,hours-1)
+	    .removeClass('timejump_hover');
+    }
+).on('click', function(e) {
+	e.preventDefault();
+
+	tt = $(this).attr('tt');
+
+	window.location = '/xepg/?stt=' + tt +
+	    '&hours=' + hours +
+	    '&pos=' + $('#xegrid').scrollTop();
+}).on('contextmenu', function(e) {
+	e.preventDefault();
+
+	tt = $(this).attr('tt');
+
+	// Change the end hour.
+	nhours = Math.ceil((tt - stt) / 3600) + 1;
+	if (nhours > 1)
+		hours = nhours;
+	window.location = '/xepg/?stt=' + stt +
+	    '&hours=' + hours +
+	    '&pos=' + $('#xegrid').scrollTop();
+});
+
+$('.dayjump').hover(
+    function() {
+	$(this).css('cursor', 'pointer');
+	$(this).addClass('dayjump_hover')
+    },
+    function() {
+	$(this).css('cursor', 'auto');
+	$(this).removeClass('dayjump_hover')
+    }
+).on('click', function(e) {
+	e.preventDefault();
+
+	window.location = '/xepg/?stt=' + $(this).attr('tt') +
+	    '&hours=' + hours +
+	    '&pos=' + $('#xegrid').scrollTop();
+});
+
+$('.delayshow').show();
+
+});
+
diff --git a/webif/html/css/xepg.css b/webif/html/xepg/style.css
similarity index 60%
rename from webif/html/css/xepg.css
rename to webif/html/xepg/style.css
index 787b4c7..ebad09f 100644
--- a/webif/html/css/xepg.css
+++ b/webif/html/xepg/style.css
@@ -58,6 +58,15 @@ div.xerow
 {
 }
 
+div.xedate
+{
+	float: left;
+	clear: left;
+	white-space: nowrap;
+	overflow: hidden;
+	text-align: right;
+}
+
 div.xechan
 {
 	vertical-align: middle;
@@ -116,3 +125,74 @@ button#later
 	margin-left: 0px !important;
 }
 
+.timejump_outer, .dayjump_outer
+{
+}
+
+.timejump_bar, .dayjump_bar
+{
+	padding: 4px;
+	background: #e6e6e6;
+	display: inline-block;
+}
+
+.dayjump_bar
+{
+	padding-top: 0;
+	margin-bottom: 5px;
+}
+
+.timejump_label, .dayjump_label
+{
+	text-align: right;
+	font-style: italic;
+	display: inline-block;
+}
+
+.timejump
+{
+	display: inline-block;
+	width: 25px;
+	text-align: center;
+	vertical-align: middle;
+	line-height: 1em;
+	border-radius: 5px;
+	padding: 2px 0;
+}
+
+.dayjump
+{
+	display: inline-block;
+	width: 85px;
+	text-align: center;
+	vertical-align: middle;
+	line-height: 1em;
+	padding: 2px 0 5px 0;
+	border-top: 1px solid #73e600;
+}
+
+.timejump_hover, .dayjump_hover
+{
+	background: #ffffcc !important;
+}
+
+.dayjump_current
+{
+	border-radius: 10px;
+}
+
+.tjstart, .dayjump_current
+{
+	background: #73e600;
+}
+
+.tjother
+{
+	background: #ccff99;
+}
+
+.delayshow
+{
+	display: none;
+}
+
diff --git a/webif/lib/bin/auto b/webif/lib/bin/auto
index b24614f..5d0c355 100755
--- a/webif/lib/bin/auto
+++ b/webif/lib/bin/auto
@@ -813,7 +813,7 @@ if {[lindex $argv 0] eq "-singledir"} {
 	}
 }
 
-release_lock webif_auto
+if {!$prelocked} { release_lock webif_auto }
 
 log "Media scan completed in [elapsed $scanstart] seconds."
 
diff --git a/webif/lib/epg_popup b/webif/lib/epg_popup
index 204876d..b1a55e6 100644
--- a/webif/lib/epg_popup
+++ b/webif/lib/epg_popup
@@ -1,5 +1,5 @@
 puts {
-<div id=dialogue></div>
+<div id=epgpopup_dialogue></div>
 <script type=text/javascript src=/js/epg_popup.js></script>
 }
 
diff --git a/webif/lib/rsv.class b/webif/lib/rsv.class
index 34c43de..b2de7be 100755
--- a/webif/lib/rsv.class
+++ b/webif/lib/rsv.class
@@ -17,9 +17,8 @@ if {![file exists /var/lib/humaxtv/rsvp.db]} {
 	$tdb close
 }
 $rsvdb query {attach database '/var/lib/humaxtv/rsvp.db' as pending}
-# This is required to upgrade old tables and will be removed in a future
-# version.
-catch { $rsvdb query {alter table pending add column action int} }
+# These are required to upgrade old tables.
+catch { $rsvdb query { alter table pending add column action int} }
 
 set binaryfields aulEventToRecordInfo
 
@@ -54,6 +53,8 @@ class rsv {
 	usLcn			0
 	sort			0
 	action			0
+	_table			""
+	_origstart		0
 }
 
 require findhsvc
@@ -156,6 +157,10 @@ rsv method start {} {
 	return $nsttime
 }
 
+rsv method end {} {
+	return $([$self start] + $nduration)
+}
+
 rsv method icon {} {
 	set rsvicon ""
 	switch $ersvtype {
@@ -224,6 +229,10 @@ rsv method iconset {{height 20}} {
 	return $iconlist
 }
 
+rsv method setorigstart {o} {
+	set _origstart $o
+}
+
 rsv method set_delete {} {
 	set action 1
 }
@@ -319,7 +328,10 @@ rsv method insert {{table pending} {force 0}} {
 		if {$ulslot < 0} { set ulslot 0 }
 	}
 
-	set fields [lsort [$self vars]]
+	set fields [lsort [lmap i [$self vars] {
+		if {[string index $i 0] eq "_"} continue
+		concat "" $i
+	    }]]
 
 	foreach field {szSvcName usLcn sort} {
 		set df [lsearch $fields $field]
@@ -379,6 +391,7 @@ proc {rsv list} {{table tbl_reservation} {extra ""}} {
 	set res [$::rsvdb query $qstring]
 	set records {}
 	foreach rec $res {
+		lappend rec _table $table
 		lappend records [rsv new $rec]
 	}
 
@@ -872,31 +885,214 @@ proc {rsv restore} {file} {
 	close $fd
 }
 
-# Check for scheduled events at the same time
-proc {rsv conflicts} {s d} {
-	global rsvdb
-	set query "
-		select count(*) as num
-		from TBL_RESERVATION
-		where ersvtype <= 3
-		and (
-		(
-			nsttime >= $s
-		    and nsttime < $s + $d
-		) or (
-			nsttime + nduration > $s
-		    and nsttime + nduration <= $s + $d
-		) or (
-			nsttime <= $s
-		    and nsttime + nduration >= $s + $d
-		))
-	"
-	set ret [$rsvdb query $query]
+# Returns an array of expanded events from the schedule.
+# Array keys:
+#      0:      start
+#      1:      end
+#      2:      hSvc
+#      3:      event_id
+#      4:      Schedule ID (sid)
+#      5:      ucRecKind
+#      6:      class (live, pending)
 
-	set num 0
-	if {[llength $ret] > 0} {
-		lassign [lindex $ret 0] x num
+proc {rsv allevents} {{xota 0}} {
+	set events [rsv list]
+	set pending [rsv list pending]
+	if {[llength $pending]} {
+		lappend events {*}$pending
 	}
-	return $num
+
+	set xevents {}
+
+	foreach e $events {
+		set seen 0
+
+		if {$xota && [$e get szevtname] eq "Disable OTA"} continue
+
+		if {[$e get action] ne "0"} continue
+
+		set trailer [list \
+			[$e get ulslot] \
+			[$e get ucRecKind] \
+			[$e get _table] \
+		]
+
+		# Expand the events encoded in the AUL data.
+		foreach a [$e aul] {
+			lassign $a service start end event_id
+			if {$start == [$e start] && \
+			    $end == [$e end]} {
+				incr seen
+			}
+			lappend xevents [list $start $end $service $event_id \
+			    {*}$trailer]
+		}
+
+		if {$seen} continue
+
+		set start [$e start]
+		set end [$e end]
+
+		lappend xevents [list $start $end \
+		    [$e get hsvc] [$e get usevtid] {*}$trailer]
+
+		set repeat [$e get erepeat]
+		switch $repeat {
+		    1 -
+		    3 -
+		    4 {
+			# 1 Daily
+			# 3 Weekends
+			# 4 Weekdays
+
+			for {set i 0} {$i < 8} {incr i} {
+
+				incr start 86400
+				incr end 86400
+				
+				# Sun == 0
+				set day [clock format [$e start] \
+				    -format "%w"]
+
+				# Weekdays Only
+				if {$repeat == 3 && ($day == 0 || $day == 6)} {
+					continue
+				}
+
+				# Weekends Only
+				if {$repeat == 4 && $day != 0 && $day != 6} {
+					continue
+				}
+
+				lappend xevents [list \
+				    $start $end \
+				    [$e get hsvc] [$e get usevtid] \
+				    {*}$trailer]
+			}
+		    }
+		    2 {
+				# Weekly
+				lappend xevents [list \
+				    $($start + 7 * 86400) \
+				    $($end  + 7 * 86400) \
+				    [$e get hsvc] [$e get usevtid] \
+				    {*}$trailer]
+		    }
+		}
+		
+	}
+
+	return $xevents
+}
+
+proc {rsv evaluate_conflicts} {events type thresh {debug 0}} {
+	set conflicts {}
+	set slots {0 0}
+	foreach ev $events {
+		lassign $ev start end hsvc eid sid
+
+		if {$debug} {
+			puts "\nSLOTS: $slots"
+			puts $ev
+		}
+
+		# Close off any open slots that have now finished.
+		for {set i 0} {$i < 2} {incr i} {
+			set v [lindex $slots $i]
+			if {$v eq "0"} {
+				if {$debug} { puts "\[$i] empty." }
+				continue
+			}
+
+			lassign $v xsid xend
+
+			if {$start >= $xend} {
+				lset slots $i 0
+				if {$debug} { puts "\[$i] finished $xend." }
+			} else {
+				if {$debug} { puts "\[$i] running $xend." }
+			}
+		}
+
+		# Find slot for recording
+		if {[lindex $slots 0] eq "0"} {
+			set uslot 0
+		} elseif {$thresh > 1 && [lindex $slots 1] eq "0"} {
+			set uslot 1
+		} else {
+			# Conflict detected
+			if {$debug} { puts "    Conflict." }
+			if {$type eq "xlist"} {
+				set c "$sid$end"
+				for {set i 0} {$i < 2} {incr i} {
+					set v [lindex $slots $i]
+					if {$v eq "0"} continue
+
+					lassign $v xsid xend
+
+					lappend c "$xsid$xend"
+				}
+			} else {
+				set c "$sid"
+				for {set i 0} {$i < 2} {incr i} {
+					set v [lindex $slots $i]
+					if {$v eq "0"} continue
+
+					lassign $v xsid xend
+
+					lappend c "$xsid"
+				}
+			}
+			foreach x $c {
+				if {![dict exists $conflicts $x]} {
+					set conflicts($x) $c
+				}
+			}
+
+			# If this events ends later than the
+			# existing one in slot 0, then replace that
+			# with this one.
+
+			lassign [lindex $slots 0] xsid xend
+			if {$xend >= $end} continue
+			if {$debug} { puts " Replacing slot 0.\n" }
+			set uslot 0
+		}
+
+		if {$debug} {
+			puts " -> into slot $uslot"
+		}
+		# Insert event into slot
+		lset slots $uslot [list $sid $end]
+	}
+	return $conflicts
+}
+
+proc {rsv newconflicts} {{thresh 1} {type "list"} {debug 0}} {
+	set events [lsort -index 0 -integer [rsv allevents]]
+	set conflicts [rsv evaluate_conflicts $events $type $thresh $debug]
+
+	if {$type eq "map"} { return $conflicts }
+	return [dict keys $conflicts]
+}
+
+proc {rsv checkconflict} {s d thresh {debug 0}} {
+	set events [rsv allevents]
+	lappend events [list $s $($s + $d) 0 0 0]
+	set events [lsort -index 0 -integer $events]
+	set conflicts [rsv evaluate_conflicts $events 'list' $thresh $debug]
+
+	set ret {}
+
+	if {![dict exists $conflicts "0"]} { return $ret }
+
+	foreach c [dict get $conflicts 0] {
+		if {$c eq "0"} continue
+		set s [rsv slot $c]
+		set s [$s name]
+		lappend ret $s
+	}
+
+	return $ret
 }
 
diff --git a/webif/lib/setup b/webif/lib/setup
index 8240706..2ffaf92 100644
--- a/webif/lib/setup
+++ b/webif/lib/setup
@@ -54,9 +54,10 @@ if {![exists -proc require]} {
 		incr ::mws::headerdone
 	}
 
-	proc noheader {} {
+	proc noheader {{type "text/html"} {cache 0}} {
+		httpheader $type $cache
+		uplevel source /mod/webif/html/lib/noheader.jim
 		incr ::mws::headerdone
-		::mws::emit_jscss
 	}
 
 	proc footer {} {
diff --git a/webif/lib/utils b/webif/lib/utils
index d9b7726..d624707 100644
--- a/webif/lib/utils
+++ b/webif/lib/utils
@@ -12,3 +12,7 @@ proc lremove {var val} {
 	set v [lsearch -all -inline -not -exact $v $val]
 }
 
+proc ladd {l} {
+	expr [join $l +] + 0
+}
+