Merge branch 'MDL-41612_b' of git://github.com/rwijaya/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 17 Sep 2013 01:10:44 +0000 (11:10 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 17 Sep 2013 01:10:44 +0000 (11:10 +1000)
1  2 
mod/scorm/player.php
mod/scorm/report/graphs/report.php
mod/scorm/view.php

@@@ -174,7 -197,9 +174,8 @@@ $PAGE->requires->data_for_js('scormplay
  $PAGE->requires->js('/mod/scorm/request.js', true);
  $PAGE->requires->js('/lib/cookies.js', true);
  echo $OUTPUT->header();
+ echo $OUTPUT->heading(format_string($scorm->name));
  
 -// NEW IMS TOC
  $PAGE->requires->string_for_js('navigation', 'scorm');
  $PAGE->requires->string_for_js('toc', 'scorm');
  $PAGE->requires->string_for_js('hide', 'moodle');
Simple merge
Simple merge