Merge branch 'MDL-41693-25' of git://github.com/FMCorz/moodle into MO…

…ODLE_25_STABLE
moodle · Jan 21, 2014 · 3dfaeb4 · 3dfaeb4
2 parents 3dfb63d + e1bece2
commit 3dfaeb4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/group/autogroup.php b/group/autogroup.php
@@ -50,6 +50,11 @@
 $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($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
@@ -32,6 +32,7 @@
 $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
@@ -74,6 +74,12 @@
 $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($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
@@ -66,8 +66,13 @@
 $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 @@
 
 }
 
-$strgroupings    = get_string('groupings', 'group');
 $strparticipants = get_string('participants');
-
 if ($id) {
     $strheading = get_string('editgroupingsettings', 'group');
 } else {
@@ -140,8 +143,6 @@
 $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
@@ -144,7 +144,7 @@
 /// Print header
 $PAGE->set_title($strgroups);
 $PAGE->set_heading($course->fullname);
-$PAGE->set_pagelayout('admin');
+$PAGE->set_pagelayout('standard');
 echo $OUTPUT->header();
 
 // Add tabs