Permalink
Browse files

Merge branch 'MDL-30847_22' of git://github.com/dmonllao/moodle into …

…MOODLE_22_STABLE
  • Loading branch information...
2 parents f0cbaa1 + afc5447 commit 9facd25c148594a4781466c218def12acdcd2ef5 @danpoltawski danpoltawski committed Sep 17, 2012
Showing with 3 additions and 2 deletions.
  1. +1 −0 lib/javascript-static.js
  2. +2 −2 lib/outputrenderers.php
@@ -1376,6 +1376,7 @@ M.util.help_icon = {
},
display_callback : function(content) {
+ content = '<div role="alert">' + content + '</div>';
this.overlay.set('bodyContent', content);
},
@@ -1617,7 +1617,7 @@ protected function render_old_help_icon(old_help_icon $helpicon) {
// note: this title is displayed only if JS is disabled, otherwise the link will have the new ajax tooltip
$title = get_string('helpprefix2', '', trim($helpicon->title, ". \t"));
- $attributes = array('href'=>$url, 'title'=>$title);
+ $attributes = array('href'=>$url, 'title'=>$title, 'aria-haspopup' => 'true');
$id = html_writer::random_id('helpicon');
$attributes['id'] = $id;
$output = html_writer::tag('a', $output, $attributes);
@@ -1681,7 +1681,7 @@ protected function render_help_icon(help_icon $helpicon) {
// note: this title is displayed only if JS is disabled, otherwise the link will have the new ajax tooltip
$title = get_string('helpprefix2', '', trim($title, ". \t"));
- $attributes = array('href'=>$url, 'title'=>$title);
+ $attributes = array('href'=>$url, 'title'=>$title, 'aria-haspopup' => 'true');
$id = html_writer::random_id('helpicon');
$attributes['id'] = $id;
$output = html_writer::tag('a', $output, $attributes);

0 comments on commit 9facd25

Please sign in to comment.