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

It should use 'incourse' layout in most cases Signed-off-by: Yuliya Bozhko <[email protected]>
mgleeson · Sep 4, 2014 · 369484b · 369484b
1 parent 457f818
commit 369484b
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/badges/edit.php b/badges/edit.php
@@ -53,7 +53,7 @@
     }
     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
@@ -85,7 +85,7 @@
     $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
@@ -47,7 +47,7 @@
     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
@@ -71,7 +71,7 @@
     $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
@@ -41,7 +41,7 @@
 $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
@@ -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
@@ -54,7 +54,7 @@
 
 //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
@@ -34,7 +34,7 @@
 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
@@ -41,7 +41,7 @@
 $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
@@ -45,7 +45,7 @@
 
 //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
@@ -29,7 +29,7 @@
 $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
@@ -46,7 +46,7 @@
 }
 
 $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
@@ -43,7 +43,7 @@
 $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
@@ -68,7 +68,7 @@
 
 $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
@@ -126,7 +126,7 @@
     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
@@ -39,7 +39,7 @@
     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
@@ -106,7 +106,7 @@
     }
 }
 
-$PAGE->set_pagelayout('course');
+$PAGE->set_pagelayout('incourse');
 $PAGE->set_title($course->shortname . ': ' . $strnotes);
 $PAGE->set_heading($course->fullname);