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

This commit is contained in:
Dan Poltawski
2012-09-17 12:40:02 +08:00
2 changed files with 3 additions and 2 deletions
+1
View File
@@ -1445,6 +1445,7 @@ M.util.help_icon = {
},
display_callback : function(content) {
content = '<div role="alert">' + content + '</div>';
this.overlay.set('bodyContent', content);
},
+2 -2
View File
@@ -1727,7 +1727,7 @@ class core_renderer extends renderer_base {
// 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);
@@ -1792,7 +1792,7 @@ class core_renderer extends renderer_base {
// 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);