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

mod/lesson/lang/en/lesson.php

@@ -338,6 +338,7 @@ $string['previouspage'] = 'Previous page';
 $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';

mod/lesson/renderer.php

@@ -539,20 +539,10 @@ class mod_lesson_renderer extends plugin_renderer_base {
         }
 
         // 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>';
+        $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'));
 
-        $table = new html_table();
-        $table->attributes['class'] = 'progress_bar_table';
-        $table->data = array(new html_table_row($cells));
-
-        return $this->output->box(html_writer::table($table), 'progress_bar');
+        return $this->output->box($printprogress, 'progress_bar');
     }
 
     /**

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;}