L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-41840-master' of git://github.com/sammarshallou/moodle

Browse Source
This commit is contained in:
Marina Glancy
2013-09-24 11:49:02 +10:00
parent d9fd72feb5 8d137307bf
commit c925e4fa8e
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backup/import.php
+2 -9
View File
@@ -25,11 +25,9 @@ require_login($course);
// Must hold restoretargetimport in the current course
require_capability('moodle/restore:restoretargetimport', $context);
$heading = get_string('import');
// Set up the page
$PAGE->set_title($heading);
$PAGE->set_heading($heading);
$PAGE->set_title($course->shortname . ': ' . get_string('import'));
$PAGE->set_heading($course->fullname);
$PAGE->set_url(new moodle_url('/backup/import.php', array('id'=>$courseid)));
$PAGE->set_context($context);
$PAGE->set_pagelayout('incourse');
@@ -189,11 +187,6 @@ if ($backup->get_stage() == backup_ui::STAGE_FINAL) {
$backup->save_controller();
}
// Adjust the page for the stage
$PAGE->set_title($heading.': '.$backup->get_stage_name());
$PAGE->set_heading($heading.': '.$backup->get_stage_name());
$PAGE->navbar->add($backup->get_stage_name());
// Display the current stage
echo $OUTPUT->header();
if ($backup->enforce_changed_dependencies()) {
backup/restore.php
+2 -5
View File
@@ -43,11 +43,8 @@ if ($stage & restore_ui::STAGE_CONFIRM + restore_ui::STAGE_DESTINATION) {
}
}
$heading = $course->fullname;
$PAGE->set_title($heading.': '.$restore->get_stage_name());
$PAGE->set_heading($heading);
$PAGE->navbar->add($restore->get_stage_name());
$PAGE->set_title($course->shortname . ': ' . get_string('restore'));
$PAGE->set_heading($course->fullname);
$renderer = $PAGE->get_renderer('core','backup');
echo $OUTPUT->header();