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

Revert "MDL-47033 general: Fix incorrect use of 'course' layout"

Browse source 
This reverts commit 92f89f593c.
This commit is contained in:
Sam Hemelryk 2014-10-01 15:49:25 +13:00
parent f0f3d01025
commit c00fb90718
17 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
badges/edit.php
View file

@ -53,7 +53,7 @@ if ($badge->type == BADGE_TYPE_COURSE) {
}
require_login($badge->courseid);
$navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
navigation_node::override_active_url($navurl);
} else {
$PAGE->set_pagelayout('admin');

2
badges/index.php
View file

@ -85,7 +85,7 @@ if ($type == BADGE_TYPE_SITE) {
$coursecontext = context_course::instance($course->id);
$title = get_string('coursebadges', 'badges');
$PAGE->set_context($coursecontext);
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$PAGE->set_heading(format_string($course->fullname, true, array('context' => $coursecontext)) . ': ' . $hdr);
navigation_node::override_active_url(
new moodle_url('/badges/index.php', array('type' => BADGE_TYPE_COURSE, 'id' => $course->id))

2
badges/newbadge.php
View file

@ -47,7 +47,7 @@ if (($type == BADGE_TYPE_COURSE) && ($course = $DB->get_record('course', array('
require_login($course);
$coursecontext = context_course::instance($course->id);
$PAGE->set_context($coursecontext);
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$PAGE->set_url('/badges/newbadge.php', array('type' => $type, 'id' => $course->id));
$heading = format_string($course->fullname, true, array('context' => $coursecontext)) . ": " . $title;
$PAGE->set_heading($heading);

2
badges/view.php
View file

@ -71,7 +71,7 @@ if ($type == BADGE_TYPE_SITE) {
$coursename = format_string($course->fullname, true, array('context' => context_course::instance($course->id)));
$title = $coursename . ': ' . get_string('coursebadges', 'badges');
$PAGE->set_context(context_course::instance($course->id));
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$PAGE->set_heading($title);
}

2
blocks/community/communitycourse.php
View file

@ -41,7 +41,7 @@ $context = context_course::instance($courseid);
$PAGE->set_course($parentcourse);
$PAGE->set_url('/blocks/community/communitycourse.php');
$PAGE->set_heading($SITE->fullname);
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$PAGE->set_title(get_string('searchcourse', 'block_community'));
$PAGE->navbar->add(get_string('searchcourse', 'block_community'));

2
course/info.php
View file

@ -34,7 +34,7 @@
}
$PAGE->set_course($course);
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$PAGE->set_url('/course/info.php', array('id' => $course->id));
$PAGE->set_title(get_string("summaryof", "", $course->fullname));
$PAGE->set_heading(get_string('courseinfo'));

2
course/publish/backup.php
View file

@ -54,7 +54,7 @@ if (!has_capability('moodle/course:publish', context_course::instance($id))
//page settings
$PAGE->set_url('/course/publish/backup.php');
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$PAGE->set_title(get_string('course') . ': ' . $course->fullname);
$PAGE->set_heading($course->fullname);

2
course/publish/hubselector.php
View file

@ -34,7 +34,7 @@ $course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
require_login($course);
$PAGE->set_url('/course/publish/hubselector.php', array('id' => $course->id));
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$PAGE->set_title(get_string('course') . ': ' . $course->fullname);
$PAGE->set_heading($course->fullname);

2
course/publish/index.php
View file

@ -41,7 +41,7 @@ $context = context_course::instance($course->id);
$shortname = format_string($course->shortname, true, array('context' => $context));
$PAGE->set_url('/course/publish/index.php', array('id' => $course->id));
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$PAGE->set_title(get_string('course') . ': ' . $course->fullname);
$PAGE->set_heading($course->fullname);

2
course/publish/metadata.php
View file

@ -45,7 +45,7 @@ require_login($course);
//page settings
$PAGE->set_url('/course/publish/metadata.php', array('id' => $course->id));
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$PAGE->set_title(get_string('course') . ': ' . $course->fullname);
$PAGE->set_heading($course->fullname);

2
course/resources.php
View file

@ -29,7 +29,7 @@ require_once("$CFG->libdir/resourcelib.php");
$id = required_param('id', PARAM_INT); // course id
$course = $DB->get_record('course', array('id'=>$id), '*', MUST_EXIST);
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
require_course_login($course, true);
// get list of all resource-like modules

2
enrol/index.php
View file

@ -46,7 +46,7 @@ if (!$course->visible && !has_capability('moodle/course:viewhiddencourses', cont
}
$PAGE->set_course($course);
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$PAGE->set_url('/enrol/index.php', array('id'=>$course->id));
// do not allow enrols when in login-as session

2
files/coursefilesedit.php
View file

@ -43,7 +43,7 @@ if ($node = $PAGE->settingsnav->find('coursefiles', navigation_node::TYPE_SETTIN
$PAGE->set_context($context);
$PAGE->set_title($heading);
$PAGE->set_heading($heading);
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$data = new stdClass();
$options = array('subdirs'=>1, 'maxfiles'=>-1, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL);

2
files/index.php
View file

@ -68,7 +68,7 @@ if ($node = $PAGE->settingsnav->find('coursefiles', navigation_node::TYPE_SETTIN
$PAGE->set_title("$course->shortname: $strfiles");
$PAGE->set_heading($course->fullname);
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$output = $PAGE->get_renderer('core', 'files');

2
message/index.php
View file

@ -126,7 +126,7 @@ if (substr($viewing, 0, 7) == MESSAGE_VIEW_COURSE) {
require_capability('moodle/course:viewparticipants', context_course::instance($courseid));
$PAGE->set_pagelayout('incourse');
} else {
$PAGE->set_pagelayout('standard');
$PAGE->set_pagelayout('course');
$PAGE->set_context(context_user::instance($user1->id));
}
if (!empty($user1->id) && $user1->id != $USER->id) {

2
mod/glossary/showentry.php
View file

@ -39,7 +39,7 @@ if ($eid) {
print_error('invalidelementid');
}
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
if ($entries) {
foreach ($entries as $key => $entry) {

2
notes/index.php
View file

@ -92,7 +92,7 @@ if ($userid) {
}
}
$PAGE->set_pagelayout('incourse');
$PAGE->set_pagelayout('course');
$PAGE->set_title($course->shortname . ': ' . $strnotes);
$PAGE->set_heading($course->fullname);