From 68ae915f578f43135beed65140b4089fcbb390d8 Mon Sep 17 00:00:00 2001
From: hummypkg <af123@hpkg.tv>
Date: Tue, 10 Apr 2012 19:45:49 +0000
Subject: [PATCH] change folder for events

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@897 2a923420-c742-0410-a762-8d5b09965624
---
 CONTROL/control                   | 2 +-
 var/mongoose/html/sched/sched.jim | 5 ++++-
 var/mongoose/html/sched/script.js | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CONTROL/control b/CONTROL/control
index 9746d5d..a4fb4a8 100644
--- a/CONTROL/control
+++ b/CONTROL/control
@@ -1,7 +1,7 @@
 Package: webif
 Priority: optional
 Section: web
-Version: 0.9.4-1
+Version: 0.9.5
 Architecture: mipsel
 Maintainer: af123@hummypkg.org.uk
 Depends: webif-channelicons,mongoose(>=3.0-7),jim(>=0.73-1),jim-oo,jim-sqlite3(>=0.73),jim-cgi(>=0.5),service-control(>=1.2),busybox(>=1.19.3-1),lsof,epg(>=1.0.9),hmt(>=1.1.6),ssmtp,anacron,trm,openssl-command,nicesplice,id3v2,file,rsvsync
diff --git a/var/mongoose/html/sched/sched.jim b/var/mongoose/html/sched/sched.jim
index 9d4c448..4bb6455 100755
--- a/var/mongoose/html/sched/sched.jim
+++ b/var/mongoose/html/sched/sched.jim
@@ -111,7 +111,10 @@ proc eventrow {event {table TBL_RESERVATION}} {
 	puts "<td nowrap>
 		<a slot=[$event get ulslot] table=$table
 		href=# class=schedule>$name</a>"
-	if {[$event get ucRecKind] == 4 && $name ne [$event folder]} {
+	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>"
diff --git a/var/mongoose/html/sched/script.js b/var/mongoose/html/sched/script.js
index c4ec563..84ed7ca 100755
--- a/var/mongoose/html/sched/script.js
+++ b/var/mongoose/html/sched/script.js
@@ -147,7 +147,8 @@ function preparemenu(el, menu)
 	else
 		$('#optmenu').disableContextMenuItems('#ar');
 
-	if ($(el).attr('table') != 'pending' && $(el).attr('reckind') == 4)
+	if ($(el).attr('table') != 'pending' && (
+	    $(el).attr('reckind') == 4 || $(el).attr('reckind') == 1))
 		$('#optmenu').enableContextMenuItems('#folder');
 	else
 		$('#optmenu').disableContextMenuItems('#folder');