From 36307007193a1d7c7207604a1c0220098e1e8d63 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 17 Oct 2011 19:42:23 +0200 Subject: collision-detection implemented --- .../views/scripts/event/checkoverlapevents.phtml | 4 ++-- application/views/scripts/event/index.phtml | 25 ++++++++++++++++------ 2 files changed, 20 insertions(+), 9 deletions(-) (limited to 'application/views') diff --git a/application/views/scripts/event/checkoverlapevents.phtml b/application/views/scripts/event/checkoverlapevents.phtml index 26b6274..66916aa 100644 --- a/application/views/scripts/event/checkoverlapevents.phtml +++ b/application/views/scripts/event/checkoverlapevents.phtml @@ -3,10 +3,10 @@ //print_r($this->overlaps); if(count($this->overlaps) == 0) { - echo '

no overlapping events

'; + echo -1; } else { - echo '