MDL-10383 - some more refactoring/cleanup, enablegroupings experiment…

…al admin setting, tabs in groups UI

admin/settings/misc.php

@@ -7,6 +7,8 @@
 $temp->add(new admin_setting_configcheckbox('enableglobalsearch', get_string('enableglobalsearch', 'admin'), get_string('configenableglobalsearch', 'admin'), 0));
 $temp->add(new admin_setting_configcheckbox('smartpix', get_string('smartpix', 'admin'), get_string('configsmartpix', 'admin'), 0));
 $temp->add(new admin_setting_configcheckbox('enablehtmlpurifier', get_string('enablehtmlpurifier', 'admin'), get_string('configenablehtmlpurifier', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('enablegroupings', get_string('enablegroupings', 'admin'), get_string('configenablegroupings', 'admin'), 0));
+
 $ADMIN->add('misc', $temp);
 
 // XMLDB editor

admin/uploaduser.php

@@ -5,6 +5,7 @@
 
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->dirroot.'/group/lib.php');
 require_once('uploaduser_form.php');
 
 admin_externalpage_setup('uploadusers');

enrol/imsenterprise/enrol.php

@@ -5,6 +5,7 @@
 * @package enrol_imsenterprise
 */
 require_once("$CFG->libdir/blocklib.php");
+require_once($CFG->dirroot.'/group/lib.php');
 
 // The following flags are set in the configuration
 // $CFG->enrol_imsfilelocation:        where is the file we are looking for?

enrol/manual/enrol.php

@@ -22,6 +22,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
+require_once($CFG->dirroot.'/group/lib.php');
 
 /**
 * enrolment_plugin_manual is the default enrolment plugin

group/group.php

@@ -85,9 +85,10 @@
             error('Error updating group');
         }
     } else {
-        if (!groups_create_group($data, $editform->_upload_manager)) {
+        if (!$id = groups_create_group($data, $editform->_upload_manager)) {
             error('Error updating group');
         }
+        $returnurl = $CFG->wwwroot.'/group/index.php?id='.$course->id.'&group='.$id;
     }
 
     redirect($returnurl);
@@ -101,14 +102,15 @@
 } else {
     $strheading = get_string('creategroup', 'group');
 }
-print_header("$course->shortname: ". $strheading,
-             $course->fullname,
-             "<a href=\"$CFG->wwwroot/course/view.php?id=$courseid\">$course->shortname</a> ".
-             "-> <a href=\"$CFG->wwwroot/user/index.php?id=$courseid\">$strparticipants</a> ".
-             "-> <a href=\"$CFG->wwwroot/group/index.php?id=$courseid\">$strgroups</a>".
-             "-> $strheading", '', '', true, '', user_login_string($course, $USER));
-
-print_heading($strheading);
+
+
+$navlinks = array(array('name'=>$strparticipants, 'link'=>$CFG->wwwroot.'/user/index.php?id='.$courseid, 'type'=>'misc'),
+                  array('name'=>$strgroups, 'link'=>$CFG->wwwroot.'/group/index.php?id='.$courseid, 'type'=>'misc'),
+                  array('name'=>$strheading, 'link'=>'', 'type'=>'misc'));
+$navigation = build_navigation($navlinks);
+
+/// Print header
+print_header_simple($strgroups, ': '.$strgroups, $navigation, '', '', true, '', navmenu($course));
 
 echo '<div id="grouppicture">';
 if ($id) {

group/grouping.php

@@ -99,7 +99,6 @@
 
 }
 
-$strgroups        = get_string('groups');
 $strgroupings     = get_string('groupings', 'group');
 $strparticipants = get_string('participants');
 
@@ -109,12 +108,15 @@
     $strheading = get_string('creategrouping', 'group');
 }
 
-print_header("$course->shortname: ". $strheading,
-             $course->fullname,
-             "<a href=\"$CFG->wwwroot/course/view.php?id=$courseid\">$course->shortname</a> ".
-             "-> <a href=\"$CFG->wwwroot/user/index.php?id=$courseid\">$strparticipants</a> ".
-             "-> <a href=\"$returnurl\">$strgroupings</a>".
-             "-> $strheading", '', '', true, '', user_login_string($course, $USER));
+$navlinks = array(array('name'=>$strparticipants, 'link'=>$CFG->wwwroot.'/user/index.php?id='.$courseid, 'type'=>'misc'),
+                  array('name'=>$strgroupings, 'link'=>$CFG->wwwroot.'/group/groupings.php?id='.$courseid, 'type'=>'misc'),
+                  array('name'=>$strheading, 'link'=>'', 'type'=>'misc'));
+$navigation = build_navigation($navlinks);
+
+/// Print header
+print_header_simple($strgroupings, ': '.$strgroupings, $navigation, '', '', true, '', navmenu($course));
+
+
 print_heading($strheading);
 $editform->display();
 print_footer($course);

group/groupings.php

@@ -24,16 +24,19 @@
 $strgroupings    = get_string('groupings', 'group');
 $struses         = get_string('activities');
 $strparticipants = get_string('participants');
-$strmanagegrping = get_String('addgroupstogrouping', 'group');
+$strmanagegrping = get_String('showgroupsingrouping', 'group');
 
 $navlinks = array(array('name'=>$strparticipants, 'link'=>$CFG->wwwroot.'/user/index.php?id='.$courseid, 'type'=>'misc'),
-                  array('name'=>$strgroups, 'link'=>$CFG->wwwroot.'/group/index.php?id='.$courseid, 'type'=>'misc'),
                   array('name'=>$strgroupings, 'link'=>'', 'type'=>'misc'));
 $navigation = build_navigation($navlinks);
 
 /// Print header
 print_header_simple($strgroupings, ': '.$strgroupings, $navigation, '', '', true, '', navmenu($course));
 
+// Add tabs
+$currenttab = 'groupings';
+require('tabs.php');
+
 print_heading($strgroupings);
 
 $data = array();
@@ -58,7 +61,7 @@
         $buttons .= "<a title=\"$strdelete\" href=\"grouping.php?id=$grouping->id&amp;delete=1\"><img".
                     " src=\"$CFG->pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" /></a> ";
         $buttons .= "<a title=\"$strmanagegrping\" href=\"assign.php?id=$grouping->id\"><img".
-                    " src=\"$CFG->pixpath/i/group.gif\" class=\"iconsmall\" alt=\"$strmanagegrping\" /></a> ";
+                    " src=\"$CFG->pixpath/i/group.gif\" class=\"icon\" alt=\"$strmanagegrping\" /></a> ";
 
         $line[3] = $buttons;
         $data[] = $line;