--- loncom/interface/loncreateuser.pm	2003/12/11 14:58:00	1.73
+++ 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.73 2003/12/11 14:58:00 sakharuk Exp $
+# $Id: loncreateuser.pm,v 1.79 2004/02/26 19:43:13 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -124,7 +124,9 @@ sub print_username_entry_form {
     my @domains = &Apache::loncommon::get_domains();
     my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
     my $bodytag =&Apache::loncommon::bodytag(
-                                  'Create Users, Change User Privileges');
+                                  'Create Users, Change User Privileges').
+		  &Apache::loncommon::help_open_faq(282).
+		  &Apache::loncommon::help_open_bug('Instructor Interface');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
     my $sellink=&Apache::loncommon::selectstudent_link
                                         ('crtuser','ccuname','ccdomain');
@@ -140,6 +142,8 @@ sub print_username_entry_form {
                     'nr'   => "Name of Role",
                     'cre'  => "Custom Role Editor"
 				       );
+    my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
+    my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
     $r->print(<<"ENDDOCUMENT");
 <html>
 <head>
@@ -149,7 +153,7 @@ $selscript
 $bodytag
 <form action="/adm/createuser" method="post" name="crtuser">
 <input type="hidden" name="phase" value="get_user_info">
-<h2>$lt{siur}</h2>
+<h2>$lt{siur}$helpsiur</h2>
 <table>
 <tr><td>$lt{usr}:</td><td><input type="text" size="15" name="ccuname">
 </td><td rowspan="2">$sellink</td></tr><tr><td>
@@ -159,7 +163,7 @@ $lt{'dom'}:</td><td>$domform</td></tr>
 </form>
 <form action="/adm/createuser" method="post" name="docustom">
 <input type="hidden" name="phase" value="selected_custom_edit">
-<h2>$lt{'ecrp'}</h2>
+<h2>$lt{'ecrp'}$helpecpr</h2>
 $lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />
 <input name="customeditor" type="submit" value="$lt{'cre'}" />
 </body>
@@ -246,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",
@@ -259,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>
@@ -277,11 +282,11 @@ $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>
-${'hs'}: <select name="hserver" size="1"> $home_server_list </select>
+$lt{'hs'}: <select name="hserver" size="1"> $home_server_list </select>
 <hr />
 <h3>$lt{'lg'}</h3>
 <p>$generalrule </p>
@@ -291,7 +296,7 @@ ${'hs'}: <select name="hserver" size="1"
 <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",
@@ -348,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$//;
@@ -367,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)) ||
@@ -405,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)) ||
@@ -421,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+)/;
@@ -430,6 +451,7 @@ END
                        $allowed=0;
                    }
                }
+	       $bgcol='77FF77';
                my $row = '';
                $row.='<tr bgcolor="#'.$bgcol.'"><td>';
                my $active=1;
@@ -463,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);
@@ -588,7 +626,7 @@ ENDOTHERAUTHS
 				       );
        $r->print(<<ENDCOAUTH);
 <h4>$lt{'cs'}</h4>
-<table border=2><tr><th>${'act'}</th><th>${'rol'}</th><th>${'ext'}</th>
+<table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th>
 <th>$lt{'sta'}</th><th>$lt{'end'}</th></tr>
 <tr>
 <td><input type=checkbox name="act_$cudom\_$cuname\_ca"></td>
@@ -756,10 +794,10 @@ ENDNEWUSERHEAD
              $ENV{'form.cmiddle'},$ENV{'form.clast'},$ENV{'form.cgen'},
              undef,$desiredhost
 	     );
-	$r->print('Generating user: '.$result);
+	$r->print(&mt('Generating user').': '.$result);
         my $home = &Apache::lonnet::homeserver($ENV{'form.ccuname'},
                                                $ENV{'form.ccdomain'});
-        $r->print('<br />'&mt('Home server').': '.$home.' '.
+        $r->print('<br />'.&mt('Home server').': '.$home.' '.
                   $Apache::lonnet::libserv{$home});
     } elsif (($ENV{'form.login'} ne 'nochange') &&
              ($ENV{'form.login'} ne ''        )) {
@@ -862,7 +900,7 @@ END
                            'gen'  => "Generation"
 					       );
                 $r->print(<<"END");
-<h2>$lt{'usr'} "$ENV{'form.ccuname'}" ${'id'} "$ENV{'form.ccdomain'}"</h2>
+<h2>$lt{'usr'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h2>
 <h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4>
 <h4>$lt{'gen'}: $userenv{'generation'}</h4>
 END
@@ -1002,6 +1040,8 @@ END
             }
 	} 
     } # End of foreach (keys(%ENV))
+# Flush the course logs so reverse user roles immediately updated
+    &Apache::lonnet::flushcourselogs();
     $r->print('</body></html>');
 }
 

$lt{usr}:		$sellink
@@ -159,7 +163,7 @@ $lt{'dom'}:	$domform	$sellink

$lt{'ln'}
$lt{'gen'}
$lt{'gen'}$genhelp