--- loncom/auth/lonroles.pm	2003/09/18 20:10:18	1.72
+++ loncom/auth/lonroles.pm	2003/11/08 21:51:44	1.76
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.72 2003/09/18 20:10:18 www Exp $
+# $Id: lonroles.pm,v 1.76 2003/11/08 21:51:44 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -56,7 +56,7 @@ use Apache::lonlocal;
 sub redirect_user {
     my ($r,$title,$url,$msg) = @_;
     $msg = $title if (! defined($msg));
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     my $swinfo=&Apache::lonmenu::rawconfig();
@@ -131,7 +131,7 @@ sub handler {
 # student attempts to register a new key
 			     } else {
 # print form to enter a new key
-				 $r->content_type('text/html');
+				 &Apache::loncommon::content_type($r,'text/html');
 				 &Apache::loncommon::no_cache($r);
 				 $r->send_http_header;
 				 my $swinfo=&Apache::lonmenu::rawconfig();
@@ -230,7 +230,7 @@ ENDENTERKEY
 
 # =============================================================== No Roles Init
 
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
@@ -327,9 +327,12 @@ ENDHEADER
          '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'.
 	      &mt('Remark').'</th></tr>'."\n");
 
+    my (%roletext,%sortrole,%roleclass);
     foreach $envkey (sort keys %ENV) {
         my $button = 1;
         my $switchserver='';
+	my $roletext;
+	my $sortkey;
         if ($envkey=~/^user\.role\./) {
 	    my (undef,undef,$role,@pwhere)=split(/\./,$envkey);
             next if (!defined($role) || $role eq '');
@@ -346,7 +349,7 @@ ENDHEADER
                     $tstatus='future';
                     if ($tstart<$now) { $tstatus='will'; }
                 }
-                $tpstart=localtime($tstart);
+                $tpstart=&Apache::lonlocal::locallocaltime($tstart);
             }
             if ($tend) {
                 if ($tend<$then) { 
@@ -354,7 +357,7 @@ ENDHEADER
                 } elsif ($tend<$now) { 
                     $tstatus='will_not'; 
                 }
-                $tpend=localtime($tend);
+                $tpend=&Apache::lonlocal::locallocaltime($tend);
             }
             if ($ENV{'request.role'} eq $trolecode) {
 		$tstatus='selected';
@@ -414,6 +417,7 @@ ENDHEADER
 			': '.$tdom.'<br />'.
                         ' '.&mt('Server').':&nbsp;'.$home;
                     $ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca';
+		    $sortkey=$role."$trest:$tdom";
                 } elsif ($role eq 'au') {
                     # Authors
                     my $home = &Apache::lonnet::homeserver
@@ -432,6 +436,7 @@ ENDHEADER
                     $twhere=&mt('Domain').': '.$tdom.'<br />'.&mt('Server').
 			':&nbsp;'.$home;
                     $ENV{'course.'.$tdom.'_'.$trest.'.description'}='ca';
+		    $sortkey=$role;
                 } elsif ($trest) {
                     $ttype=&mt('Course');
                     if ($tsection) {
@@ -440,6 +445,7 @@ ENDHEADER
                     my $tcourseid=$tdom.'_'.$trest;
                     if ($ENV{'course.'.$tcourseid.'.description'}) {
                         $twhere=$ENV{'course.'.$tcourseid.'.description'};
+			$sortkey=$twhere."\0".$envkey;
                         unless ($twhere eq &mt('Currently not available')) {
 			    $twhere.=' <font size="-2">'.
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
@@ -449,6 +455,7 @@ ENDHEADER
                         my %newhash=Apache::lonnet::coursedescription
                             ($tcourseid);
                         if (%newhash) {
+			    $sortkey=$newhash{'description'}."\0".$envkey;
                             $twhere=$newhash{'description'}.
                               ' <font size="-2">'.
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom,$tfont).
@@ -456,55 +463,89 @@ ENDHEADER
                         } else {
                             $twhere=&mt('Currently not available');
                             $ENV{'course.'.$tcourseid.'.description'}=$twhere;
+			    $sortkey=$twhere."\0".$envkey;
                         }
                     }
 		    if ($role ne 'st') { $twhere.="<br />".&mt('Domain').":".$tdom; }
                 } elsif ($tdom) {
                     $ttype=&mt('Domain');
                     $twhere=$tdom;
+		    $sortkey=$role.$twhere;
                 } else {
                     $ttype=&mt('System');
                     $twhere=&mt('system wide');
+		    $sortkey=$role.$twhere;
                 }
  
-                $r->print('<tr bgcolor='.$tbg.'>');
+                $roletext.='<tr bgcolor='.$tbg.'>';
                 unless ($nochoose) {
                     if (!$button) {
 			if ($switchserver) {
-			    $r->print('<td><a href="/adm/logout?handover='.
-                              $switchserver.'">'.&mt('Switch Server').'</a></td>');
+			    $roletext.='<td><a href="/adm/logout?handover='.
+                              $switchserver.'">'.&mt('Switch Server').'</a></td>';
                         } else {
-                            $r->print('<td>&nbsp;</td>');
+                            $roletext.=('<td>&nbsp;</td>');
                         }
                     } elsif ($tstatus eq 'is') {
-                        $r->print('<td><input type=submit value="'.
+                        $roletext.=('<td><input type=submit value="'.
 				  &mt('Select').'" name="'.
                                   $trolecode.'"></td>');
                     } elsif ($tryagain) {
-                        $r->print
-                        ('<td><input type=submit value="'.
-		  &mt('Try Selecting Again').'" name="'.$trolecode.'"></td>');
+                        $roletext.=
+			    '<td><input type=submit value="'.
+		  &mt('Try Selecting Again').'" name="'.$trolecode.'"></td>';
                     } elsif ($advanced) {
-                        $r->print
-                            ('<td><input type=submit value="'.
-		        &mt('Re-Initialize').'" name="'.$trolecode.'"></td>');
+                        $roletext.=
+                            '<td><input type=submit value="'.
+		        &mt('Re-Initialize').'" name="'.$trolecode.'"></td>';
                     } else {
-                        $r->print('<td>&nbsp;</td>');
+                        $roletext.='<td>&nbsp;</td>';
                     }
                 }
                 $tremark.=&Apache::lonannounce::showday(time,1,
                          &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
                 
-		$r->print('<td><font color="'.$tfont.'">'.$trole.
+		$roletext.='<td><font color="'.$tfont.'">'.$trole.
                       '</font></td><td><font color="'.$tfont.'">'.$ttype.
                       '</font></td><td><font color="'.$tfont.'">'.$twhere.
                       '</font></td><td><font color="'.$tfont.'">'.$tpstart.
                       '</font></td><td><font color="'.$tfont.'">'.$tpend.
                       '</font></td><td><font color="'.$tfont.'">'.$tremark.
-                      '&nbsp;</font></td></tr>'."\n");
+                      '&nbsp;</font></td></tr>'."\n";
+		$roletext{$envkey}=$roletext;
+		if (!$sortkey) {$sortkey=$twhere."\0".$envkey;}
+		$sortrole{$sortkey}=$envkey;
+		$roleclass{$envkey}=$ttype;
 	    }
         }
     }
+    my $doheaders=-1;
+    foreach my $type (&mt('Construction Space'),&mt('Course'),
+		      &mt('Domain'),&mt('System')) {
+	my $haverole=0;
+	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
+	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
+		$haverole=1;
+	    }
+	}
+	if ($haverole) { $doheaders++; }
+    }
+    foreach my $type (&mt('Construction Space'),&mt('Course'),
+		      &mt('Domain'),&mt('System')) {
+	my $output;
+	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
+	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
+		$output.=$roletext{$sortrole{$which}};
+	    }
+	}
+	if ($output) {
+	    if ($doheaders > 0) {
+		$r->print("<tr bgcolor='#99ff99'>".
+			  "<td align='center' colspan='7'>$type</td>");
+	    }
+	    $r->print($output);	    
+	}
+    }
     my $tremark='';
     my $tfont='#003300';
     if ($ENV{'request.role'} eq 'cm') {