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

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

Browse source
This commit is contained in:
Marina Glancy 2013-09-17 11:10:44 +10:00
commit 9f21d24895
6 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mod/scorm/index.php
View file

@ -46,6 +46,7 @@ $PAGE->set_title($strscorms);
$PAGE->set_heading($course->fullname); $PAGE->set_heading($course->fullname);
$PAGE->navbar->add($strscorms); $PAGE->navbar->add($strscorms);
echo $OUTPUT->header(); echo $OUTPUT->header();
echo $OUTPUT->heading($strscorms);
$usesections = course_format_uses_sections($course->format); $usesections = course_format_uses_sections($course->format);

1
mod/scorm/player.php
View file

@ -174,6 +174,7 @@ $PAGE->requires->data_for_js('scormplayerdata', Array('launch' => false,
$PAGE->requires->js('/mod/scorm/request.js', true); $PAGE->requires->js('/mod/scorm/request.js', true);
$PAGE->requires->js('/lib/cookies.js', true); $PAGE->requires->js('/lib/cookies.js', true);
echo $OUTPUT->header(); echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($scorm->name));
$PAGE->requires->string_for_js('navigation', 'scorm'); $PAGE->requires->string_for_js('navigation', 'scorm');
$PAGE->requires->string_for_js('toc', 'scorm'); $PAGE->requires->string_for_js('toc', 'scorm');

2
mod/scorm/report.php
View file

@ -74,9 +74,9 @@ if (empty($noheader)) {
$PAGE->navbar->add($strreport, new moodle_url('/mod/scorm/report.php', array('id'=>$cm->id))); $PAGE->navbar->add($strreport, new moodle_url('/mod/scorm/report.php', array('id'=>$cm->id)));
echo $OUTPUT->header(); echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($scorm->name));
$currenttab = 'reports'; $currenttab = 'reports';
require($CFG->dirroot . '/mod/scorm/tabs.php'); require($CFG->dirroot . '/mod/scorm/tabs.php');
echo $OUTPUT->heading(format_string($scorm->name));
} }
// Open the selected Scorm report and display it // Open the selected Scorm report and display it

2
mod/scorm/report/graphs/report.php
View file

@ -52,7 +52,7 @@ class scorm_graphs_report extends scorm_default_report {
$imageurl = new moodle_url('/mod/scorm/report/graphs/graph.php', $imageurl = new moodle_url('/mod/scorm/report/graphs/graph.php',
array('scoid' => $sco->id)); array('scoid' => $sco->id));
$graphname = $sco->title; $graphname = $sco->title;
echo $OUTPUT->heading($graphname); echo $OUTPUT->heading($graphname, 3);
echo html_writer::tag('div', html_writer::empty_tag('img', echo html_writer::tag('div', html_writer::empty_tag('img',
array('src' => $imageurl, 'alt' => $graphname)), array('src' => $imageurl, 'alt' => $graphname)),
array('class' => 'graph')); array('class' => 'graph'));

2
mod/scorm/report/userreporttracks.php
View file

@ -87,7 +87,7 @@ if (!$table->is_downloading($download, $exportfilename)) {
require($CFG->dirroot . '/mod/scorm/report/userreporttabs.php'); require($CFG->dirroot . '/mod/scorm/report/userreporttabs.php');
echo $OUTPUT->box_start('generalbox boxaligncenter'); echo $OUTPUT->box_start('generalbox boxaligncenter');
echo $OUTPUT->heading("$strattempt $attempt - ". fullname($user).': '. echo $OUTPUT->heading("$strattempt $attempt - ". fullname($user).': '.
format_string($selsco->title). ' - '. get_string('details', 'scorm')); format_string($selsco->title). ' - '. get_string('details', 'scorm'), 3);
} }
$table->define_baseurl($PAGE->url); $table->define_baseurl($PAGE->url);
$table->define_columns(array('element', 'value')); $table->define_columns(array('element', 'value'));

2
mod/scorm/view.php
View file

@ -125,6 +125,7 @@ if (empty($launch) && (has_capability('mod/scorm:skipview', $contextmodule))) {
$PAGE->set_title($pagetitle); $PAGE->set_title($pagetitle);
$PAGE->set_heading($course->fullname); $PAGE->set_heading($course->fullname);
echo $OUTPUT->header(); echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($scorm->name));
if (!empty($action) && confirm_sesskey() && has_capability('mod/scorm:deleteownresponses', $contextmodule)) { if (!empty($action) && confirm_sesskey() && has_capability('mod/scorm:deleteownresponses', $contextmodule)) {
if ($action == 'delete') { if ($action == 'delete') {
@ -144,7 +145,6 @@ $currenttab = 'info';
require($CFG->dirroot . '/mod/scorm/tabs.php'); require($CFG->dirroot . '/mod/scorm/tabs.php');
// Print the main part of the page // Print the main part of the page
echo $OUTPUT->heading(format_string($scorm->name));
$attemptstatus = ''; $attemptstatus = '';
if (empty($launch) && ($scorm->displayattemptstatus == SCORM_DISPLAY_ATTEMPTSTATUS_ALL || if (empty($launch) && ($scorm->displayattemptstatus == SCORM_DISPLAY_ATTEMPTSTATUS_ALL ||
$scorm->displayattemptstatus == SCORM_DISPLAY_ATTEMPTSTATUS_ENTRY)) { $scorm->displayattemptstatus == SCORM_DISPLAY_ATTEMPTSTATUS_ENTRY)) {