From fe5337e9dbdab7fb3b16d822c00fea2b1428af7c Mon Sep 17 00:00:00 2001 From: naomiaro Date: Tue, 19 Oct 2010 05:57:28 -0400 Subject: [PATCH] small fixes to wekk view of scheduler --- htmlUI/templates/scheduler/week.tpl | 2 +- htmlUI/templates/scheduler/week_additem.tpl | 2 +- htmlUI/ui_scheduler.class.php | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/htmlUI/templates/scheduler/week.tpl b/htmlUI/templates/scheduler/week.tpl index e92029846..212ec859e 100644 --- a/htmlUI/templates/scheduler/week.tpl +++ b/htmlUI/templates/scheduler/week.tpl @@ -43,7 +43,7 @@ {foreach from=$_entrys[$_day.day][$_hour] item="i"}
- +  

{$i.title|truncate:12}

{$i.start|truncate:8:""} - {$i.end|truncate:8:""}

diff --git a/htmlUI/templates/scheduler/week_additem.tpl b/htmlUI/templates/scheduler/week_additem.tpl index a6731671b..d70a63a72 100644 --- a/htmlUI/templates/scheduler/week_additem.tpl +++ b/htmlUI/templates/scheduler/week_additem.tpl @@ -1,3 +1,3 @@ style="cursor: pointer" -onClick="return contextmenu('year={$_day.year}&month={$_day.month}&day={$_day.day}&hour={$_hour}&minute=0&second=0', 'SCHEDULER.addItem')" +onClick="return contextmenu('&year={$_day.year}&month={$_day.month}&day={$_day.day}&hour={$_hour}&minute=0&second=0', null, 'SCHEDULER.addItem')" diff --git a/htmlUI/ui_scheduler.class.php b/htmlUI/ui_scheduler.class.php index 7b2f4d5f6..e2cb4d5a2 100644 --- a/htmlUI/ui_scheduler.class.php +++ b/htmlUI/ui_scheduler.class.php @@ -322,12 +322,11 @@ class uiScheduler extends uiCalendar { $creator = $val["creator"]; } - $id = $val["group_id"]; //BasicStor::IdFromGunid($val['playlistId']); $startDay = strftime('%d', self::datetimeToTimestamp($val['start'])); $startHour = number_format(strftime('%H', self::datetimeToTimestamp($val['start']))); $items[$startDay][$startHour][]= array ( - 'id' => $id, - 'scheduleid'=> $id, //$val['id'], + 'id' => $val['playlistId'], + 'scheduleid'=> $val["group_id"], 'start' => substr($val['start'], strpos($val['start'], ' ')+1), 'end' => substr($val['end'], strpos($val['end'], ' ')+1), 'start_stamp' => self::datetimeToTimestamp($val['start']),