diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/event_calendar/conference_button.php | 5 | ||||
| -rw-r--r-- | views/default/forms/event_calendar/edit.php | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/views/default/event_calendar/conference_button.php b/views/default/event_calendar/conference_button.php index baa30cc68..79fa9c5a2 100644 --- a/views/default/event_calendar/conference_button.php +++ b/views/default/event_calendar/conference_button.php @@ -2,7 +2,7 @@ // A non-admin / non-event-creator only sees the button if they have the event on his/her personal calendar // and it is at most 15 minutes before the conference starts. -// The button is removed for everyone (even admins) one day after the conference ends. +// The button is removed for everyone (even admins) one day after the event end time. $event = $vars['event']; @@ -21,10 +21,11 @@ if ($event) { } if ( $in_time_window ) { $button = elgg_view('output/url', array( - 'href' => event_calendar_get_join_bbb_url($event), + 'href' => 'action/event_calendar/join_conference?event_guid='.$event->guid, 'text' => elgg_echo('event_calendar:join_conf_button'), 'class' => 'elgg-button elgg-button-action', 'target' => '_blank', + 'is_action' => TRUE, )); echo '<div class="event-calendar-conf-join-button">'.$button.'</div>'; diff --git a/views/default/forms/event_calendar/edit.php b/views/default/forms/event_calendar/edit.php index 2ba744fc4..c2210c5f8 100644 --- a/views/default/forms/event_calendar/edit.php +++ b/views/default/forms/event_calendar/edit.php @@ -7,7 +7,7 @@ $schedule_options = array( elgg_echo('event_calendar:schedule_type:fixed')=>'fixed', ); -if (elgg_plugin_exists('event_poll')) { +if (elgg_is_active_plugin('event_poll')) { $schedule_options = array_merge(array(elgg_echo('event_calendar:schedule_type:poll')=>'poll'),$schedule_options); } |