From e2203e7aae84ec772eb61621a199be4bb7b32f0c Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Tue, 6 Nov 2012 06:22:00 +0100
Subject: Removed lightbox from calendar.

---
 models/model.php                                    |  4 ++--
 start.php                                           |  3 ---
 views/default/event_calendar/full_calendar_view.php | 14 ++------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/models/model.php b/models/model.php
index 4668f005a..9edfbc760 100644
--- a/models/model.php
+++ b/models/model.php
@@ -1504,7 +1504,7 @@ function event_calendar_get_page_content_list($page_type,$container_guid,$start_
 
 	$params = event_calendar_generate_listing_params($page_type,$container_guid,$start_date,$display_mode,$filter,$region);
 	
-	$url = full_url();
+	$url = current_page_url();
 	if (substr_count($url, '?')) {
 		$url .= "&view=ical";
 	} else {
@@ -2183,7 +2183,7 @@ function event_calendar_get_page_content_fullcalendar_events($start_date,$end_da
 			} else {
 				$event_item['id'] = $event->guid;
 				$event_item['is_event_poll'] = FALSE;
-				$event_item['url'] = elgg_get_site_url().'event_calendar/view_light_box/'.$event->guid;
+				$event_item['url'] = elgg_get_site_url().'event_calendar/view/'.$event->guid;
 			}
 		
 			$event_array[] = $event_item;
diff --git a/start.php b/start.php
index bf22568cb..752646a3e 100644
--- a/start.php
+++ b/start.php
@@ -186,9 +186,6 @@ function event_calendar_page_handler($page) {
 		case 'view':
 			echo event_calendar_get_page_content_view($page[1]);
 			break;
-		case 'view_light_box':
-			echo event_calendar_get_page_content_view($page[1],TRUE);
-			break;
 		case 'display_users':
 			echo event_calendar_get_page_content_display_users($page[1]);
 			break;
diff --git a/views/default/event_calendar/full_calendar_view.php b/views/default/event_calendar/full_calendar_view.php
index 44ffc70c3..1a58321b5 100644
--- a/views/default/event_calendar/full_calendar_view.php
+++ b/views/default/event_calendar/full_calendar_view.php
@@ -1,7 +1,5 @@
 <?php
 elgg_load_js('elgg.full_calendar');
-elgg_load_js('lightbox');
-elgg_load_css('lightbox');
 
 $timeformat = elgg_get_plugin_setting('timeformat', 'event_calendar') == 24 ? 'H(:mm)' : 'h(:mm)t';
 
@@ -13,16 +11,8 @@ var goToDateFlag = 0;
 
 handleEventClick = function(event) {
     if (event.url) {
-        if (event.is_event_poll) {
-        	window.location.href = event.url;
-        } else {            
-			if ($.fancybox) {
-				$.fancybox({'href': event.url});
-			} else if ($.colorbox) {
-				$.colorbox({'href': event.url});
-			}
-        }
-        return false;
+        window.location.href = event.url;
+        event.preventDefault();
     }
 };
 
-- 
cgit v1.2.3