navigation MDL-14632 Fixed up pagelayouts and navbars in the group section

diff --git a/course/completion.php b/course/completion.php
index 8dd3765..137f084 100644 (file)
--- a/course/completion.php
+++ b/course/completion.php
@@ -67,6 +67,7 @@ $PAGE->set_url('/course/completion.php', array('id' => $course->id));
 //$PAGE->navbar->add($streditcompletionsettings);
 $PAGE->set_title($course->shortname);
 $PAGE->set_heading($course->fullname);
+$PAGE->set_pagelayout('standard');
 
 /// first create the form
 $form = new course_completion_form('completion.php?id='.$id, compact('course'));

diff --git a/group/groupings.php b/group/groupings.php
index 4208955..468febe 100644 (file)
--- a/group/groupings.php
+++ b/group/groupings.php
@@ -50,12 +50,13 @@ $struses         = get_string('activities');
 $strparticipants = get_string('participants');
 $strmanagegrping = get_String('showgroupsingrouping', 'group');
 
-$PAGE->navbar->add($strparticipants, new moodle_url('/user/index.php', array('id'=>$courseid)));
+$PAGE->settingsnav->get('courseadmin')->get('groups')->make_active();
 $PAGE->navbar->add($strgroupings);
 
 /// Print header
 $PAGE->set_title($strgroupings);
-$PAGE->set_heading(': '.$strgroupings);
+$PAGE->set_heading($course->fullname);
+$PAGE->set_pagelayout('standard');
 echo $OUTPUT->header();
 
 // Add tabs

diff --git a/group/index.php b/group/index.php
index 50c1ae0..91a5b4a 100644 (file)
--- a/group/index.php
+++ b/group/index.php
@@ -129,7 +129,7 @@ $strparticipants = get_string('participants');
 /// Print header
 $PAGE->set_title($strgroups);
 $PAGE->set_heading($course->fullname);
-$PAGE->set_pagelayout('incourse');
+$PAGE->set_pagelayout('standard');
 echo $OUTPUT->header();
 
 // Add tabs

diff --git a/group/overview.php b/group/overview.php
index 9988482..1b9649f 100644 (file)
--- a/group/overview.php
+++ b/group/overview.php
@@ -100,12 +100,13 @@ if ($rs = $DB->get_recordset_sql($sql, $params)) {
     $rs->close();
 }
 
-$PAGE->navbar->add($strparticipants, new moodle_url('/user/index.php', array('id'=>$courseid)));
-$PAGE->navbar->add($strgroups);
+$PAGE->settingsnav->get('courseadmin')->get('groups')->make_active();
+$PAGE->navbar->add(get_string('overview', 'group'));
 
 /// Print header
 $PAGE->set_title($strgroups);
-$PAGE->set_heading(': '.$strgroups);
+$PAGE->set_heading($course->fullname);
+$PAGE->set_pagelayout('standard');
 echo $OUTPUT->header();
 
 // Add tabs

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 31414e5..d014481 100644 (file)
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -2664,7 +2664,7 @@ class settings_navigation extends navigation_node {
         //  Add outcome if permitted
         if (!empty($CFG->enableoutcomes) && has_capability('moodle/course:update', $coursecontext)) {
             $url = new moodle_url('/grade/edit/outcome/course.php', array('id'=>$course->id));
-            $coursenode->add(get_string('outcomes', 'grades'), $url, self::TYPE_SETTING, null, null, new pix_icon('i/outcomes', ''));
+            $coursenode->add(get_string('outcomes', 'grades'), $url, self::TYPE_SETTING, null, 'outcomes', new pix_icon('i/outcomes', ''));
         }
 
         // Add meta course links
@@ -2681,33 +2681,33 @@ class settings_navigation extends navigation_node {
         // Manage groups in this course
         if (($course->groupmode || !$course->groupmodeforce) && has_capability('moodle/course:managegroups', $coursecontext)) {
             $url = new moodle_url('/group/index.php', array('id'=>$course->id));
-            $coursenode->add(get_string('groups'), $url, self::TYPE_SETTING, null, null, new pix_icon('i/group', ''));
+            $coursenode->add(get_string('groups'), $url, self::TYPE_SETTING, null, 'groups', new pix_icon('i/group', ''));
         }
 
         // Backup this course
         if (has_capability('moodle/backup:backupcourse', $coursecontext)) {
             $url = new moodle_url('/backup/backup.php', array('id'=>$course->id));
-            $coursenode->add(get_string('backup'), $url, self::TYPE_SETTING, null, null, new pix_icon('i/backup', ''));
+            $coursenode->add(get_string('backup'), $url, self::TYPE_SETTING, null, 'backup', new pix_icon('i/backup', ''));
         }
 
         // Restore to this course
         if (has_capability('moodle/restore:restorecourse', $coursecontext)) {
             $url = new moodle_url('/files/index.php', array('id'=>$course->id, 'wdir'=>'/backupdata'));
             $url = null; // Disabled until restore is implemented. MDL-21432
-            $coursenode->add(get_string('restore'), $url, self::TYPE_SETTING, null, null, new pix_icon('i/restore', ''));
+            $coursenode->add(get_string('restore'), $url, self::TYPE_SETTING, null, 'restore', new pix_icon('i/restore', ''));
         }
 
         // Import data from other courses
         if (has_capability('moodle/restore:restoretargetimport', $coursecontext)) {
             $url = new moodle_url('/course/import.php', array('id'=>$course->id));
             $url = null; // Disabled until restore is implemented. MDL-21432
-            $coursenode->add(get_string('import'), $url, self::TYPE_SETTING, null, null, new pix_icon('i/restore', ''));
+            $coursenode->add(get_string('import'), $url, self::TYPE_SETTING, null, 'import', new pix_icon('i/restore', ''));
         }
 
         // Publish course on a hub
         if (has_capability('moodle/course:publish', $coursecontext)) {
             $url = new moodle_url('/course/publish/index.php', array('id'=>$course->id));
-            $coursenode->add(get_string('publish'), $url, self::TYPE_SETTING, null, null, new pix_icon('i/publish', ''));
+            $coursenode->add(get_string('publish'), $url, self::TYPE_SETTING, null, 'publish', new pix_icon('i/publish', ''));
         }
 
         // Reset this course