--- loncom/interface/loncreateuser.pm	2004/01/17 18:12:05	1.77
+++ loncom/interface/loncreateuser.pm	2004/02/26 19:43:13	1.79
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.77 2004/01/17 18:12:05 www Exp $
+# $Id: loncreateuser.pm,v 1.79 2004/02/26 19:43:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -250,7 +250,7 @@ ENDFORMINFO
             '<option value="default" selected>default</option>'."\n".
                 &Apache::loncommon::home_server_option_list($ccdomain);
         
-    my %lt=&Apache::lonlocal::texthash(
+	my %lt=&Apache::lonlocal::texthash(
                     'cnu'  => "Create New User",
                     'nu'   => "New User",
                     'id'   => "in domain",
@@ -263,6 +263,7 @@ ENDFORMINFO
                     'hs'   => "Home Server",
                     'lg'   => "Login Data"
 				       );
+	my $genhelp=&Apache::loncommon::help_open_topic('Generation');
 	$r->print(<<ENDNEWUSER);
 $dochead
 <h1>$lt{'cnu'}</h1>
@@ -281,7 +282,7 @@ $loginscript
     <td><input type='text' name='cmiddle' size='15' /></td></tr>
 <tr><td>$lt{'ln'}   </td>
     <td><input type='text' name='clast'   size='15' /></td></tr>
-<tr><td>$lt{'gen'}  </td>
+<tr><td>$lt{'gen'}$genhelp</td>
     <td><input type='text' name='cgen'    size='5'  /></td></tr>
 </table>
 $lt{'idsn'} <input type='text' name='cstid'   size='15' /></p>
@@ -295,7 +296,7 @@ $lt{'hs'}: <select name="hserver" size="
 <p>$authformloc </p>
 ENDNEWUSER
     } else { # user already exists
-    my %lt=&Apache::lonlocal::texthash(
+	my %lt=&Apache::lonlocal::texthash(
                     'cup'  => "Change User Privileges",
                     'usr'  => "User",                    
                     'id'   => "in domain",
@@ -352,14 +353,16 @@ END
            $r->print(<<END);
 <hr />
 <h3>$lt{'rer'}</h3>
-<table border=2>
+<table>
 <tr><th>$lt{'rev'}</th><th>$lt{'del'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th>
 END
+           my (%roletext,%sortrole,%roleclass);
 	   foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]);
 				    my $b1=join('_',(split('_',$b))[1,0]);
 				    return $a1 cmp $b1;
 				} keys(%rolesdump)) {
                next if ($area =~ /^rolesdef/);
+	       my $envkey=$area;
                my $role = $rolesdump{$area};
                my $thisrole=$area;
                $area =~ s/\_\w\w$//;
@@ -371,18 +374,24 @@ END
                my $bgcol='ffffff';
                my $allowed=0;
                my $delallowed=0;
+	       my $sortkey=$role_code;
+	       my $class='Unknown';
                if ($area =~ /^\/(\w+)\/(\d\w+)/ ) {
+		   $class='Course';
                    my ($coursedom,$coursedir) = ($1,$2);
+		   $sortkey.="\0$1";
                    # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
                    my %coursedata=
                        &Apache::lonnet::coursedescription($1.'_'.$2);
 		   my $carea;
 		   if (defined($coursedata{'description'})) {
-		       $carea=&mt('Course').': '.$coursedata{'description'}.
+		       $carea=$coursedata{'description'}.
                            '<br />'.&mt('Domain').': '.$coursedom.('&nbsp;'x8).
      &Apache::loncommon::syllabuswrapper('Syllabus',$coursedir,$coursedom);
+		       $sortkey.="\0".$coursedata{'description'};
 		   } else {
 		       $carea=&mt('Unavailable course').': '.$area;
+		       $sortkey.="\0".&mt('Unavailable course');
 		   }
                    $inccourses{$1.'_'.$2}=1;
                    if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) ||
@@ -409,6 +418,7 @@ END
                    }
                    $area=$carea;
                } else {
+		   $sortkey.="\0".$area;
                    # Determine if current user is able to revoke privileges
                    if ($area=~ /^\/(\w+)\//) {
                        if ((&Apache::lonnet::allowed('c'.$role_code,$1)) ||
@@ -425,6 +435,13 @@ END
                            $allowed=1;
                        }
                    }
+		   if ($role_code eq 'ca' || $role_code eq 'au') {
+		       $class='Construction Space';
+		   } elsif ($role_code eq 'su') {
+		       $class='System';
+		   } else {
+		       $class='Domain';
+		   }
                }
                if ($role_code eq 'ca') {
                    $area=~/\/(\w+)\/(\w+)/;
@@ -434,6 +451,7 @@ END
                        $allowed=0;
                    }
                }
+	       $bgcol='77FF77';
                my $row = '';
                $row.='<tr bgcolor="#'.$bgcol.'"><td>';
                my $active=1;
@@ -467,8 +485,24 @@ END
                       '</td><td>'.($role_end_time  ?localtime($role_end_time)
                                                    : '&nbsp;' )
                       ."</td></tr>\n";
-               $r->print($row);
+	       $sortrole{$sortkey}=$envkey;
+	       $roletext{$envkey}=$row;
+	       $roleclass{$envkey}=$class;
+               #$r->print($row);
            } # end of foreach        (table building loop)
+	   foreach my $type ('Construction Space','Course','Domain','System','Unknown') {
+	       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 (defined($output)) {
+		   $r->print("<tr bgcolor='#BBffBB'>".
+			     "<td align='center' colspan='7'>".&mt($type)."</td>");
+	       }
+	       $r->print($output);
+	   }
 	   $r->print('</table>');
         }  # End of unless
 	my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);