moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-03 16:13:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-53855' of git://github.com/timhunt/moodle

Browse source
This commit is contained in:
Dan Poltawski 2016-04-26 11:17:45 +01:00
commit 2ef629e86d
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/outputrenderers.php
View file

@ -3481,8 +3481,11 @@ EOD;
}
//accessibility: heading for navbar list (MDL-20446)
$navbarcontent = html_writer::tag('span', get_string('pagepath'), array('class'=>'accesshide'));
$navbarcontent .= html_writer::tag('nav', html_writer::tag('ul', join('', $htmlblocks)));
$navbarcontent = html_writer::tag('span', get_string('pagepath'),
array('class' => 'accesshide', 'id' => 'navbar-label'));
$navbarcontent .= html_writer::tag('nav',
html_writer::tag('ul', join('', $htmlblocks)),
array('aria-labelledby' => 'navbar-label'));
// XHTML
return $navbarcontent;
}
@ -4243,7 +4246,7 @@ EOD;
$html = html_writer::start_tag('header', array('id' => 'page-header', 'class' => 'clearfix'));
$html .= $this->context_header();
$html .= html_writer::start_div('clearfix', array('id' => 'page-navbar'));
$html .= html_writer::tag('nav', $this->navbar(), array('class' => 'breadcrumb-nav'));
$html .= html_writer::tag('div', $this->navbar(), array('class' => 'breadcrumb-nav'));
$html .= html_writer::div($this->page_heading_button(), 'breadcrumb-button');
$html .= html_writer::end_div();
$html .= html_writer::tag('div', $this->course_header(), array('id' => 'course-header'));

5
theme/bootstrapbase/renderers/core_renderer.php
View file

@ -64,8 +64,9 @@ class theme_bootstrapbase_core_renderer extends core_renderer {
}
$divider = '<span class="divider">'.get_separator().'</span>';
$list_items = '<li>'.join(" $divider</li><li>", $breadcrumbs).'</li>';
$title = '<span class="accesshide">'.get_string('pagepath').'</span>';
return $title . "<ul class=\"breadcrumb\">$list_items</ul>";
$title = '<span class="accesshide" id="navbar-label">'.get_string('pagepath').'</span>';
return $title . '<nav aria-labelledby="navbar-label"><ul class="breadcrumb">' .
$list_items . '</ul></nav>';
}
/*