From 804dfcf6c4b5b6380d607c8ec6b843d56ac82247 Mon Sep 17 00:00:00 2001 From: Kevin Jardine Date: Mon, 26 Sep 2011 12:42:11 +0200 Subject: major changes for Elgg 1.8 --- views/default/event_calendar/calendar_toggle.php | 20 ++++++ views/default/event_calendar/css.php | 15 ++++- views/default/event_calendar/filter_menu.php | 1 + views/default/event_calendar/group_module.php | 48 +++++++-------- .../event_calendar/groupprofile_calendar.php | 11 +--- .../groupprofile_calendar_deprecated.php | 44 ++++++++++++++ views/default/event_calendar/paged_item_view.php | 6 +- views/default/event_calendar/paged_view.php | 21 +------ views/default/event_calendar/region_select.php | 10 ++- views/default/event_calendar/review_requests.php | 21 ++++--- views/default/event_calendar/show_events.php | 28 ++++----- views/default/js/event_calendar/event_calendar.php | 69 +++++++++++++++++++++ views/default/object/event_calendar.php | 3 +- .../default/river/object/event_calendar/create.php | 18 ++++-- .../default/river/object/event_calendar/update.php | 12 ++-- views/default/settings/event_calendar/edit.php | 71 ++++++++++++---------- 16 files changed, 267 insertions(+), 131 deletions(-) create mode 100644 views/default/event_calendar/calendar_toggle.php create mode 100644 views/default/event_calendar/groupprofile_calendar_deprecated.php create mode 100644 views/default/js/event_calendar/event_calendar.php (limited to 'views') diff --git a/views/default/event_calendar/calendar_toggle.php b/views/default/event_calendar/calendar_toggle.php new file mode 100644 index 000000000..7180dec75 --- /dev/null +++ b/views/default/event_calendar/calendar_toggle.php @@ -0,0 +1,20 @@ +container_guid); + +if ($container->canEdit()) { + $link = '

guid.','.$vars['entity']->guid.'); return false;" '; + $link .= ' >'; + $link .= ''.elgg_echo('event_calendar:remove_from_the_calendar').''; + $link .= '

'; + + $button = elgg_view('input/button',array( + 'id'=>'event_calendar_user_data_'.$event->guid.'_'.$user->guid, + 'class' => "event-calendar-personal-calendar-toggle", + 'value' => elgg_echo('event_calendar:remove_from_the_calendar_button'), + )); +} + +echo '
'.$button.'
'; diff --git a/views/default/event_calendar/css.php b/views/default/event_calendar/css.php index 7e399c547..2059a3ea9 100644 --- a/views/default/event_calendar/css.php +++ b/views/default/event_calendar/css.php @@ -8,7 +8,7 @@ $highlight_colour = '#3874B7'; #calendarmenucontainer { position:relative; - left: 40px; + left: 25px; } ul#calendarmenu li { @@ -117,6 +117,10 @@ td.event_calendar_paged_title { width: 280px; } +td.event_calendar_paged_calendar { + padding-left: 30px; +} + table.event_calendar_paged_table { width:100%; border-collapse:collapse; @@ -144,4 +148,13 @@ table.event_calendar_paged_table th { .event_calendar_strapline { font-size: 85%; +} + +.event-calendar-personal-calendar-toggle-wrapper { + width: 100%; + margin-bottom: 30px; +} + +.event-calendar-personal-calendar-toggle { + float: right; } \ No newline at end of file diff --git a/views/default/event_calendar/filter_menu.php b/views/default/event_calendar/filter_menu.php index 62d38939b..2d4805bd4 100644 --- a/views/default/event_calendar/filter_menu.php +++ b/views/default/event_calendar/filter_menu.php @@ -49,6 +49,7 @@ echo elgg_view_menu('filter', array('sort_by' => 'priority', 'class' => 'elgg-me $event_calendar_region_display = elgg_get_plugin_setting('region_display', 'event_calendar'); if ($event_calendar_region_display == 'yes') { + elgg_load_js("elgg.event_calendar"); $url_start .= "/$filter_context"; echo elgg_view('event_calendar/region_select',array('url_start'=>$url_start,'region'=>$vars['region'])); } \ No newline at end of file diff --git a/views/default/event_calendar/group_module.php b/views/default/event_calendar/group_module.php index 5fc644e8b..b1c1567e7 100644 --- a/views/default/event_calendar/group_module.php +++ b/views/default/event_calendar/group_module.php @@ -9,35 +9,29 @@ if ($group->event_calendar_enable == "no") { return true; } -$all_link = elgg_view('output/url', array( - 'href' => "event_calendar/group/$group->guid/all", - 'text' => elgg_echo('link:view:all'), -)); - elgg_push_context('widgets'); -$options = array( - 'type' => 'object', - 'subtype' => 'event_calendar', - 'container_guid' => elgg_get_page_owner_guid(), - 'limit' => 6, - 'full_view' => false, - 'pagination' => false, -); -$content = elgg_list_entities($options); +$content = elgg_view('event_calendar/groupprofile_calendar'); elgg_pop_context(); -if (!$content) { - $content = '

' . elgg_echo('event_calendar:no_events_found') . '

'; +if (!$content) { + if (elgg_get_plugin_setting('group_always_display', 'event_calendar') == 'yes') { + $content = elgg_echo('event_calendar:no_events_found'); + } } -$new_link = elgg_view('output/url', array( - 'href' => "event_calendar/add/$group->guid", - 'text' => elgg_echo('event_calendar:new'), -)); - -echo elgg_view('groups/profile/module', array( - 'title' => elgg_echo('event_calendar:group'), - 'content' => $content, - 'all_link' => $all_link, - 'add_link' => $new_link, -)); +if ($content) { + $all_link = elgg_view('output/url', array( + 'href' => "event_calendar/group/$group->guid", + 'text' => elgg_echo('link:view:all'), + )); + $new_link = elgg_view('output/url', array( + 'href' => "event_calendar/add/$group->guid", + 'text' => elgg_echo('event_calendar:new'), + )); + echo elgg_view('groups/profile/module', array( + 'title' => elgg_echo('event_calendar:group'), + 'content' => $content, + 'all_link' => $all_link, + 'add_link' => $new_link, + )); +} diff --git a/views/default/event_calendar/groupprofile_calendar.php b/views/default/event_calendar/groupprofile_calendar.php index 826fafa67..7ee09104f 100644 --- a/views/default/event_calendar/groupprofile_calendar.php +++ b/views/default/event_calendar/groupprofile_calendar.php @@ -20,24 +20,15 @@ if (event_calendar_activated_for_group($page_owner_entity)) { // Get the upcoming events $start_date = time(); // now $end_date = $start_date + 60*60*24*365*2; // maximum is two years from now - $events = event_calendar_get_events_between($start_date,$end_date,false,$num,0,page_owner()); + $events = event_calendar_get_events_between($start_date,$end_date,false,$num,0,elgg_get_page_owner_guid()); // If there are any events to view, view them if (is_array($events) && sizeof($events) > 0) { - echo '
'; - echo '

'.elgg_echo("event_calendar:groupprofile").'

'; foreach($events as $event) { echo elgg_view("object/event_calendar",array('entity' => $event)); } - echo '
'.elgg_echo('event_calendar:view_calendar').'
'; - echo "
"; - } else if (get_plugin_setting('group_always_display', 'event_calendar') == 'yes') { - echo '
'; - echo '

'.elgg_echo("event_calendar:groupprofile").'

'; - echo '
'.elgg_echo('event_calendar:no_events_found').'
'; - echo "
"; } } diff --git a/views/default/event_calendar/groupprofile_calendar_deprecated.php b/views/default/event_calendar/groupprofile_calendar_deprecated.php new file mode 100644 index 000000000..081a0eb2d --- /dev/null +++ b/views/default/event_calendar/groupprofile_calendar_deprecated.php @@ -0,0 +1,44 @@ + + * @copyright Radagast Solutions 2008 + * @link http://radagast.biz/ + * + */ + +elgg_load_library('elgg:event_calendar'); + +$page_owner_entity = elgg_get_page_owner_entity(); + +if (event_calendar_activated_for_group($page_owner_entity)) { + $num = 5; + // Get the upcoming events + $start_date = time(); // now + $end_date = $start_date + 60*60*24*365*2; // maximum is two years from now + $events = event_calendar_get_events_between($start_date,$end_date,false,$num,0,elgg_get_page_owner_guid()); + + // If there are any events to view, view them + if (is_array($events) && sizeof($events) > 0) { + + echo '
'; + echo '

'.elgg_echo("event_calendar:groupprofile").'

'; + foreach($events as $event) { + echo elgg_view("object/event_calendar",array('entity' => $event)); + } + echo '
'.elgg_echo('event_calendar:view_calendar').'
'; + echo "
"; + + } else if (elgg_get_plugin_setting('group_always_display', 'event_calendar') == 'yes') { + echo '
'; + echo '

'.elgg_echo("event_calendar:groupprofile").'

'; + echo '
'.elgg_echo('event_calendar:no_events_found').'
'; + echo "
"; + } +} + +?> \ No newline at end of file diff --git a/views/default/event_calendar/paged_item_view.php b/views/default/event_calendar/paged_item_view.php index 77c8bed4e..f2092bafc 100644 --- a/views/default/event_calendar/paged_item_view.php +++ b/views/default/event_calendar/paged_item_view.php @@ -7,21 +7,19 @@ if (is_numeric($event->start_time)) { $date_bit = event_calendar_get_formatted_date($event->start_date); -if (event_calendar_has_personal_event($event->guid,get_loggedin_userid())) { +if (event_calendar_has_personal_event($event->guid,elgg_get_logged_in_user_guid())) { $calendar_bit = 'checked = "checked"'; } else { $calendar_bit = ''; } -$calendar_bit .= ' onclick="javascript:event_calendar_personal_toggle('.$event->guid.'); return true;" '; - $info = ''; $info .= ''.$date_bit.''; $info .= ''.$time_bit.''; $info .= ''.$event->title.''; $info .= ''.$event->venue.''; if ($vars['personal_manage'] != 'no') { - $info .= ''; + $info .= ''; } $info .= ''; diff --git a/views/default/event_calendar/paged_view.php b/views/default/event_calendar/paged_view.php index 7c2ea2eaa..f8257792f 100644 --- a/views/default/event_calendar/paged_view.php +++ b/views/default/event_calendar/paged_view.php @@ -1,4 +1,5 @@ $_SERVER['REQUEST_URI'], @@ -8,8 +9,8 @@ $nav = elgg_view('navigation/pagination',array( 'limit' => $vars['limit'], )); -$event_calendar_times = get_plugin_setting('times', 'event_calendar'); -$event_calendar_personal_manage = get_plugin_setting('personal_manage', 'event_calendar'); +$event_calendar_times = elgg_get_plugin_setting('times', 'event_calendar'); +$event_calendar_personal_manage = elgg_get_plugin_setting('personal_manage', 'event_calendar'); $events = $vars['events']; $html = ''; $date_format = 'F Y'; @@ -33,19 +34,3 @@ $msgs = '
'; $html = $msgs.$nav.'
'.$html.'
'.$nav; echo $html; -?> - \ No newline at end of file diff --git a/views/default/event_calendar/region_select.php b/views/default/event_calendar/region_select.php index 81407b27d..a987171a2 100644 --- a/views/default/event_calendar/region_select.php +++ b/views/default/event_calendar/region_select.php @@ -1,6 +1,6 @@ 'region','js'=>$js,'value'=>$vars['region'],'options_values'=>$options_values)); + $body .= elgg_view('input/hidden',array('id'=>'event-calendar-region-url-start','value'=>$vars['url_start'])); + $body .= elgg_view("input/dropdown",array('id' => 'event-calendar-region','value'=>$vars['region'],'options_values'=>$options_values)); $body .= '
'; } echo $body; -?> \ No newline at end of file diff --git a/views/default/event_calendar/review_requests.php b/views/default/event_calendar/review_requests.php index e1866a32b..11916b4e3 100644 --- a/views/default/event_calendar/review_requests.php +++ b/views/default/event_calendar/review_requests.php @@ -10,16 +10,21 @@ foreach($vars['requests'] as $request) { $info .= '
'; $info .= elgg_view('output/confirmlink', array( - 'class' => "cancel_button", - 'href' => $vars['url'] . 'action/event_calendar/killrequest?user_guid='.$request->guid.'&event_id=' . $vars['entity']->guid, + 'class' => "elgg-button elgg-button-delete", + 'href' => 'action/event_calendar/killrequest?user_guid='.$request->guid.'&event_guid=' . $vars['entity']->guid, 'confirm' => elgg_echo('event_calendar:request:remove:check'), - 'text' => elgg_echo('delete'), + 'text' => elgg_echo('event_calendar:review_requests:reject'), + 'title' => elgg_echo('event_calendar:review_requests:reject:title'), )); $info .= '  '; - $url = elgg_add_action_tokens_to_url("{$vars['url']}action/event_calendar/addtocalendar?user_guid={$request->guid}&event_id={$vars['entity']->guid}"); - $info .= ''.elgg_echo('accept').''; - echo elgg_view_listing($icon,$info); + $info .= elgg_view('output/url', array( + 'text' => elgg_echo('event_calendar:review_requests:accept'), + 'title' => elgg_echo('event_calendar:review_requests:accept:title'), + 'href' => "action/event_calendar/addtocalendar?user_guid={$request->guid}&event_guid={$vars['entity']->guid}", + 'class' => "elgg-button elgg-button-submit", + 'is_action' => TRUE, + )); + //$url = elgg_add_action_tokens_to_url("{$vars['url']}action/event_calendar/addtocalendar?user_guid={$request->guid}&event_guid={$vars['entity']->guid}"); + echo elgg_view_image_block($icon,$info); } } - -?> diff --git a/views/default/event_calendar/show_events.php b/views/default/event_calendar/show_events.php index 580fb5a45..b51b1c05f 100644 --- a/views/default/event_calendar/show_events.php +++ b/views/default/event_calendar/show_events.php @@ -13,23 +13,21 @@ $listing_format = $vars['listing_format']; if ($vars['events']) { - if (elgg_get_plugin_setting('agenda_view', 'event_calendar') == 'yes') { + if ($listing_format == 'agenda') { $event_list = elgg_view('event_calendar/agenda_view',$vars); + } else if ($listing_format == 'paged') { + $event_list = elgg_view('event_calendar/paged_view',$vars); } else { - if ($listing_format == 'paged') { - $event_list = elgg_view('event_calendar/paged_view',$vars); - } else { - $options = array( - 'list_class' => 'elgg-list-entity', - 'full_view' => FALSE, - 'pagination' => TRUE, - 'list_type' => 'listing', - 'list_type_toggle' => FALSE, - 'offset' => $vars['offset'], - 'limit' => $vars['limit'], - ); - $event_list = elgg_view_entity_list($vars['events'], $options); - } + $options = array( + 'list_class' => 'elgg-list-entity', + 'full_view' => FALSE, + 'pagination' => TRUE, + 'list_type' => 'listing', + 'list_type_toggle' => FALSE, + 'offset' => $vars['offset'], + 'limit' => $vars['limit'], + ); + $event_list = elgg_view_entity_list($vars['events'], $options); } } else { $event_list = '

'.elgg_echo('event_calendar:no_events_found').'

'; diff --git a/views/default/js/event_calendar/event_calendar.php b/views/default/js/event_calendar/event_calendar.php new file mode 100644 index 000000000..f3f5b68c8 --- /dev/null +++ b/views/default/js/event_calendar/event_calendar.php @@ -0,0 +1,69 @@ +// \ No newline at end of file diff --git a/views/default/object/event_calendar.php b/views/default/object/event_calendar.php index 43e7847dc..c3c18cc92 100644 --- a/views/default/object/event_calendar.php +++ b/views/default/object/event_calendar.php @@ -12,8 +12,9 @@ */ $event = $vars['entity']; +$full = elgg_extract('full_view', $vars, FALSE); -if ($vars['full']) { +if ($full) { $body = elgg_view('event_calendar/strapline',$vars); $event_items = event_calendar_get_formatted_full_items($event); $body .= '
'; diff --git a/views/default/river/object/event_calendar/create.php b/views/default/river/object/event_calendar/create.php index f144ca610..e74a8f891 100644 --- a/views/default/river/object/event_calendar/create.php +++ b/views/default/river/object/event_calendar/create.php @@ -1,12 +1,22 @@ subject_guid); + /*$performed_by = get_entity($vars['item']->subject_guid); $object = get_entity($vars['item']->object_guid); $url = "getURL()}\">{$performed_by->name}"; $string = sprintf(elgg_echo("event_calendar:river:created"),$url) . " "; - $string .= elgg_echo("event_calendar:river:create")." getURL() . "\">" . $object->title . ""; + $string .= elgg_echo("event_calendar:river:create")." getURL() . "\">" . $object->title . "";*/ -?> +/** + * Event calendar river view. + */ - \ No newline at end of file +$object = $vars['item']->getObjectEntity(); +$excerpt = strip_tags($object->description); +$vars['excerpt'] = elgg_get_excerpt($excerpt); + +echo elgg_view('page/components/image_block', array( + 'image' => '', + 'body' => elgg_view('river/elements/body', $vars), + 'class' => 'elgg-river-item', +)); \ No newline at end of file diff --git a/views/default/river/object/event_calendar/update.php b/views/default/river/object/event_calendar/update.php index 5a5d376b1..f4526cd2a 100644 --- a/views/default/river/object/event_calendar/update.php +++ b/views/default/river/object/event_calendar/update.php @@ -1,12 +1,16 @@ subject_guid); + /*$performed_by = get_entity($vars['item']->subject_guid); $object = get_entity($vars['item']->object_guid); $url = "getURL()}\">{$performed_by->name}"; $string = sprintf(elgg_echo("event_calendar:river:updated"),$url) . " "; - $string .= elgg_echo("event_calendar:river:the_event")." getURL() . "\">" . $object->title . ""; + $string .= elgg_echo("event_calendar:river:the_event")." getURL() . "\">" . $object->title . "";*/ -?> +$object = $vars['item']->getObjectEntity(); - \ No newline at end of file +echo elgg_view('page/components/image_block', array( + 'image' => '', + 'body' => elgg_view('river/elements/body', $vars), + 'class' => 'elgg-river-item', +)); diff --git a/views/default/settings/event_calendar/edit.php b/views/default/settings/event_calendar/edit.php index 429a85b26..51bd2c49f 100644 --- a/views/default/settings/event_calendar/edit.php +++ b/views/default/settings/event_calendar/edit.php @@ -10,12 +10,13 @@ $access_options = array( ACCESS_PRIVATE => elgg_echo("PRIVATE"), // TODO - merge the agenda view into the list format options $listing_options = array(elgg_echo('event_calendar:settings:paged')=>'paged', + elgg_echo('event_calendar:settings:agenda')=>'agenda', elgg_echo('event_calendar:settings:month')=>'month', ); $body = ''; -$event_calendar_hide_access = get_plugin_setting('hide_access', 'event_calendar'); +$event_calendar_hide_access = elgg_get_plugin_setting('hide_access', 'event_calendar'); if (!$event_calendar_hide_access) { $event_calendar_hide_access = 'no'; } @@ -26,7 +27,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[hide_access]','va $body .= '
'; -$event_calendar_default_access = get_plugin_setting('default_access', 'event_calendar'); +$event_calendar_default_access = elgg_get_plugin_setting('default_access', 'event_calendar'); if (!$event_calendar_default_access) { $event_calendar_default_access = ACCESS_LOGGED_IN; } @@ -37,7 +38,7 @@ $body .= elgg_view('input/pulldown',array('internalname'=>'params[default_access $body .= '

'; -$event_calendar_hide_end = get_plugin_setting('hide_end', 'event_calendar'); +$event_calendar_hide_end = elgg_get_plugin_setting('hide_end', 'event_calendar'); if (!$event_calendar_hide_end) { $event_calendar_hide_end = 'no'; } @@ -48,7 +49,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[hide_end]','value $body .= '
'; -$event_calendar_listing_format = get_plugin_setting('listing_format', 'event_calendar'); +$event_calendar_listing_format = elgg_get_plugin_setting('listing_format', 'event_calendar'); if (!$event_calendar_listing_format) { $event_calendar_listing_format = 'month'; } @@ -59,7 +60,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[listing_format]', $body .= '
'; -$event_calendar_times = get_plugin_setting('times', 'event_calendar'); +$event_calendar_times = elgg_get_plugin_setting('times', 'event_calendar'); if (!$event_calendar_times) { $event_calendar_times = 'no'; } @@ -70,7 +71,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[times]','value'=> $body .= '
'; -$event_calendar_autopersonal = get_plugin_setting('autopersonal', 'event_calendar'); +$event_calendar_autopersonal = elgg_get_plugin_setting('autopersonal', 'event_calendar'); if (!$event_calendar_autopersonal) { $event_calendar_autopersonal = 'yes'; } @@ -81,7 +82,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[autopersonal]','v $body .= '
'; -$event_calendar_autogroup = get_plugin_setting('autogroup', 'event_calendar'); +$event_calendar_autogroup = elgg_get_plugin_setting('autogroup', 'event_calendar'); if (!$event_calendar_autogroup) { $event_calendar_autogroup = 'no'; } @@ -92,7 +93,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[autogroup]','valu $body .= '
'; -$event_calendar_add_to_group_calendar = get_plugin_setting('add_to_group_calendar', 'event_calendar'); +$event_calendar_add_to_group_calendar = elgg_get_plugin_setting('add_to_group_calendar', 'event_calendar'); if (!$event_calendar_add_to_group_calendar) { $event_calendar_add_to_group_calendar = 'no'; } @@ -103,7 +104,9 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[add_to_group_cale $body .= '
'; -$event_calendar_agenda_view = get_plugin_setting('agenda_view', 'event_calendar'); +// agenda view is now handled in the listing area + +/*$event_calendar_agenda_view = get_plugin_setting('agenda_view', 'event_calendar'); if (!$event_calendar_agenda_view) { $event_calendar_agenda_view = 'no'; } @@ -112,9 +115,9 @@ $body .= elgg_echo('event_calendar:settings:agenda_view:title'); $body .= '
'; $body .= elgg_view('input/radio',array('internalname'=>'params[agenda_view]','value'=>$event_calendar_agenda_view,'options'=>$yn_options)); -$body .= '
'; +$body .= '
';*/ -$event_calendar_venue_view = get_plugin_setting('venue_view', 'event_calendar'); +$event_calendar_venue_view = elgg_get_plugin_setting('venue_view', 'event_calendar'); if (!$event_calendar_venue_view) { $event_calendar_venue_view = 'no'; } @@ -130,7 +133,7 @@ $options = array(elgg_echo('event_calendar:settings:no')=>'no', elgg_echo('event_calendar:settings:site_calendar:loggedin')=>'loggedin', ); -$event_calendar_site_calendar = get_plugin_setting('site_calendar', 'event_calendar'); +$event_calendar_site_calendar = elgg_get_plugin_setting('site_calendar', 'event_calendar'); if (!$event_calendar_site_calendar) { $event_calendar_site_calendar = 'admin'; } @@ -145,7 +148,7 @@ $options = array(elgg_echo('event_calendar:settings:no')=>'no', elgg_echo('event_calendar:settings:group_calendar:members')=>'members', ); -$event_calendar_group_calendar = get_plugin_setting('group_calendar', 'event_calendar'); +$event_calendar_group_calendar = elgg_get_plugin_setting('group_calendar', 'event_calendar'); if (!$event_calendar_group_calendar) { $event_calendar_group_calendar = 'members'; } @@ -159,7 +162,7 @@ $options = array(elgg_echo('event_calendar:settings:group_default:yes')=>'yes', elgg_echo('event_calendar:settings:group_default:no')=>'no', ); -$event_calendar_group_default = get_plugin_setting('group_default', 'event_calendar'); +$event_calendar_group_default = elgg_get_plugin_setting('group_default', 'event_calendar'); if (!$event_calendar_group_default) { $event_calendar_group_default = 'yes'; } @@ -170,7 +173,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[group_default]',' $body .= '
'; -$event_calendar_group_always_display = get_plugin_setting('group_always_display', 'event_calendar'); +$event_calendar_group_always_display = elgg_get_plugin_setting('group_always_display', 'event_calendar'); if (!$event_calendar_group_always_display) { $event_calendar_group_always_display = 'no'; } @@ -181,12 +184,14 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[group_always_disp $body .= '
'; -$options = array(elgg_echo('event_calendar:settings:group_profile_display_option:left')=>'left', +// There does not seem to be a way to determine where the group calendar box will appear in Elgg 1.8 + +/*$options = array(elgg_echo('event_calendar:settings:group_profile_display_option:left')=>'left', elgg_echo('event_calendar:settings:group_profile_display_option:right')=>'right', elgg_echo('event_calendar:settings:group_profile_display_option:none')=>'none', ); -$event_calendar_group_profile_display = get_plugin_setting('group_profile_display', 'event_calendar'); +$event_calendar_group_profile_display = elgg_get_plugin_setting('group_profile_display', 'event_calendar'); if (!$event_calendar_group_profile_display) { $event_calendar_group_profile_display = 'right'; } @@ -194,9 +199,9 @@ if (!$event_calendar_group_profile_display) { $body .= elgg_echo('event_calendar:settings:group_profile_display:title').'
'; $body .= elgg_view('input/radio',array('internalname'=>'params[group_profile_display]','value'=>$event_calendar_group_profile_display,'options'=>$options)); -$body .= '
'; +$body .= '
';*/ -$event_calendar_add_users = get_plugin_setting('add_users', 'event_calendar'); +$event_calendar_add_users = elgg_get_plugin_setting('add_users', 'event_calendar'); if (!$event_calendar_add_users) { $event_calendar_add_users = 'no'; } @@ -207,7 +212,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[add_users]','valu $body .= '
'; -$event_calendar_add_users_notify = get_plugin_setting('add_users_notify', 'event_calendar'); +$event_calendar_add_users_notify = elgg_get_plugin_setting('add_users_notify', 'event_calendar'); if (!$event_calendar_add_users_notify) { $event_calendar_add_users_notify = 'no'; } @@ -218,7 +223,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[add_users_notify] $body .= '
'; -$event_calendar_personal_manage = get_plugin_setting('personal_manage', 'event_calendar'); +$event_calendar_personal_manage = elgg_get_plugin_setting('personal_manage', 'event_calendar'); if (!$event_calendar_personal_manage) { $event_calendar_personal_manage = 'yes'; } @@ -229,7 +234,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[personal_manage]' $body .= '
'; -$event_calendar_spots_display = get_plugin_setting('spots_display', 'event_calendar'); +$event_calendar_spots_display = elgg_get_plugin_setting('spots_display', 'event_calendar'); if (!$event_calendar_spots_display) { $event_calendar_spots_display = 'no'; } @@ -240,7 +245,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[spots_display]',' $body .= '
'; -$event_calendar_no_collisions = get_plugin_setting('no_collisions', 'event_calendar'); +$event_calendar_no_collisions = elgg_get_plugin_setting('no_collisions', 'event_calendar'); if (!$event_calendar_no_collisions) { $event_calendar_no_collisions = 'no'; } @@ -251,7 +256,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[no_collisions]',' $body .= '
'; -$event_calendar_collision_length = get_plugin_setting('collision_length', 'event_calendar'); +$event_calendar_collision_length = elgg_get_plugin_setting('collision_length', 'event_calendar'); if (!$event_calendar_collision_length) { $event_calendar_collision_length = '3600'; } @@ -262,7 +267,7 @@ $body .= elgg_view('input/text',array('internalname'=>'params[collision_length]' $body .= '

'; -$event_calendar_region_display = get_plugin_setting('region_display', 'event_calendar'); +$event_calendar_region_display = elgg_get_plugin_setting('region_display', 'event_calendar'); if (!$event_calendar_region_display) { $event_calendar_region_display = 'no'; } @@ -273,7 +278,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[region_display]', $body .= '
'; -$event_calendar_region_list = get_plugin_setting('region_list', 'event_calendar'); +$event_calendar_region_list = elgg_get_plugin_setting('region_list', 'event_calendar'); if (!$event_calendar_region_list) { $event_calendar_region_list = ''; } @@ -284,7 +289,7 @@ $body .= elgg_view('event_calendar/input/longtext',array('internalname'=>'params $body .= '
'; -$event_calendar_region_list_handles = get_plugin_setting('region_list_handles', 'event_calendar'); +$event_calendar_region_list_handles = elgg_get_plugin_setting('region_list_handles', 'event_calendar'); if (!$event_calendar_region_list_handles) { $event_calendar_region_list_handles = 'no'; } @@ -295,7 +300,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[region_list_handl $body .= '
'; -$event_calendar_type_display = get_plugin_setting('type_display', 'event_calendar'); +$event_calendar_type_display = elgg_get_plugin_setting('type_display', 'event_calendar'); if (!$event_calendar_type_display) { $event_calendar_type_display = 'no'; } @@ -306,7 +311,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[type_display]','v $body .= '
'; -$event_calendar_type_list = get_plugin_setting('type_list', 'event_calendar'); +$event_calendar_type_list = elgg_get_plugin_setting('type_list', 'event_calendar'); if (!$event_calendar_type_list) { $event_calendar_type_list = ''; } @@ -317,7 +322,7 @@ $body .= elgg_view('event_calendar/input/longtext',array('internalname'=>'params $body .= '
'; -$event_calendar_type_list_handles = get_plugin_setting('type_list_handles', 'event_calendar'); +$event_calendar_type_list_handles = elgg_get_plugin_setting('type_list_handles', 'event_calendar'); if (!$event_calendar_type_list_handles) { $event_calendar_type_list_handles = 'no'; } @@ -328,7 +333,7 @@ $body .= elgg_view('input/radio',array('internalname'=>'params[type_list_handles $body .= '
'; -$event_calendar_first_date = get_plugin_setting('first_date', 'event_calendar'); +$event_calendar_first_date = elgg_get_plugin_setting('first_date', 'event_calendar'); if (!$event_calendar_first_date) { $event_calendar_first_date = ''; } @@ -339,7 +344,7 @@ $body .= elgg_view('input/text',array('internalname'=>'params[first_date]','valu $body .= '

'; -$event_calendar_last_date = get_plugin_setting('last_date', 'event_calendar'); +$event_calendar_last_date = elgg_get_plugin_setting('last_date', 'event_calendar'); if (!$event_calendar_last_date) { $event_calendar_last_date = ''; } @@ -350,7 +355,7 @@ $body .= elgg_view('input/text',array('internalname'=>'params[last_date]','value $body .= '

'; -$event_calendar_more_required = get_plugin_setting('more_required', 'event_calendar'); +$event_calendar_more_required = elgg_get_plugin_setting('more_required', 'event_calendar'); if (!$event_calendar_more_required) { $event_calendar_more_required = 'no'; } -- cgit v1.2.3