change folder for events

git-svn-id: file:///root/webif/svn/humax/pkg/src/webif/trunk@897 2a923420-c742-0410-a762-8d5b09965624
This commit is contained in:
hummypkg 2012-04-10 19:45:49 +00:00
parent 3d0152e475
commit 68ae915f57
3 changed files with 7 additions and 3 deletions

View File

@ -1,7 +1,7 @@
Package: webif Package: webif
Priority: optional Priority: optional
Section: web Section: web
Version: 0.9.4-1 Version: 0.9.5
Architecture: mipsel Architecture: mipsel
Maintainer: af123@hummypkg.org.uk 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 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

View File

@ -111,7 +111,10 @@ proc eventrow {event {table TBL_RESERVATION}} {
puts "<td nowrap> puts "<td nowrap>
<a slot=[$event get ulslot] table=$table <a slot=[$event get ulslot] table=$table
href=# class=schedule>$name</a>" 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 "<br><span class=also>&nbsp;(Folder: [$event folder])</span>"
} }
puts "</td>" puts "</td>"

View File

@ -147,7 +147,8 @@ function preparemenu(el, menu)
else else
$('#optmenu').disableContextMenuItems('#ar'); $('#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'); $('#optmenu').enableContextMenuItems('#folder');
else else
$('#optmenu').disableContextMenuItems('#folder'); $('#optmenu').disableContextMenuItems('#folder');