diff --git a/calendar/renderer.php b/calendar/renderer.php index 1a87d58eaeb..cd6cfa9838b 100644 --- a/calendar/renderer.php +++ b/calendar/renderer.php @@ -598,79 +598,6 @@ class core_calendar_renderer extends plugin_renderer_base { return $output; } - /** - * Displays a filter selection table - * - * @param calendar_information $calendar - * @return string - * @deprecated since Moodle 2.4 MDL-32309 - * @see calendar_filter_controls() - */ - protected function filter_selection_table(calendar_information $calendar, moodle_url $returnurl = null) { - global $SESSION; - debugging('Method core_calendar_renderer::filter_selection_table() is deprecated, please use '. - 'calendar_filter_controls() instead', DEBUG_DEVELOPER); - - if ($returnurl === null) { - $returnurl = $this->page->url; - } - - $output = html_writer::start_tag('div', array('class'=>'filters')); - $output .= html_writer::start_tag('table'); - $output .= html_writer::start_tag('tr'); - - // Global events - $link = new moodle_url(CALENDAR_URL.'set.php', array('var' => 'showglobal', 'return' => base64_encode($returnurl->out(false)), 'sesskey'=>sesskey())); - $strglobalevents = get_string('globalevents', 'calendar'); - if (calendar_show_event_type(CALENDAR_EVENT_GLOBAL)) { - $output .= html_writer::tag('td', '', array('class'=>'calendar_event_global', 'style'=>'width:8px;')); - $output .= html_writer::tag('td', html_writer::tag('strong', $strglobalevents).' '.get_string('shown', 'calendar').' ('.html_writer::link($link, get_string('clickhide', 'calendar').''.$strglobalevents.'').')'); - } else { - $output .= html_writer::tag('td', '', array('style'=>'width:8px;')); - $output .= html_writer::tag('td', html_writer::tag('strong', $strglobalevents).' '.get_string('hidden', 'calendar').' ('.html_writer::link($link, get_string('clickshow', 'calendar').''.$strglobalevents.'').')'); - } - - // Course events - $link = new moodle_url(CALENDAR_URL.'set.php', array('var'=>'showcourses', 'return' => base64_encode($returnurl->out(false)), 'sesskey'=>sesskey())); - $strcourseevents = get_string('courseevents', 'calendar'); - if (calendar_show_event_type(CALENDAR_EVENT_COURSE)) { - $output .= html_writer::tag('td', '', array('class'=>'calendar_event_course', 'style'=>'width:8px;')); - $output .= html_writer::tag('td', html_writer::tag('strong', $strcourseevents).' '.get_string('shown', 'calendar').' ('.html_writer::link($link, get_string('clickhide', 'calendar').''.$strcourseevents.'').')'); - } else { - $output .= html_writer::tag('td', '', array('style'=>'width:8px;')); - $output .= html_writer::tag('td', html_writer::tag('strong', $strcourseevents).' '.get_string('hidden', 'calendar').' ('.html_writer::link($link, get_string('clickshow', 'calendar').''.$strcourseevents.'').')'); - } - $output .= html_writer::end_tag('tr'); - - if(isloggedin() && !isguestuser()) { - $output .= html_writer::start_tag('tr'); - // Group events - $link = new moodle_url(CALENDAR_URL.'set.php', array('var'=>'showgroups', 'return' => base64_encode($returnurl->out(false)), 'sesskey'=>sesskey())); - $strgroupevents = get_string('groupevents', 'calendar'); - if (calendar_show_event_type(CALENDAR_EVENT_GROUP)) { - $output .= html_writer::tag('td', '', array('class'=>'calendar_event_group', 'style'=>'width:8px;')); - $output .= html_writer::tag('td', html_writer::tag('strong', $strgroupevents).' '.get_string('shown', 'calendar').' ('.html_writer::link($link, get_string('clickhide', 'calendar').''.$strgroupevents.'').')'); - } else { - $output .= html_writer::tag('td', '', array('style'=>'width:8px;')); - $output .= html_writer::tag('td', html_writer::tag('strong', $strgroupevents).' '.get_string('hidden', 'calendar').' ('.html_writer::link($link, get_string('clickshow', 'calendar').''.$strgroupevents.'').')'); - } - // User events - $link = new moodle_url(CALENDAR_URL.'set.php', array('var'=>'showuser', 'return' => base64_encode($returnurl->out(false)), 'sesskey'=>sesskey())); - $struserevents = get_string('userevents', 'calendar'); - if (calendar_show_event_type(CALENDAR_EVENT_USER)) { - $output .= html_writer::tag('td', '', array('class'=>'calendar_event_user', 'style'=>'width:8px;')); - $output .= html_writer::tag('td', html_writer::tag('strong', $struserevents).' '.get_string('shown', 'calendar').' ('.html_writer::link($link, get_string('clickhide', 'calendar').''.$struserevents.'').')'); - } else { - $output .= html_writer::tag('td', '', array('style'=>'width:8px;')); - $output .= html_writer::tag('td', html_writer::tag('strong', $struserevents).' '.get_string('hidden', 'calendar').' ('.html_writer::link($link, get_string('clickshow', 'calendar').''.$struserevents.'').')'); - } - $output .= html_writer::end_tag('tr'); - } - $output .= html_writer::end_tag('table'); - $output .= html_writer::end_tag('div'); - return $output; - } - /** * Displays upcoming events * @@ -855,4 +782,4 @@ class core_calendar_renderer extends plugin_renderer_base { $html .= html_writer::end_tag('form'); return $html; } -} \ No newline at end of file +}