--- loncom/interface/lonselstudent.pm	2007/11/01 19:56:39	1.10
+++ loncom/interface/lonselstudent.pm	2008/11/04 03:25:53	1.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # lonselstudent.pm : Reusable subs for student selection.
 #
-# $Id: lonselstudent.pm,v 1.10 2007/11/01 19:56:39 albertel Exp $
+# $Id: lonselstudent.pm,v 1.13 2008/11/04 03:25:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -111,9 +111,8 @@ sub get_people_in_class {
 
     my $classlist = &Apache::loncoursedata::get_classlist();
     my @keys = keys(%{$classlist});
-    # Sort by: Section, name
+    # Sort by: fullname, username
     @keys = sort {
-	lc($classlist->{$a}[$section])  cmp lc($classlist->{$b}[$section])  ||
 	lc($classlist->{$a}[$fullname]) cmp lc($classlist->{$b}[$fullname]) ||
 	lc($a) cmp lc($b)
     } (@keys);
@@ -179,12 +178,14 @@ sub get_people_in_class {
 #                     This should be true for the first call for a page
 #                     and false for all other calls... only matters if
 #                     multiselect is true.
+#     $context      - If email, do not include <br /><hr /> tags at the end
+#                     of the data table. 
 #  Returns:
 #     HTML  text to add to the rendering of the helper.
 #
 sub render_student_list {
     my ($students, $formname, $formprefix, $defaultusers,
-	$multiselect, $resultname, $javascript) = @_;
+	$multiselect, $resultname, $javascript, $context) = @_;
 
     my $result = "";
 
@@ -331,8 +332,8 @@ SCRIPT
 	foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
 	    $result .= '<option name="'.$sec.'">'.$sec.'</option>'."\n";
 	}
-	$result .= '</td><td valign="top">';
-	$result .= '<input type="button" name="'.$formprefix.'.select" value="'.'Select" onclick='
+	$result .= '</select></td><td valign="top">';
+	$result .= '<input type="button" name="'.$formprefix.'.select" value="'.&mt('Select').'" onclick='
 	    ."'selectSections(\"$formprefix.chosensections\", \"$formprefix\")'".' /></td>';
 	$result .= '<td valign="top"><input type="button" name="'.$formprefix
 	    .'.unselect" value="'.&mt('Unselect').'"  onclick='.
@@ -397,8 +398,10 @@ SCRIPT
 	        . '</td>'.&Apache::loncommon::end_data_table_row().
 		"\n";
     }
-    $result .= &Apache::loncommon::end_data_table().
-	" <br /> <hr />\n";
+    $result .= &Apache::loncommon::end_data_table();
+    if ($context ne 'email') {
+	$result .= "<br /> <hr />\n";
+    }
 
     return $result;
 }