From 4fa85e8a3ba2a23ae87e1451613b5ed5203d0c77 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 22 Aug 2011 12:41:53 +0200 Subject: events are now displayed in the calendar --- application/views/scripts/event/calendarEvents.php | 26 ---------------------- application/views/scripts/event/index.phtml | 3 ++- application/views/scripts/event/poolEvents.php | 1 - 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 application/views/scripts/event/calendarEvents.php delete mode 100644 application/views/scripts/event/poolEvents.php (limited to 'application/views/scripts/event') diff --git a/application/views/scripts/event/calendarEvents.php b/application/views/scripts/event/calendarEvents.php deleted file mode 100644 index 691c434..0000000 --- a/application/views/scripts/event/calendarEvents.php +++ /dev/null @@ -1,26 +0,0 @@ - 111, - 'title' => "Event1", - 'start' => "$year-$month-10", - 'end' => "$year-$month-11", - 'url' => "http://yahoo.com/" - ), - - array( - 'id' => 222, - 'title' => "Event2", - 'start' => "$year-$month-20", - 'end' => "$year-$month-22", - 'url' => "http://yahoo.com/" - ) - - )); - -?> \ No newline at end of file diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml index 0155e2f..8bfe4c1 100644 --- a/application/views/scripts/event/index.phtml +++ b/application/views/scripts/event/index.phtml @@ -62,7 +62,7 @@ $(document).ready(function() {iniCalendar();}); default: 'week', left: 'title', center: 'prev,next today', - right: 'agendaWeek,agendaDay' + right: 'month,agendaWeek,agendaDay' }, editable: true, // disableDragging: false, @@ -70,6 +70,7 @@ $(document).ready(function() {iniCalendar();}); selectable: true, selectHelper: true, defaultView: 'agendaWeek', + allDay : false, events: "/event/list", diff --git a/application/views/scripts/event/poolEvents.php b/application/views/scripts/event/poolEvents.php deleted file mode 100644 index b3d9bbc..0000000 --- a/application/views/scripts/event/poolEvents.php +++ /dev/null @@ -1 +0,0 @@ -