summaryrefslogtreecommitdiffstats
path: root/application/views/scripts/event
diff options
context:
space:
mode:
authorSebastian Wagner2011-08-22 12:41:53 +0200
committerSebastian Wagner2011-08-22 12:41:53 +0200
commit4fa85e8a3ba2a23ae87e1451613b5ed5203d0c77 (patch)
treeb56d49b2360fdca18ddd6f79bb384a44e47d57f5 /application/views/scripts/event
parentmore ps-logic (diff)
downloadpoolctrl-4fa85e8a3ba2a23ae87e1451613b5ed5203d0c77.tar.gz
poolctrl-4fa85e8a3ba2a23ae87e1451613b5ed5203d0c77.tar.xz
poolctrl-4fa85e8a3ba2a23ae87e1451613b5ed5203d0c77.zip
events are now displayed in the calendar
Diffstat (limited to 'application/views/scripts/event')
-rw-r--r--application/views/scripts/event/calendarEvents.php26
-rw-r--r--application/views/scripts/event/index.phtml3
-rw-r--r--application/views/scripts/event/poolEvents.php1
3 files changed, 2 insertions, 28 deletions
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 @@
-<?php
-
- $year = date('Y');
- $month = date('m');
-
- echo json_encode(array(
-
- array(
- 'id' => 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 @@
-<?php