From dae9634f5d74824e3179942b0bc62dd52d850085 Mon Sep 17 00:00:00 2001 From: Kevin Jardine Date: Sun, 22 Jul 2012 13:44:47 +0200 Subject: add button now honours selected date --- views/default/event_calendar/full_calendar_view.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'views/default') diff --git a/views/default/event_calendar/full_calendar_view.php b/views/default/event_calendar/full_calendar_view.php index 4316b5359..3e0c583ce 100644 --- a/views/default/event_calendar/full_calendar_view.php +++ b/views/default/event_calendar/full_calendar_view.php @@ -43,10 +43,12 @@ handleDayClick = function(date,allDay,jsEvent,view) { // deselect $('#event-calendar-selected-date').val(""); $('.elgg-menu-item-event-calendar-0add').find('a').attr('href',url+'event_calendar/add/'+group_guid); + $('.event-calendar-button-add').attr('href',url+'event_calendar/add/'+group_guid); $('.elgg-menu-item-event-calendar-1schedule').find('a').attr('href',url+'event_calendar/schedule/'+group_guid); } else { $('#event-calendar-selected-date').val(iso); $('.elgg-menu-item-event-calendar-0add').find('a').attr('href',url+'event_calendar/add/'+group_guid+'/'+iso); + $('.event-calendar-button-add').attr('href',url+'event_calendar/add/'+group_guid+'/'+iso); $('.elgg-menu-item-event-calendar-1schedule').find('a').attr('href',url+'event_calendar/schedule/'+group_guid+'/'+iso); $(this).addClass('event-calendar-date-selected'); -- cgit v1.2.3 From 819cebeb27c5ab8b4a04fc8660667ec9a29681c1 Mon Sep 17 00:00:00 2001 From: Kevin Jardine Date: Sun, 22 Jul 2012 14:05:50 +0200 Subject: manager subscribers link now appears on the lightbox version of an event (assuming that the add users plugin option is enabled) --- models/model.php | 2 +- views/default/object/event_calendar.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'views/default') diff --git a/models/model.php b/models/model.php index fb2cf44c2..85e605352 100644 --- a/models/model.php +++ b/models/model.php @@ -1879,7 +1879,7 @@ function event_calendar_get_page_content_view($event_guid,$light_box = FALSE) { } elgg_push_breadcrumb($event->title); - $content = elgg_view_entity($event, array('full_view' => true)); + $content = elgg_view_entity($event, array('full_view' => true,'light_box'=>$light_box)); //check to see if comment are on - TODO - add this feature to all events if ($event->comments_on != 'Off') { $content .= elgg_view_comments($event); diff --git a/views/default/object/event_calendar.php b/views/default/object/event_calendar.php index afd4325f1..5779c004c 100644 --- a/views/default/object/event_calendar.php +++ b/views/default/object/event_calendar.php @@ -59,9 +59,17 @@ if ($full) { } else { echo '

'.$event->description.'

'; } + if ($vars['light_box'] == TRUE) { + $event_calendar_add_users = elgg_get_plugin_setting('add_users', 'event_calendar'); + if ($event_calendar_add_users == 'yes') { + $url = "event_calendar/manage_users/$event->guid"; + echo '

'.elgg_view('output/url',array('text'=> elgg_echo('event_calendar:manage_users:breadcrumb'), 'href'=>$url)).'

'; + } + } if (elgg_get_plugin_setting('add_to_group_calendar', 'event_calendar') == 'yes') { echo elgg_view('event_calendar/forms/add_to_group',array('event' => $event)); } + } else { $time_bit = event_calendar_get_formatted_time($event); -- cgit v1.2.3