Permalink
Browse files

Merge branch 'MDL-61019-master' of https://github.com/lucaboesch/moodle

  • Loading branch information...
dmonllao committed Jul 16, 2018
2 parents bfeef10 + 9004441 commit 011c1a42918cd1ea88c60296b659a8f9c4af1c0c
Showing with 23 additions and 4 deletions.
  1. +8 −4 mod/lesson/renderer.php
  2. +9 −0 theme/boost/scss/moodle/modules.scss
  3. +6 −0 theme/boost/style/moodle.css
@@ -505,10 +505,14 @@ public function progress_bar(lesson $lesson, $progress = null) {
$progress = $lesson->calculate_progress();
}
// print out the Progress Bar. Attempted to put as much as possible in the style sheets.
$content = '<br />' . html_writer::tag('div', $progress . '%', array('class' => 'progress_bar_completed', 'style' => 'width: '. $progress . '%;'));
$printprogress = html_writer::tag('div', get_string('progresscompleted', 'lesson', $progress) . $content, array('class' => 'progress_bar'));
$content = html_writer::start_tag('div');
$content .= html_writer::start_tag('div', array('class' => 'progress'));
$content .= html_writer::start_tag('div', array('class' => 'progress-bar bar', 'role' => 'progressbar',
'style' => 'width: ' . $progress .'%', 'aria-valuenow' => $progress, 'aria-valuemin' => 0, 'aria-valuemax' => 100));
$content .= $progress . "%";
$content .= html_writer::end_tag('div');
$content .= html_writer::end_tag('div');
$printprogress = html_writer::tag('div', get_string('progresscompleted', 'lesson', $progress) . $content);
return $this->output->box($printprogress, 'progress_bar');
}
@@ -240,6 +240,15 @@ div#dock {
#page-mod-lesson-view .branchbuttoncontainer .singlebutton button[type="submit"] {
white-space: normal;
}
#page-mod-lesson-view {
.vertical .singlebutton {
display: block;
+ .singlebutton {
margin-left: 0;
margin-top: 1rem;
}
}
}
.path-mod-lesson .generaltable td {
vertical-align: middle;
label {
@@ -15414,6 +15414,12 @@ div#dock {
#page-mod-lesson-view .branchbuttoncontainer .singlebutton button[type="submit"] {
white-space: normal; }
#page-mod-lesson-view .vertical .singlebutton {
display: block; }
#page-mod-lesson-view .vertical .singlebutton + .singlebutton {
margin-left: 0;
margin-top: 1rem; }
.path-mod-lesson .generaltable td {
vertical-align: middle; }
.path-mod-lesson .generaltable td label {

0 comments on commit 011c1a4

Please sign in to comment.