--- loncom/interface/loncreateuser.pm	2006/08/11 22:47:36	1.125.2.4
+++ loncom/interface/loncreateuser.pm	2006/08/16 19:47:42	1.130
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.125.2.4 2006/08/11 22:47:36 albertel Exp $
+# $Id: loncreateuser.pm,v 1.130 2006/08/16 19:47:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -340,7 +340,7 @@ sub print_user_modification_page {
     }
 
     function setType() {
-        var crstype = 'Course'
+        var crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
         rolevals = new Array("$rolevalslist");
         if (crstype == 'Group') {
             if (document.cu.currsec.options[0].text == "$pickcrsfirst") {
@@ -604,7 +604,7 @@ END
                if ($area =~ /^\/(\w+)\/(\d\w+)/ ) {
 		   $class='Course';
                    my ($coursedom,$coursedir) = ($1,$2);
-		   $sortkey.="\0$1";
+		   $sortkey.="\0$coursedom";
                    # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
                    my %coursedata=
                        &Apache::lonnet::coursedescription($1.'_'.$2);
@@ -619,6 +619,7 @@ END
 		       $carea=&mt('Unavailable course').': '.$area;
 		       $sortkey.="\0".&mt('Unavailable course').': '.$area;
 		   }
+		   $sortkey.="\0$coursedir";
                    $inccourses{$1.'_'.$2}=1;
                    if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) ||
                        (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
@@ -1502,7 +1503,7 @@ sub custom_role_editor {
     }
     my %lt=&Apache::lonlocal::texthash(
 		    'prv'  => "Privilege",
-		    'crl'  => "Course Level",
+		    'crl'  => "Course/Group Level",
                     'dml'  => "Domain Level",
                     'ssl'  => "System Level"
 				       );
@@ -1652,7 +1653,7 @@ sub course_level_table {
             'new'  => "Define new section",
             'ssd'  => "Set Start Date",
             'sed'  => "Set End Date",
-            'crl'  => "Course Level",
+            'crl'  => "Course/Group Level",
             'act'  => "Activate",
             'rol'  => "Role",
             'ext'  => "Extent",
@@ -1799,7 +1800,7 @@ sub course_level_dc {
                       '<input type="hidden" name="origdom" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="dccourse" value="" />';
     my $courseform='<b>'.&Apache::loncommon::selectcourse_link
-            ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';
+            ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course/Group').'</b>';
     my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom);
     my %lt=&Apache::lonlocal::texthash(
                     'typ' => "Type",
@@ -1812,9 +1813,14 @@ sub course_level_dc {
                     'ssd'  => "Set Start Date",
                     'sed'  => "Set End Date"
                   );
-    my $header = '<h4>'.&mt('Course Level').'</h4>'.
-                 '<table border="2"><tr><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th></tr>';
-    my $otheritems = '<tr><td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',".')" /></td>'."\n".
+    my $header = '<h4>'.&mt('Course/Group Level').'</h4>'.
+                 '<table border="2"><tr><th>'.$lt{'typ'}.'</th><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th></tr>';
+    my $otheritems = '<tr><td><select name="crstype" onChange="javascript:setType();">'."\n".
+                     ' <option value="">'.&mt('Please select')."\n".
+                     ' <option value="Course">'.&mt('Course')."\n".
+                     ' <option value="Group">'.&mt('Group')."\n".
+                     '</select>'."\n".
+                     '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','".')" /></td>'."\n".
                      '<td><select name="role">'."\n";
     foreach  ('st','ta','ep','in','cc') {
         my $plrole=&Apache::lonnet::plaintext($_);