From e1bece2b7b209aef82c6b5bdfe2f71efc515636a Mon Sep 17 00:00:00 2001
From: Frederic Massart <fmcell@gmail.com>
Date: Fri, 10 Jan 2014 12:26:50 +0100
Subject: [PATCH] MDL-41693 group: Use standard layout for group related pages

---
 group/autogroup.php |  8 +++++---
 group/delete.php    |  1 +
 group/group.php     |  8 ++++++--
 group/grouping.php  | 11 ++++++-----
 group/index.php     |  2 +-
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/group/autogroup.php b/group/autogroup.php
index 64cdfd35ef8..e570ccc87a9 100644
--- a/group/autogroup.php
+++ b/group/autogroup.php
@@ -50,6 +50,11 @@ $strgroups           = get_string('groups');
 $strparticipants     = get_string('participants');
 $strautocreategroups = get_string('autocreategroups', 'group');
 
+$PAGE->set_title($strgroups);
+$PAGE->set_heading($course->fullname. ': '.$strgroups);
+$PAGE->set_pagelayout('standard');
+navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $courseid)));
+
 // Print the page and form
 $preview = '';
 $error = '';
@@ -233,9 +238,6 @@ $PAGE->navbar->add($strparticipants, new moodle_url('/user/index.php', array('id
 $PAGE->navbar->add($strgroups, new moodle_url('/group/index.php', array('id'=>$courseid)));
 $PAGE->navbar->add($strautocreategroups);
 
-/// Print header
-$PAGE->set_title($strgroups);
-$PAGE->set_heading($course->fullname. ': '.$strgroups);
 echo $OUTPUT->header();
 echo $OUTPUT->heading($strautocreategroups);
 
diff --git a/group/delete.php b/group/delete.php
index b58bb0c0420..88430a54ead 100644
--- a/group/delete.php
+++ b/group/delete.php
@@ -32,6 +32,7 @@ $groupids = required_param('groups', PARAM_SEQUENCE);
 $confirm = optional_param('confirm', 0, PARAM_BOOL);
 
 $PAGE->set_url('/group/delete.php', array('courseid'=>$courseid,'groups'=>$groupids));
+$PAGE->set_pagelayout('standard');
 
 // Make sure course is OK and user has access to manage groups
 if (!$course = $DB->get_record('course', array('id' => $courseid))) {
diff --git a/group/group.php b/group/group.php
index 4e0d8b0ca04..5619c351794 100644
--- a/group/group.php
+++ b/group/group.php
@@ -74,6 +74,12 @@ require_login($course);
 $context = context_course::instance($course->id);
 require_capability('moodle/course:managegroups', $context);
 
+$strgroups = get_string('groups');
+$PAGE->set_title($strgroups);
+$PAGE->set_heading($course->fullname . ': '.$strgroups);
+$PAGE->set_pagelayout('standard');
+navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id)));
+
 $returnurl = $CFG->wwwroot.'/group/index.php?id='.$course->id.'&group='.$id;
 
 // Prepare the description editor: We do support files for group descriptions
@@ -121,8 +127,6 @@ $PAGE->navbar->add($strgroups, new moodle_url('/group/index.php', array('id'=>$c
 $PAGE->navbar->add($strheading);
 
 /// Print header
-$PAGE->set_title($strgroups);
-$PAGE->set_heading($course->fullname . ': '.$strgroups);
 echo $OUTPUT->header();
 echo '<div id="grouppicture">';
 if ($id) {
diff --git a/group/grouping.php b/group/grouping.php
index bdfe58acd20..aa20ac2deb4 100644
--- a/group/grouping.php
+++ b/group/grouping.php
@@ -66,8 +66,13 @@ require_login($course);
 $context = context_course::instance($course->id);
 require_capability('moodle/course:managegroups', $context);
 
-$returnurl = $CFG->wwwroot.'/group/groupings.php?id='.$course->id;
+$strgroupings = get_string('groupings', 'group');
+$PAGE->set_title($strgroupings);
+$PAGE->set_heading($course->fullname. ': '.$strgroupings);
+$PAGE->set_pagelayout('standard');
+navigation_node::override_active_url(new moodle_url('/group/index.php', array('id' => $course->id)));
 
+$returnurl = $CFG->wwwroot.'/group/groupings.php?id='.$course->id;
 
 if ($id and $delete) {
     if (!empty($grouping->idnumber) && !has_capability('moodle/course:changeidnumber', $context)) {
@@ -126,9 +131,7 @@ if ($editform->is_cancelled()) {
 
 }
 
-$strgroupings    = get_string('groupings', 'group');
 $strparticipants = get_string('participants');
-
 if ($id) {
     $strheading = get_string('editgroupingsettings', 'group');
 } else {
@@ -140,8 +143,6 @@ $PAGE->navbar->add($strgroupings, new moodle_url('/group/groupings.php', array('
 $PAGE->navbar->add($strheading);
 
 /// Print header
-$PAGE->set_title($strgroupings);
-$PAGE->set_heading($course->fullname. ': '.$strgroupings);
 echo $OUTPUT->header();
 echo $OUTPUT->heading($strheading);
 $editform->display();
diff --git a/group/index.php b/group/index.php
index 9a0df5fbebd..c85eddaf7a4 100644
--- a/group/index.php
+++ b/group/index.php
@@ -144,7 +144,7 @@ $strparticipants = get_string('participants');
 /// Print header
 $PAGE->set_title($strgroups);
 $PAGE->set_heading($course->fullname);
-$PAGE->set_pagelayout('admin');
+$PAGE->set_pagelayout('standard');
 echo $OUTPUT->header();
 
 // Add tabs