--- loncom/auth/lonroles.pm 2005/06/05 07:10:32 1.120 +++ loncom/auth/lonroles.pm 2005/07/13 19:56:17 1.127 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.120 2005/06/05 07:10:32 albertel Exp $ +# $Id: lonroles.pm,v 1.127 2005/07/13 19:56:17 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -227,7 +227,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 +260,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 +343,7 @@ ENDHEADER # --------------------------------------------------------------- Error Header? if ($error) { $r->print("

LON-CAPA Access Control

"); - $r->print("
Access  : ".
+        $r->print("
Access  : ".
                   Apache::lonnet::plaintext($priv)."\n");
         $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n");
         $r->print("Action  : $msg\n
");
@@ -380,7 +387,7 @@ ENDHEADER
                       ($env{'user.name'},$env{'user.domain'})}.
 		      "
\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 +460,7 @@ ENDHEADER
                 my $trole;
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
-                    $tremark.='
'.&mt('Defined by ').$rauthor.
+                    $tremark.='
'.&mt('Defined by ').$rauthor.
 			&mt(' at ').$rdomain.'.';
                     $trole=$rrole;
                 } else {
@@ -464,7 +471,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();
@@ -511,9 +518,6 @@ ENDHEADER
 		    $sortkey=$role;
                 } elsif ($trest) {
                     $ttype='Course';
-                    if ($tsection) {
-                        $ttype.='
'.&mt('Section/Group').': '.$tsection;
-		    }
                     my $tcourseid=$tdom.'_'.$trest;
                     if ($env{'course.'.$tcourseid.'.description'}) {
                         $twhere=$env{'course.'.$tcourseid.'.description'};
@@ -538,6 +542,10 @@ ENDHEADER
 			    $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
                         }
                     }
+                    if ($tsection) {
+                        $twhere.='
'.&mt('Section/Group').': '.$tsection;
+		    }
+
 		    if ($role ne 'st') { $twhere.="
".&mt('Domain').":".$tdom; }
                 } elsif ($tdom) {
                     $ttype='Domain';
@@ -583,7 +591,7 @@ ENDHEADER
     }
     $r->print('
');
     unless ($nochoose) { $r->print(''); }
-    $r->print(''."\n");
     my $doheaders=-1;
@@ -611,8 +619,8 @@ ENDHEADER
             } 
 	}
 	if ($output) {
-	    $r->print("");
+	    $r->print("");
 	    $r->print($output);
 	    $r->print("");
             $doheaders ++;
@@ -637,8 +645,8 @@ ENDHEADER
 	}
 	if ($output) {
 	    if ($doheaders > 0) {
-		$r->print("".
-			  "");
+		$r->print("".
+			  "");
 	    }
 	    $r->print($output);	
 	}
@@ -660,7 +668,7 @@ ENDHEADER
 	    $r->print('');
 	}
     }
-    $r->print(''."\n");
 
@@ -670,7 +678,7 @@ ENDHEADER
     }
 # ------------------------------------------------------------ Privileges Info
     if (($advanced) && (($env{'user.error.msg'}) || ($error))) {
-	$r->print('
Current Privileges
');
+	$r->print('
Current Privileges
');
 
 	foreach $envkey (sort keys %env) {
 	    if ($envkey=~/^user\.priv\.$env{'request.role'}\./) {
@@ -789,8 +797,7 @@ sub build_roletext {
 
 
     $roletext.=''.
+    my $output = ''.
               ''.
               ''.
+              $ccrole.''.
               ''."\n";
     return $output;

 '.&mt('User Role').''.&mt('Extent').
+    $r->print(''.&mt('User Role').''.&mt('Extent').
          ''.&mt('Start').''.&mt('End').''.
 	      &mt('Remarks and Calendar Announcements').'
".
-		      &mt('Recent Roles')."
".
+		      &mt('Recent Roles')."
".&mt($type)."
".&mt($type)."
 '.&mt('No role specified').
+    $r->print(''.&mt('No role specified').
       ''.$tremark.
       ' 
'.$trole.
-               ''.$ttype.
-               ''.$twhere.
+	       ''.$twhere.
                ''.$tpstart.
                ''.$tpend.
                ''.$tremark.
@@ -947,17 +954,17 @@ sub allcourses_row {
     my $dcdom = shift;
     my $ccrole = Apache::lonnet::plaintext('cc');
     my $selectlink = &courselink($dcdom);
-    my $output = '
'.
               ''.
-              $ccrole.''.&mt('Course').''.&mt('All courses').': '.
               $selectlink.''.
               '
'.&mt('Domain').':'.$dcdom.''.
-              '		'.
+              ''.
               &mt('Course Coordinator access to all courses in domain').
               ': '.$dcdom.'