Merge branch 'MDL-48947_v3_patch' of https://github.com/Syxton/moodle

This commit is contained in:
Dan Poltawski 2015-10-01 16:12:09 +01:00
commit 331315a4c1
2 changed files with 5 additions and 7 deletions

View File

@ -216,7 +216,8 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
if ($hasnamenotsecpg || $hasnamesecpg) {
$classes = '';
}
$o.= $this->output->heading($this->section_title($section, $course), 3, 'sectionname' . $classes);
$sectionname = html_writer::tag('span', $this->section_title($section, $course));
$o.= $this->output->heading($sectionname, 3, 'sectionname' . $classes);
$o.= html_writer::start_tag('div', array('class' => 'summary'));
$o.= $this->format_summary_text($section);
@ -790,7 +791,8 @@ abstract class format_section_renderer_base extends plugin_renderer_base {
if (!$thissection->visible) {
$classes .= ' dimmed_text';
}
$sectiontitle .= $this->output->heading(get_section_name($course, $displaysection), 3, $classes);
$sectionname = html_writer::tag('span', get_section_name($course, $displaysection));
$sectiontitle .= $this->output->heading($sectionname, 3, $classes);
$sectiontitle .= html_writer::end_tag('div');
echo $sectiontitle;

View File

@ -53,8 +53,6 @@
&.right {
float: right;
}
position: relative;
z-index: 10;
}
.spinner {
height: 16px;
@ -152,8 +150,6 @@
&.right {
float: left;
}
position: relative;
z-index: 10;
}
.activity {
.spinner {
@ -342,7 +338,7 @@
margin-top: 0;
}
.course-content ul li.section.hidden {
.sectionname,
.sectionname > span,
.content > div, /* All the divs but the activities which are in a UL. */
.activity .activityinstance {
opacity: .5;