--- loncom/auth/lonroles.pm	2005/06/05 07:57:28	1.121
+++ loncom/auth/lonroles.pm	2005/09/16 19:47:42	1.129
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.121 2005/06/05 07:57:28 albertel Exp $
+# $Id: lonroles.pm,v 1.129 2005/09/16 19:47:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -50,7 +50,8 @@ sub redirect_user {
     my $swinfo=&Apache::lonmenu::rawconfig();
     my $navwindow;
     if ($launch_nav eq 'on') {
-	$navwindow.=&Apache::lonnavmaps::launch_win('now');
+	$navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef,
+						    ($url eq '/adm/whatsnew'));
     } else {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
@@ -227,7 +228,7 @@ ENDENTERKEY
                     my $tadv=0;
 		    my $msg=&mt('Entering course ...');
 
-		    if (($cnum) && ($role ne 'ca')) {
+		    if (($cnum) && ($role ne 'ca') && ($role ne 'aa')) {
 			my ($furl,$ferr)=
 			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
 			if (($env{'form.orgurl'}) && 
@@ -260,17 +261,24 @@ ENDENTERKEY
 			    if ($role eq 'cc' && $env{'course.' . $courseid . 
 							  '.course.helper.not.run'}) {
 				$furl = "/adm/helper/course.initialization.helper";
+				# Send the user to the course they selected
+			    } elsif (($env{'request.course.fn'}) 
+				     && ($role eq 'cc' && ($env{'environment.course_init_display'} ne 'firstres')))  {
+				$msg = &mt('Entering course ....');
+				&redirect_user($r,&mt('New in course'),
+					       '/adm/whatsnew',$msg,
+					       $env{'environment.remotenavmap'});
+				return OK;
 			    }
-                            # Send the user to the course they selected
-                            &redirect_user($r,&mt('Entering Course'),
+			    &redirect_user($r,&mt('Entering Course'),
                                            $furl,$msg,
 					   $env{'environment.remotenavmap'});
-                            return OK;
+			    return OK;
 			}
 		    }
                     #
                     # Send the user to the construction space they selected
-                    if ($role =~ /^(au|ca)$/) {
+                    if ($role =~ /^(au|ca|aa)$/) {
                         my $redirect_url = '/priv/';
                         if ($role eq 'au') {
                             $redirect_url.=$env{'user.name'};
@@ -336,7 +344,7 @@ ENDHEADER
 # --------------------------------------------------------------- Error Header?
     if ($error) {
 	$r->print("<h1>LON-CAPA Access Control</h1>");
-        $r->print("<hr><pre>Access  : ".
+        $r->print("<!-- LONCAPAACCESSCONTROLERRORSCREEN --><hr /><pre>Access  : ".
                   Apache::lonnet::plaintext($priv)."\n");
         $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
         $r->print("Action  : $msg\n</pre><hr />");
@@ -380,7 +388,7 @@ ENDHEADER
                       ($env{'user.name'},$env{'user.domain'})}.
 		      "<br />\n");
 	    $r->print(&mt(
-      "Author and Co-Author roles may not be available on servers other than your home server."));
+      "Author and Co-Author roles are not available on servers other than their respective home servers."));
         }
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
@@ -453,7 +461,7 @@ ENDHEADER
                 my $trole;
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
-                    $tremark.='<br>'.&mt('Defined by ').$rauthor.
+                    $tremark.='<br />'.&mt('Defined by ').$rauthor.
 			&mt(' at ').$rdomain.'.';
                     $trole=$rrole;
                 } else {
@@ -464,7 +472,7 @@ ENDHEADER
                 my ($tdom,$trest,$tsection)=
                     split(/\//,Apache::lonnet::declutter($where));
                 # First, Co-Authorship roles
-                if ($role eq 'ca') {
+                if (($role eq 'ca') || ($role eq 'aa')) {
                     my $home = &Apache::lonnet::homeserver($trest,$tdom);
 		    my $allowed=0;
 		    my @ids=&Apache::lonnet::current_machine_ids();
@@ -588,7 +596,7 @@ ENDHEADER
          '</th><th>'.&mt('Start').'</th><th>'.&mt('End').'</th><th>'.
 	      &mt('Remarks and Calendar Announcements').'</th></tr>'."\n");
     my $doheaders=-1;
-    foreach my $type ('Construction Space','Course','Domain','System') {
+    foreach my $type ('Domain','Construction Space','Course','System') {
 	my $haverole=0;
 	foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
 	    if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { 
@@ -612,8 +620,8 @@ ENDHEADER
             } 
 	}
 	if ($output) {
-	    $r->print("<tr bgcolor='#BBffBB'><td align='center' colspan='6'>".
-		      &mt('Recent Roles')."</td>");
+	    $r->print("<tr><td align='center' colspan='6'><font face='arial'>".
+		      &mt('Recent Roles')."</font></td>");
 	    $r->print($output);
 	    $r->print("</tr>");
             $doheaders ++;
@@ -638,8 +646,8 @@ ENDHEADER
 	}
 	if ($output) {
 	    if ($doheaders > 0) {
-		$r->print("<tr bgcolor='#BBffBB'>".
-			  "<td align='center' colspan='6'>".&mt($type)."</td></tr>");
+		$r->print("<tr>".
+			  "<td align='center' colspan='6'><font face='arial'>".&mt($type)."</font></td></tr>");
 	    }
 	    $r->print($output);	
 	}
@@ -671,7 +679,7 @@ ENDHEADER
     }
 # ------------------------------------------------------------ Privileges Info
     if (($advanced) && (($env{'user.error.msg'}) || ($error))) {
-	$r->print('<hr><h2>Current Privileges</h2>');
+	$r->print('<hr /><h2>Current Privileges</h2>');
 
 	foreach $envkey (sort keys %env) {
 	    if ($envkey=~/^user\.priv\.$env{'request.role'}\./) {
@@ -947,7 +955,7 @@ sub allcourses_row {
     my $dcdom = shift;
     my $ccrole = Apache::lonnet::plaintext('cc');
     my $selectlink = &courselink($dcdom);
-    my $output = '<tr bgcolor="#77FF77">'.
+    my $output = '<tr bgcolor="#99FF99">'.
               '<td><input type="button" value="'.
               &mt('Select').'" name="ccpick_'.$dcdom.'"'.
               'onClick="verifyCoursePick(this)">'.