moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 20:06:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-61019-35' of https://github.com/lucaboesch/moodle into MOODLE_35_STABLE

Browse source
This commit is contained in:
David Monllao 2018-07-16 13:25:13 +02:00
commit c6fa9f2ea2
3 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mod/lesson/renderer.php
View file

@ -505,10 +505,14 @@ class mod_lesson_renderer extends plugin_renderer_base {
$progress = $lesson->calculate_progress(); $progress = $lesson->calculate_progress();
} }
// print out the Progress Bar. Attempted to put as much as possible in the style sheets. $content = html_writer::start_tag('div');
$content = '<br />' . html_writer::tag('div', $progress . '%', array('class' => 'progress_bar_completed', 'style' => 'width: '. $progress . '%;')); $content .= html_writer::start_tag('div', array('class' => 'progress'));
$printprogress = html_writer::tag('div', get_string('progresscompleted', 'lesson', $progress) . $content, array('class' => 'progress_bar')); $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'); return $this->output->box($printprogress, 'progress_bar');
} }

9
theme/boost/scss/moodle/modules.scss
View file

@ -240,6 +240,15 @@ div#dock {
#page-mod-lesson-view .branchbuttoncontainer .singlebutton button[type="submit"] { #page-mod-lesson-view .branchbuttoncontainer .singlebutton button[type="submit"] {
white-space: normal; white-space: normal;
} }
#page-mod-lesson-view {
.vertical .singlebutton {
display: block;
+ .singlebutton {
margin-left: 0;
margin-top: 1rem;
}
}
}
.path-mod-lesson .generaltable td { .path-mod-lesson .generaltable td {
vertical-align: middle; vertical-align: middle;
label { label {

6
theme/boost/style/moodle.css
View file

@ -15408,6 +15408,12 @@ div#dock {
#page-mod-lesson-view .branchbuttoncontainer .singlebutton button[type="submit"] { #page-mod-lesson-view .branchbuttoncontainer .singlebutton button[type="submit"] {
white-space: normal; } 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 { .path-mod-lesson .generaltable td {
vertical-align: middle; } vertical-align: middle; }
.path-mod-lesson .generaltable td label { .path-mod-lesson .generaltable td label {