--- loncom/auth/lonroles.pm 2010/01/02 18:50:52 1.231.4.7 +++ loncom/auth/lonroles.pm 2009/10/23 16:14:36 1.233 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # User Roles Screen # -# $Id: lonroles.pm,v 1.231.4.7 2010/01/02 18:50:52 raeburn Exp $ +# $Id: lonroles.pm,v 1.233 2009/10/23 16:14:36 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -158,8 +158,12 @@ sub redirect_user { $navwindow.=&Apache::lonnavmaps::close(); } + # Breadcrumbs + my $brcrum = [{'href' => $url, + 'text' => 'Switching Role'},]; my $start_page = &Apache::loncommon::start_page('Switching Role',undef, - {'redirect' => [1,$url]}); + {'redirect' => [1,$url], + 'bread_crumbs' => $brcrum,}); my $end_page = &Apache::loncommon::end_page(); # Note to style police: @@ -185,17 +189,25 @@ sub error_page { &Apache::loncommon::no_cache($r); $r->send_http_header; return OK if $r->header_only; - $r->print(&Apache::loncommon::start_page('Problems during Course Initialization'). + # Breadcrumbs + my $brcrum = [{'href' => $dest, + 'text' => 'Problems during Course Initialization'},]; + $r->print(&Apache::loncommon::start_page('Problems during Course Initialization', + undef, + {'bread_crumbs' => $brcrum,}) + ); + $r->print( ''. '

'.&mt('The following problems occurred:'). - '
'. + '
'. $error. - '


'.&mt('Continue').''. - &Apache::loncommon::end_page()); + '


'.&mt('Continue').'' + ); + $r->print(&Apache::loncommon::end_page()); } sub handler { @@ -659,12 +671,11 @@ ENDHEADER if ($reinit) { $r->print( '

'. - &mt('As your session file for the course or community has expired, you will need to re-select the course.').'

'); + &mt('As your session file for the course has expired, you will need to re-select the course.').''); } else { $r->print( '

'. - &mt('You need to choose another user role or enter a specific course or community for this function.'). - '

'); + &mt('You need to choose another user role or enter a specific course for this function').''); } } } @@ -701,7 +712,6 @@ ENDHEADER &queued_selfenrollment($r); my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); - $r->print( '

' .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]' @@ -710,7 +720,7 @@ ENDHEADER ,'' ,'',$domdesc) .'
' - .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,' + .&mt('If a course is [_1]not[_2] in your list of current courses below,' .' you may be able to enroll if self-enrollment is permitted.' ,'','') .'

' @@ -721,12 +731,11 @@ ENDHEADER # No active roles if ($countactive==0) { if ($inrole) { - $r->print('

'.&mt('Currently no additional roles, courses or communities').'

'); + $r->print('

'.&mt('Currently no additional roles or courses').'

'); } else { - $r->print('

'.&mt('Currently no active roles, courses or communities').'

'); + $r->print('

'.&mt('Currently no active roles or courses').'

'); } &findcourse_advice($r); - &requestcourse_advice($r); $r->print(''); if ($countfuture) { $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture)); @@ -1098,7 +1107,7 @@ sub roletable_headers { } sub roletypes { - my @types = ('Domain','Construction Space','Course','Community','Unavailable','System'); + my @types = ('Domain','Construction Space','Course','Unavailable','System'); return @types; } @@ -1160,66 +1169,12 @@ sub findcourse_advice { } else { $r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'
'); } - $r->print('

'.&mt('Self-Enrollment').'

'. - '

'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','','',$domdesc).'
'); - $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'

'); + $r->print('

'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','','',$domdesc).'
'); + $r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'

'); &queued_selfenrollment($r); return; } -sub requestcourse_advice { - my ($r) = @_; - my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description'); - my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); - my (%can_request,%request_doms); - &Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms); - if (keys(%request_doms) > 0) { - my ($types,$typename) = &Apache::loncommon::course_types(); - if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) { - $r->print('

'.&mt('Request creation of a course or community').'

'. - '

'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'

'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','','').'

'); - } - } - return; -} - sub queued_selfenrollment { my ($r) = @_; my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests'); @@ -1526,8 +1481,8 @@ sub courselink { sub coursepick_jscript { my %lt = &Apache::lonlocal::texthash( - plsu => "Please use the 'Select Course/Community' link to open a separate pick course window where you may select the course or community you wish to enter.", - youc => 'You can only use this screen to select courses and communities in the current domain.', + plsu => "Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.", + youc => 'You can only use this screen to select courses in the current domain.', ); my $verify_script = <<"END";