Some minor changes towards MDL-8048 ... much more to do

diff --git a/group/index.php b/group/index.php
new file mode 100644 (file)
index 0000000..986b61a
--- /dev/null
+++ b/group/index.php
@@ -0,0 +1,255 @@
+<?php
+/**
+ * The main group management user interface.
+ *
+ * @copyright &copy; 2006 The Open University
+ * @author N.D.Freear AT open.ac.uk
+ * @author J.White AT open.ac.uk 
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package groups
+ */
+require_once('../config.php');
+require_once('lib.php');
+require_once($CFG->libdir.'/moodlelib.php');
+
+$success = true;
+ 
+$courseid   = required_param('id', PARAM_INT);         
+$groupingid = optional_param('grouping', -1, PARAM_INT);
+$groupid    = optional_param('group', false, PARAM_INT);
+$userid     = optional_param('user', false, PARAM_INT);
+
+function groups_param_action($prefix = 'b_') {
+    $action = false;
+//($_SERVER['QUERY_STRING'] && preg_match("/$prefix(.+?)=(.+)/", $_SERVER['QUERY_STRING'], $matches)) { //b_(.*?)[&;]{0,1}/
+
+    if ($_POST) {
+        $form_vars = $_POST;
+    }
+    elseif ($_GET) {
+        $form_vars = $_GET; 
+    }
+    if ($form_vars) {
+        foreach ($form_vars as $key => $value) {
+            //echo "$key => $value<br />\n";
+            if (preg_match("/$prefix(.+)/", $key, $matches)) {
+                $action = $matches[1];
+                break;
+            }
+        }
+    }
+    if ($action && !preg_match('/^\w+$/', $action)) {
+        $action = false;
+        error('Action had wrong type.');
+    }
+    ///if (debugging()) echo 'Debug: '.$action;
+    return $action;
+}
+$action = groups_param_action();
+
+// Get the course information so we can print the header and
+// check the course id is valid
+$course = groups_get_course_info($courseid);
+if (! $course) {
+    $success = false;
+    print_error('The course ID is invalid');
+}
+
+if ($success) {
+    // Make sure that the user has permissions to manage groups.
+    require_login($courseid);
+
+    $context = get_context_instance(CONTEXT_COURSE, $courseid);
+    if (! has_capability('moodle/course:managegroups', $context)) {
+        redirect(); //"group.php?id=$course->id");   // Not allowed to see all groups
+    }
+
+    // Set the session key so we can check this later
+    $sesskey = !empty($USER->id) ? $USER->sesskey : '';
+
+    switch ($action) {
+    
+    case 'showgroupingsettingsform':
+        redirect(groups_grouping_edit_url($courseid, $groupingid, false));
+        break;
+    case 'showgroupingpermsform':
+        break;
+    case 'deletegrouping':
+        break;
+    case 'showcreategroupingform':
+        redirect(groups_grouping_edit_url($courseid, null, false));
+        break;
+    case 'printerfriendly':
+        redirect('groupui/printgrouping.php?courseid='. $courseid .'&groupingid='. $groupingid);
+        break;
+
+    case 'showgroupsettingsform':
+        redirect(groups_group_edit_url($courseid, $groupid, $groupingid, false));
+        break;
+    case 'deletegroup':
+        redirect(groups_group_edit_url($courseid, $groupid, $groupingid, false, 'delete=1'));
+        break;
+    case 'removegroup':
+        break;
+    case 'showcreategroupform':
+        if (GROUP_NOT_IN_GROUPING == $groupingid) {
+            print_error('errornotingrouping', 'group', groups_home_url($courseid), get_string('notingrouping', 'group'));
+        }
+        redirect(groups_group_edit_url($courseid, null, $groupingid, false));
+        break;
+    case 'addgroupstogroupingsform':
+        break;
+    case 'updategroups': //Currently reloading.
+        break;
+
+    case 'removemembers':
+        break;
+    case 'showaddmembersform':
+        redirect(groups_members_add_url($courseid, $groupid, $groupingid, false));
+        break;
+    case 'updatemembers': //Currently reloading.
+        break;
+    default:
+        //print_error('Unknown action.');
+        break;
+    }
+
+    // Print the page and form
+    $strgroups = get_string('groups');
+    $strparticipants = get_string('participants');
+
+    print_header("$course->shortname: $strgroups home", //TODO: home
+                 "$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> ".
+                 "-> $strgroups", '', '', true, '', user_login_string($course, $USER));
+
+    $usehtmleditor = false;
+
+//groups_sort_language_strings();
+?>
+<form name="groupeditform" id="groupeditform" action="index.php" method="post">
+    <input type="hidden" name="id" value="<?php echo $courseid; ?>" />
+
+<?php /*    
+<input type="hidden" name="groupid" value="<?php p($selectedgroup) ?>" />
+<input type="hidden" name="sesskey" value="<?php p($sesskey) ?>" />
+<input type="hidden" name="roleid" value="<?php p($roleid) ?>" />
+*/ ?>
+
+    <table cellpadding="10" class="generaltable generalbox groupmanagementtable" summary="">
+        <tr>
+            <td class="generalboxcontent">
+                <p><label for="groupings"><?php print_string('groupings', 'group'); ?></label></p>
+                <select name="grouping" id="groupings" size="15" class="select">
+<?php
+//onchange="onGroupingChange()"
+
+    $groupingids = groups_get_groupings($courseid);
+    $groupingids[] = GROUP_NOT_IN_GROUPING;
+
+    if ($groupingids) {    
+        // Put the groupings into a hash and sort them
+        foreach($groupingids as $id) {
+            $listgroupings[$id] = groups_get_grouping_displayname($id);
+        }
+        natcasesort($listgroupings);
+        
+        // Print out the HTML
+        $count = 1;
+        foreach($listgroupings as $id => $name) {
+            $select = '';
+            if ($groupingid == $id) { //|| $count <= 1) ??
+                $select = ' selected="selected"';
+                $sel_groupingid = $id;
+            }
+            echo "<option value=\"$id\"$select >$name</option>\n";
+            $count++;
+        }
+    }
+?>
+                </select>
+
+                <p><input type="submit" name="b_updategroups" id="updategroups" value="<?php print_string('showgroupsingrouping', 'group'); ?>" /></p>
+                <p><input type="submit" name="b_showgroupingsettingsform" id="showeditgroupingsettingsform" value="<?php print_string('editgroupingsettings', 'group'); ?>" /></p>
+                <p><input type="submit" disabled="disabled" name="b_showgroupingpermsform" id="showeditgroupingpermissionsform" value="<?php print_string('editgroupingpermissions', 'group'); ?>" /></p>
+                <p><input type="submit" disabled="disabled" name="b_deletegrouping" id="deletegrouping" value="<?php print_string('deletegrouping', 'group'); ?>" /></p>
+                <p><input type="submit" name="b_showcreategroupingform" id="showcreategroupingform" value="<?php print_string('creategrouping', 'group'); ?>" /></p>
+                <p><input type="submit" disabled="disabled" name="b_createautomaticgroupingform" id="showcreateautomaticgroupingform" value="<?php print_string('createautomaticgrouping', 'group'); ?>" /></p>
+                <p><input type="submit" name="b_printerfriendly" id="printerfriendly" value="<?php print_string('printerfriendly', 'group'); ?>" /></p>
+            </td>
+            <td>
+                <p><label for="groups"><?php print_string('groupsinselectedgrouping', 'group'); ?></label></p>
+                <select name="group" id="groups" size="15" class="select">
+<?php //onchange="onGroupChange()"
+    if (GROUP_NOT_IN_GROUPING == $sel_groupingid) {
+        $groupids = groups_get_groups_not_in_any_grouping($courseid); //$sel_groupingid
+    } else {
+        $groupids = groups_get_groups_in_grouping($sel_groupingid);
+    }
+    if ($groupids) {
+        // Put the groupings into a hash and sort them
+        foreach($groupids as $id) {
+            $listgroups[$id] = groups_get_group_displayname($id);
+        }
+        
+        natcasesort($listgroups);
+        
+        // Print out the HTML
+        $count = 1;
+        foreach($listgroups as $id => $name) {
+            $select = '';
+            if ($groupid == $id) { //|| $count <= 1) ??
+                $select = ' selected="selected"';
+                $sel_groupid = $id;
+            }
+            echo "<option value=\"$id\"$select >$name</option>\n";
+            $count++;
+        }
+    }
+?>                
+                </select>
+
+                <p><input type="submit" name="b_updatemembers" id="updatemembers" value="<?php print_string('showmembersforgroup', 'group'); ?>" /></p>
+                <p><input type="submit" name="b_showgroupsettingsform" id="showeditgroupsettingsform" value="<?php print_string('editgroupsettings', 'group'); ?>" /></p>
+                <p><input type="submit" name="b_deletegroup" onclick="onDeleteGroup()" id="deletegroup" value="<?php print_string('deleteselectedgroup', 'group'); ?>" /></p>
+                <p><input type="submit" disabled="disabled" name="b_removegroup" id="removegroup" value="<?php print_string('removegroupfromselectedgrouping', 'group'); ?>" /></p>
+                <p><input type="submit" name="b_showcreategroupform" id="showcreategroupform" value="<?php print_string('creategroupinselectedgrouping', 'group'); ?>" /></p>
+                <p><input type="submit" disabled="disabled" name="b_addgroupstogroupingsform" id="showaddgroupstogroupingform" value="<?php print_string('addexistinggroupstogrouping', 'group'); ?>" /></p>
+
+            </td>
+            <td>
+                <p><label for="members"><?php print_string('membersofselectedgroup', 'group'); ?></label></p>
+                <select name="user[]" id="members" size="15" multiple="multiple" class="select">
+<?php
+    if (isset($sel_groupid)) {
+        $userids = groups_get_members($sel_groupid);
+    }
+    if (isset($userids) && is_array($userids)) {       
+        // Put the groupings into a hash and sort them
+        foreach($userids as $id) {
+            $listmembers[$id] = groups_get_user_displayname($id, $courseid);       
+        }
+        natcasesort($listmembers);
+
+        foreach($listmembers as $id => $name) {
+            echo "<option value=\"$id\">$name</option>\n";
+        }
+    }
+?>
+                </select>
+
+                <p><input type="submit" disabled="disabled" name="b_removemembers" id="removemembers" value="<?php print_string('removeselectedusers', 'group'); ?>"/></p>
+                <p><input type="submit" name="b_showaddmembersform" id="showaddmembersform" value="<?php print_string('adduserstogroup', 'group'); ?>" /></p>
+
+            </td>
+        </tr>
+    </table>
+
+    <!--input type="hidden" name="rand" value="om" /-->
+</form>
+<?php
+    print_footer($course);
+}
+
+?>

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 6605f9caa60cf1fa1cb8419c24f189b2ad9e6279..6b77ff58b32c0913a896eb9409c4d293b2c4b672 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -281,6 +281,10 @@ form.popupform {
   overflow:hidden;
 }
 
+.groupmanagementtable td {
+  vertical-align: top;
+}
+
 /*Accessibility: text 'seen' by screen readers but not visual users. Fixed for RTL languages, example Farsi. */
 .accesshide {
   position:absolute;