--- loncom/auth/lonroles.pm 2005/04/22 20:54:43 1.119 +++ loncom/auth/lonroles.pm 2005/06/16 22:25:34 1.124 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.119 2005/04/22 20:54:43 albertel Exp $ +# $Id: lonroles.pm,v 1.124 2005/06/16 22:25:34 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,6 +39,7 @@ use Apache::loncommon; use Apache::lonhtmlcommon; use Apache::lonannounce; use Apache::lonlocal; +use GDBM_File; sub redirect_user { my ($r,$title,$url,$msg,$launch_nav) = @_; @@ -259,12 +260,19 @@ 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; } } # @@ -338,7 +346,18 @@ ENDHEADER $r->print("
Access : ". Apache::lonnet::plaintext($priv)."\n"); $r->print("Resource: ".&Apache::lonenc::check_encrypt($fn)."\n"); - $r->print("Action : $msg\n
'); } - $r->print(' | '.&mt('User Role').' | '.&mt('Extent'). + $r->print(' | '.&mt('User Role').' | '.&mt('Extent'). ' | '.&mt('Start').' | '.&mt('End').' | '. &mt('Remarks and Calendar Announcements').' | |
---|---|---|---|---|---|---|---|---|
". + $r->print(" | ||||||||
". &mt('Recent Roles')." | "); $r->print($output); $r->print("||||||||
".&mt($type)." | ".&mt($type)." | "); } $r->print($output); } @@ -648,7 +668,7 @@ ENDHEADER $r->print(''); } } - $r->print(' | '.&mt('No role specified'). + $r->print(' | '.&mt('No role specified'). ' | '.$tremark. ' | '."\n"); @@ -777,8 +797,7 @@ sub build_roletext { $roletext.=''.$trole. - ' | '.$ttype. - ' | '.$twhere. + ' | '.$twhere. ' | '.$tpstart. ' | '.$tpend. ' | '.$tremark. @@ -941,11 +960,11 @@ sub allcourses_row { 'onClick="verifyCoursePick(this)">'. ' | '. ''. - $ccrole.' | '.&mt('Course').' | '. + $ccrole.''. ''.&mt('All courses').': '.
$selectlink.''.
' '.&mt('Domain').':'.$dcdom.''. - ' | '. + ' | '. &mt('Course Coordinator access to all courses in domain'). ': '.$dcdom.' | '."\n"; return $output;