--- loncom/interface/lonpickcourse.pm	2005/11/15 20:46:40	1.35
+++ loncom/interface/lonpickcourse.pm	2006/02/02 17:57:40	1.39
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.35 2005/11/15 20:46:40 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.39 2006/02/02 17:57:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,7 +82,7 @@ ENDDOCUMENT
         unless ($coursefilter) { $coursefilter=''; }
         my $listcourseid=&HTML::Entities::encode($coursefilter,'<>&"');
         $courseidtag = &mt('LON-CAPA course ID');
-        $courseidtag .= qq|<input type="text" name="coursefilter" size="25" value="$listcourseid" />
+        $courseidtag .= qq|: <input type="text" name="coursefilter" size="25" value="$listcourseid" />
         <br />
         |;
     }
@@ -131,7 +131,7 @@ ENDDOCUMENT
 				       'cde' => 'Course Description',
 				       'cdo' => 'Course Domain',
                                        'cin' => 'Course Institutional Code',
-                                       'cow' => "Course Owner's usename");
+                                       'cow' => "Course Owner's Username");
     my ($name_code,$name_input);
     if (defined($env{'form.cnameelement'}) && $env{'form.cnameelement'} ne '') {
 	$name_code = "opener.document.$env{'form.form'}.$env{'form.cnameelement'}.value=cdesc;";
@@ -149,7 +149,7 @@ ENDDOCUMENT
     my $roledom = $env{'form.roleelement'};
     if ($roledom) {
         $roleelement = '<input type="hidden" name="roleelement" value="'.$roledom.'" />';
-        $submitopener = &Apache::lonroles::processpick($roledom);
+        $submitopener = &Apache::lonroles::processpick();
         $autosubmit = 'process_pick("'.$roledom.'")';
     }
     $r->print(<<ENDSCRIPT);
@@ -287,12 +287,12 @@ ENDSCRIPT
         my $numcourses = keys(%courses);
 	foreach my $course (keys(%courses)) {
             my $descr;
-            if ($courses{$course} =~ m/^([^:]*):/) {
+            if ($courses{$course} =~ m/^([^:]*):/i) {
                 $descr = &Apache::lonnet::unescape($1);
             } else {
                 $descr = &Apache::lonnet::unescape($courses{$course});
             }
-            my $description = lc($descr);
+            my $description = $descr;
             push (@{$by_descrip{$description}}, $course);
 	}
         if ($numcourses > 1 && $multiple) {
@@ -301,7 +301,8 @@ ENDSCRIPT
                     onclick="javascript:uncheckAll(document.courselist.course_id)" />
                     <br /><br />');
         }
-	foreach my $description (sort(keys(%by_descrip))) {
+	foreach my $description (sort 
+				 { lc($a) cmp lc($b) } (keys(%by_descrip))) {
             foreach my $course (@{$by_descrip{$description}}) {
 	        my $cleandesc=&HTML::Entities::encode($description,'<>&"');
 	        $cleandesc=~s/'/\\'/g;
@@ -329,8 +330,11 @@ ENDSCRIPT
         $r->print('<input type="hidden" name="form" value="'.$env{'form.form'}.'" />'."\n".
                    '<input type="hidden" name="pickedcourse" value="" />'."\n".
                    '<input type="hidden" name="cnumelement" value="'.$env{'form.cnumelement'}.'" />'."\n".
-                   '<input type="hidden" name="cdomelement" value="'.$env{'form.cdomelement'}.'" />'."\n".
-                   '</form>');
+                   '<input type="hidden" name="cdomelement" value="'.$env{'form.cdomelement'}.'" />'."\n");
+        if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) {
+           $r->print('<input type="hidden" name="roleelement" value="'.$env{'form.roleelement'}.'" />'."\n");
+        }
+        $r->print("</form>\n");
     }
     $r->print('</body></html>');
     return OK;