mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 00:20:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-36673' of git://github.com/jmvedrine/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2014-12-15 11:54:06 +00:00
commit 2d562cfc6d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/lesson/renderer.php
View File

@ -560,14 +560,17 @@ class mod_lesson_renderer extends plugin_renderer_base {
public function slideshow_start(lesson $lesson) {
$attributes = array();
$attributes['class'] = 'slideshow';
$attributes['style'] = 'background-color:'.$lesson->bgcolor.';height:'.$lesson->height.'px;width:'.$lesson->width.'px;';
$attributes['style'] = 'background-color:'.$lesson->properties()->bgcolor.';height:'.
$lesson->properties()->height.'px;width:'.$lesson->properties()->width.'px;';
$output = html_writer::start_tag('div', $attributes);
return $output;
}
/**
* Returns HTML to show the end of a slideshow
*/
public function slideshow_end() {
$output = html_writer::end_tag('div');
return $output;
}
/**
* Returns a P tag containing contents

1
mod/lesson/view.php
View File

@ -410,7 +410,6 @@ if ($pageid != LESSON_EOL) {
echo '<a name="maincontent" id="maincontent" title="' . get_string('anchortitle', 'lesson') . '"></a>';
}
echo $lessoncontent;
echo $lessonoutput->slideshow_end();
echo $lessonoutput->progress_bar($lesson);
echo $lessonoutput->footer();