Merge branch 'MDL-49811_master' of git://github.com/jinhofer/moodle

This commit is contained in:
David Monllao 2015-10-06 10:19:02 +08:00 committed by Dan Poltawski
commit 7da61f95ce
5 changed files with 41 additions and 22 deletions

View file

@ -1394,8 +1394,11 @@ class core_renderer extends renderer_base {
$output = '';
$skipdest = '';
} else {
$output = html_writer::tag('a', get_string('skipa', 'access', $skiptitle), array('href' => '#sb-' . $bc->skipid, 'class' => 'skip-block'));
$skipdest = html_writer::tag('span', '', array('id' => 'sb-' . $bc->skipid, 'class' => 'skip-block-to'));
$output = html_writer::link('#', get_string('skipa', 'access', $skiptitle),
array('class' => 'skip skip-block', 'id'=>'fsb-' . $bc->skipid,
'data-target' => '#sb-'.$bc->skipid));
$skipdest = html_writer::span('', 'skip-block-to',
array('id' => 'sb-' . $bc->skipid, 'tabindex' => '-1'));
}
$output .= html_writer::start_tag('div', $bc->attributes);
@ -2960,7 +2963,7 @@ EOD;
* @return string the HTML to output.
*/
public function skip_link_target($id = null) {
return html_writer::tag('span', '', array('id' => $id));
return html_writer::span('', '', array('id' => $id, 'tabindex' => '-1'));
}
/**