MDL-40829: courses heading: remove 'headerblock' class from header and fix heading levels

This commit is contained in:
Rossiani Wijaya 2013-09-05 13:37:29 +08:00 committed by Dan Poltawski
parent 62b35d5852
commit 278d64572d
28 changed files with 22 additions and 132 deletions

View file

@ -651,7 +651,7 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
// Title with section navigation links.
$sectionnavlinks = $this->get_nav_links($course, $modinfo->get_section_info_all(), $displaysection);
$sectiontitle = '';
$sectiontitle .= html_writer::start_tag('div', array('class' => 'section-navigation header headingblock'));
$sectiontitle .= html_writer::start_tag('div', array('class' => 'section-navigation'));
$sectiontitle .= html_writer::tag('span', $sectionnavlinks['previous'], array('class' => 'mdl-left'));
$sectiontitle .= html_writer::tag('span', $sectionnavlinks['next'], array('class' => 'mdl-right'));
// Title attributes

View file

@ -1129,9 +1129,11 @@ class core_course_renderer extends plugin_renderer_base {
$classes = trim('coursebox clearfix '. $additionalclasses);
if ($chelper->get_show_courses() >= self::COURSECAT_SHOW_COURSES_EXPANDED) {
$nametag = 'h3';
$nameattributes = array();
} else {
$classes .= ' collapsed';
$nametag = 'div';
$nameattributes = array('class' => 'name');
}
$content .= html_writer::start_tag('div', array('class' => $classes)); // .coursebox
@ -1141,7 +1143,7 @@ class core_course_renderer extends plugin_renderer_base {
$coursename = $chelper->get_course_formatted_name($course);
$coursenamelink = html_writer::link(new moodle_url('/course/view.php', array('id' => $course->id)),
$coursename, array('class' => $course->visible ? '' : 'dimmed'));
$content .= html_writer::tag($nametag, $coursenamelink, array('class' => 'name'));
$content .= html_writer::tag($nametag, $coursenamelink, $nameattributes);
// If we display course in collapsed form but the course has summary or course contacts, display the link to the info page.
$content .= html_writer::start_tag('div', array('class' => 'moreinfo'));
@ -1513,7 +1515,7 @@ class core_course_renderer extends plugin_renderer_base {
array('title' => get_string('numberofcourses'), 'class' => 'numberofcourse'));
}
$content .= html_writer::start_tag('div', array('class' => 'info'));
$content .= html_writer::tag(($depth > 1) ? 'h4' : 'h3', $categoryname, array('class' => 'name'));
$content .= html_writer::tag(($depth > 1) ? 'h4' : 'h3', $categoryname);
$content .= html_writer::end_tag('div'); // .info
// add category content to the output