From c7f8a543d4b7ba038437599b06cfaf55cbd63e1f Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Fri, 23 Mar 2012 13:39:51 +0800 Subject: [PATCH] MDL-30904 Calendar: Event links are descriptive with hidden event name, for screen readers --- calendar/renderer.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/calendar/renderer.php b/calendar/renderer.php index ade2f6384f0..4fe8301b8bf 100644 --- a/calendar/renderer.php +++ b/calendar/renderer.php @@ -581,22 +581,24 @@ class core_calendar_renderer extends plugin_renderer_base { // 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', get_string('globalevents', 'calendar')).' '.get_string('shown', 'calendar').' ('.html_writer::link($link, get_string('clickhide', 'calendar')).')'); + $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', get_string('globalevents', 'calendar')).' '.get_string('hidden', 'calendar').' ('.html_writer::link($link, get_string('clickshow', 'calendar')).')'); + $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', get_string('courseevents', 'calendar')).' '.get_string('shown', 'calendar').' ('.html_writer::link($link, get_string('clickhide', 'calendar')).')'); + $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', get_string('courseevents', 'calendar')).' '.get_string('hidden', 'calendar').' ('.html_writer::link($link, get_string('clickshow', 'calendar')).')'); + $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'); @@ -604,21 +606,23 @@ class core_calendar_renderer extends plugin_renderer_base { $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', get_string('groupevents', 'calendar')).' '.get_string('shown', 'calendar').' ('.html_writer::link($link, get_string('clickhide', 'calendar')).')'); + $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', get_string('groupevents', 'calendar')).' '.get_string('hidden', 'calendar').' ('.html_writer::link($link, get_string('clickshow', 'calendar')).')'); + $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', get_string('userevents', 'calendar')).' '.get_string('shown', 'calendar').' ('.html_writer::link($link, get_string('clickhide', 'calendar')).')'); + $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', get_string('userevents', 'calendar')).' '.get_string('hidden', 'calendar').' ('.html_writer::link($link, get_string('clickshow', 'calendar')).')'); + $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'); }