Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-30910_m21' of git://github.com/rwijaya/moodle into …

…MOODLE_21_STABLE
  • Loading branch information...
commit 65773fe2fe64b4ab30860eec319bcb5e2f60978e 2 parents d5ae248 + dbac1a5
@samhemelryk samhemelryk authored
View
1  mod/lesson/lang/en/lesson.php
@@ -338,6 +338,7 @@
$string['processerror'] = 'Error occurred during processing!';
$string['progressbar'] = 'Progress bar';
$string['progressbar_help'] = 'If enabled, a bar is displayed at the bottom of lesson pages showing approximate percentage of completion.';
+$string['progresscompleted'] = 'You have completed {$a}% of the lesson';
$string['progressbarteacherwarning'] = 'Progress bar does not display for {$a}';
$string['progressbarteacherwarning2'] = 'You will not see the progress bar because you can edit this lesson';
$string['qtype'] = 'Page type';
View
16 mod/lesson/renderer.php
@@ -539,20 +539,10 @@ public function progress_bar(lesson $lesson) {
}
// print out the Progress Bar. Attempted to put as much as possible in the style sheets.
- $cells = array();
- if ($progress != 0) { // some browsers do not repsect the 0 width.
- $cells[0] = new html_table_cell();
- $cells[0]->style = 'width:'.$progress.'%';
- $cells[0]->attributes['class'] = 'progress_bar_completed';
- $cells[0]->text = ' ';
- }
- $cells[] = '<div class="progress_bar_token"></div>';
-
- $table = new html_table();
- $table->attributes['class'] = 'progress_bar_table';
- $table->data = array(new html_table_row($cells));
+ $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'));
- return $this->output->box(html_writer::table($table), 'progress_bar');
+ return $this->output->box($printprogress, 'progress_bar');
}
/**
View
1  mod/lesson/styles.css
@@ -22,6 +22,7 @@
.path-mod-lesson .progress_bar_todo {padding: 0;margin: 0;}
.path-mod-lesson .progress_bar_token {height: 20px;width: 5px;padding: 0;margin: 0;}
.path-mod-lesson .edit_pages_box .addlinks {margin:0;margin-bottom:1em;}
+.path-mod-lesson .progress_bar_completed {background-color:green; text-align:right; vertical-align:middle; color:#FFF;}
.path-mod-lesson .resourcecontent {text-align: center;}
Please sign in to comment.
Something went wrong with that request. Please try again.