From 92f89f593cdd1febb4c25705ed74630fd33f7399 Mon Sep 17 00:00:00 2001 From: Yuliya Bozhko Date: Fri, 5 Sep 2014 09:30:21 +1200 Subject: [PATCH] MDL-47033 general: Fix incorrect use of 'course' layout It should use 'incourse' layout in most cases Signed-off-by: Yuliya Bozhko --- badges/edit.php | 2 +- badges/index.php | 2 +- badges/newbadge.php | 2 +- badges/view.php | 2 +- blocks/community/communitycourse.php | 2 +- course/info.php | 2 +- course/publish/backup.php | 2 +- course/publish/hubselector.php | 2 +- course/publish/index.php | 2 +- course/publish/metadata.php | 2 +- course/resources.php | 2 +- enrol/index.php | 2 +- files/coursefilesedit.php | 2 +- files/index.php | 2 +- message/index.php | 2 +- mod/glossary/showentry.php | 2 +- notes/index.php | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/badges/edit.php b/badges/edit.php index fefcb99262b..0deb27288a0 100644 --- a/badges/edit.php +++ b/badges/edit.php @@ -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('course'); + $PAGE->set_pagelayout('incourse'); navigation_node::override_active_url($navurl); } else { $PAGE->set_pagelayout('admin'); diff --git a/badges/index.php b/badges/index.php index ecc0d4fe263..a1102232aa8 100644 --- a/badges/index.php +++ b/badges/index.php @@ -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('course'); + $PAGE->set_pagelayout('incourse'); $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)) diff --git a/badges/newbadge.php b/badges/newbadge.php index d83ce598a64..a6a5f59d90b 100644 --- a/badges/newbadge.php +++ b/badges/newbadge.php @@ -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('course'); + $PAGE->set_pagelayout('incourse'); $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); diff --git a/badges/view.php b/badges/view.php index 38c0fe91f21..80a3e25554a 100644 --- a/badges/view.php +++ b/badges/view.php @@ -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('course'); + $PAGE->set_pagelayout('incourse'); $PAGE->set_heading($title); } diff --git a/blocks/community/communitycourse.php b/blocks/community/communitycourse.php index ca55e373300..c6539ccadf9 100644 --- a/blocks/community/communitycourse.php +++ b/blocks/community/communitycourse.php @@ -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('course'); +$PAGE->set_pagelayout('incourse'); $PAGE->set_title(get_string('searchcourse', 'block_community')); $PAGE->navbar->add(get_string('searchcourse', 'block_community')); diff --git a/course/info.php b/course/info.php index cce222749d8..249151027ce 100644 --- a/course/info.php +++ b/course/info.php @@ -34,7 +34,7 @@ } $PAGE->set_course($course); - $PAGE->set_pagelayout('course'); + $PAGE->set_pagelayout('incourse'); $PAGE->set_url('/course/info.php', array('id' => $course->id)); $PAGE->set_title(get_string("summaryof", "", $course->fullname)); $PAGE->set_heading(get_string('courseinfo')); diff --git a/course/publish/backup.php b/course/publish/backup.php index 15e091ad7a2..c081b734b03 100644 --- a/course/publish/backup.php +++ b/course/publish/backup.php @@ -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('course'); +$PAGE->set_pagelayout('incourse'); $PAGE->set_title(get_string('course') . ': ' . $course->fullname); $PAGE->set_heading($course->fullname); diff --git a/course/publish/hubselector.php b/course/publish/hubselector.php index 095e33be0e7..c599eb62a8c 100644 --- a/course/publish/hubselector.php +++ b/course/publish/hubselector.php @@ -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('course'); +$PAGE->set_pagelayout('incourse'); $PAGE->set_title(get_string('course') . ': ' . $course->fullname); $PAGE->set_heading($course->fullname); diff --git a/course/publish/index.php b/course/publish/index.php index 2e11f5bdf7e..1012c8d1f6e 100644 --- a/course/publish/index.php +++ b/course/publish/index.php @@ -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('course'); +$PAGE->set_pagelayout('incourse'); $PAGE->set_title(get_string('course') . ': ' . $course->fullname); $PAGE->set_heading($course->fullname); diff --git a/course/publish/metadata.php b/course/publish/metadata.php index 298e5f3e1d4..ee9caed31b7 100644 --- a/course/publish/metadata.php +++ b/course/publish/metadata.php @@ -45,7 +45,7 @@ require_login($course); //page settings $PAGE->set_url('/course/publish/metadata.php', array('id' => $course->id)); -$PAGE->set_pagelayout('course'); +$PAGE->set_pagelayout('incourse'); $PAGE->set_title(get_string('course') . ': ' . $course->fullname); $PAGE->set_heading($course->fullname); diff --git a/course/resources.php b/course/resources.php index af1179684c4..400b4780461 100644 --- a/course/resources.php +++ b/course/resources.php @@ -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('course'); +$PAGE->set_pagelayout('incourse'); require_course_login($course, true); // get list of all resource-like modules diff --git a/enrol/index.php b/enrol/index.php index 68a12fd7254..2fdff2a44ab 100644 --- a/enrol/index.php +++ b/enrol/index.php @@ -46,7 +46,7 @@ if (!$course->visible && !has_capability('moodle/course:viewhiddencourses', cont } $PAGE->set_course($course); -$PAGE->set_pagelayout('course'); +$PAGE->set_pagelayout('incourse'); $PAGE->set_url('/enrol/index.php', array('id'=>$course->id)); // do not allow enrols when in login-as session diff --git a/files/coursefilesedit.php b/files/coursefilesedit.php index 6c856092a90..56086936420 100644 --- a/files/coursefilesedit.php +++ b/files/coursefilesedit.php @@ -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('course'); +$PAGE->set_pagelayout('incourse'); $data = new stdClass(); $options = array('subdirs'=>1, 'maxfiles'=>-1, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL); diff --git a/files/index.php b/files/index.php index 42cb9479576..5e16e591c73 100644 --- a/files/index.php +++ b/files/index.php @@ -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('course'); +$PAGE->set_pagelayout('incourse'); $output = $PAGE->get_renderer('core', 'files'); diff --git a/message/index.php b/message/index.php index ff473c1d1ed..40b23773133 100644 --- a/message/index.php +++ b/message/index.php @@ -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('course'); + $PAGE->set_pagelayout('standard'); $PAGE->set_context(context_user::instance($user1->id)); } if (!empty($user1->id) && $user1->id != $USER->id) { diff --git a/mod/glossary/showentry.php b/mod/glossary/showentry.php index 03f9b1768be..3b765062776 100644 --- a/mod/glossary/showentry.php +++ b/mod/glossary/showentry.php @@ -39,7 +39,7 @@ if ($eid) { print_error('invalidelementid'); } -$PAGE->set_pagelayout('course'); +$PAGE->set_pagelayout('incourse'); if ($entries) { foreach ($entries as $key => $entry) { diff --git a/notes/index.php b/notes/index.php index d831b4b1897..c04acaaf57f 100644 --- a/notes/index.php +++ b/notes/index.php @@ -92,7 +92,7 @@ if ($userid) { } } -$PAGE->set_pagelayout('course'); +$PAGE->set_pagelayout('incourse'); $PAGE->set_title($course->shortname . ': ' . $strnotes); $PAGE->set_heading($course->fullname);