--- loncom/interface/loncoursegroups.pm	2006/06/29 17:01:26	1.30
+++ loncom/interface/loncoursegroups.pm	2006/06/30 03:33:50	1.31
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: loncoursegroups.pm,v 1.30 2006/06/29 17:01:26 albertel Exp $
+# $Id: loncoursegroups.pm,v 1.31 2006/06/30 03:33:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,6 +89,7 @@ sub handler {
     $idx{fullname} = &Apache::loncoursedata::CL_FULLNAME();
     $idx{udom} = &Apache::loncoursedata::CL_SDOM();
     $idx{uname} = &Apache::loncoursedata::CL_SNAME();
+    $idx{section} = &Apache::loncoursedata::CL_SECTION();
 
     my $rowColor1 = "#dddddd";
     my $rowColor2 = "#eeeeee";
@@ -1402,8 +1403,8 @@ sub membership_options {
     $r->print(&Apache::lonhtmlcommon::role_select_row(\@roles));
     if (@sections > 0) {
         @sections = sort {$a cmp $b} @sections;
-        unshift(@sections,'all'); # Put 'all' at the front of the list
         unshift(@sections,'none'); # Put 'no sections' next
+        unshift(@sections,'all'); # Put 'all' at the front of the list
         $r->print('<td>&nbsp;</td>
                    <td colspan="3" align="center" valign="top">'.
         &sections_selection(\@sections,'sectionpick').'</td>');
@@ -1425,11 +1426,11 @@ sub sections_selection {
     }
     foreach my $sec (@{$sections}) {
         if ($sec eq 'all') {
-            $section_sel .= '  <option value="'.$sec.'" />all sections'."\n";
+            $section_sel .= '  <option value="'.$sec.'" selected="selected">'.&mt('all sections').'</option>'."\n";
         } elsif ($sec eq 'none') {
-            $section_sel .= '  <option value="'.$sec.'" />no section'."\n"; 
+            $section_sel .= '  <option value="'.$sec.'">'.&mt('no section').'</option>'."\n"; 
         } else {
-            $section_sel .= '  <option value="'.$sec.'" />'.$sec."\n";
+            $section_sel .= '  <option value="'.$sec.'">'.$sec."</option>\n";
         }
     }
     my $output = '
@@ -1766,6 +1767,7 @@ sub pick_new_members {
      </td>
      <td><b><a href="javascript:changeSort('."'domain'".')">'.&mt('Domain').'</a></b></td>
      <td><b><a href="javascript:changeSort('."'id'".')">ID</a></b></td>
+     <td><b><a href="javascript:changeSort('."'section'".')">Section</a></b></td>
 ');
         if (@{$available} > 0) {
             $r->print('<td><b>'.$lt{'func'}.'</b></td>');
@@ -1794,6 +1796,8 @@ sub pick_new_members {
                 push(@{$Sortby{$members{$user}[$$idx{udom}]}},$user);
             } elsif ($env{'form.sortby'} eq 'id') {
                 push(@{$Sortby{$members{$user}[$$idx{id}]}},$user);
+            } elsif ($env{'form.sortby'} eq 'section') {
+                push(@{$Sortby{$members{$user}[$$idx{section}]}},$user);
             } else {
                 push(@{$Sortby{$members{$user}[$$idx{fullname}]}},$user);
             }
@@ -1811,10 +1815,12 @@ sub pick_new_members {
                 my $fullname = $members{$user}[$$idx{fullname}];
                 my $udom = $members{$user}[$$idx{udom}];
                 my $uname = $members{$user}[$$idx{uname}];
+                my $section = $members{$user}[$$idx{section}];
                 $r->print('<tr bgcolor="'.$rowColor.'"><td align="right">
    <input type="checkbox" name="member" value="'.$user.'" /></td><td><small>'.
     $fullname.'</small></td><td><small>'.$uname.'</small></td><td><small>'.
-    $udom.'</small></td><td><small>'.$id.'</small></td>');
+    $udom.'</small></td><td><small>'.$id.'</small></td>'.
+			  '<td><small>'.$section.'</small></td>');
                 if (@{$available} > 0) {
                     $r->print('<td align="center"><nobr><small>'.
                               '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');