--- rat/lonsequence.pm 2018/04/14 17:52:53 1.50 +++ rat/lonsequence.pm 2019/01/16 20:23:42 1.51 @@ -2,7 +2,7 @@ # # Sequence Handler # -# $Id: lonsequence.pm,v 1.50 2018/04/14 17:52:53 raeburn Exp $ +# $Id: lonsequence.pm,v 1.51 2019/01/16 20:23:42 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -246,6 +246,15 @@ sub handler { } } + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + + my $mapurl = &Apache::lonnet::declutter($requrl); + my $maptitle = &Apache::lonnet::gettitle($mapurl); + my @crumbs = ({text => $maptitle, no_mt => 1}); + my $args = {'bread_crumbs' => \@crumbs, + 'bread_crumbs_nomenu' => 1}; + # Create the nav map my $navmap = Apache::lonnavmaps::navmap->new(); @@ -258,8 +267,7 @@ sub handler { my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; ($ltiscope,$ltiuri) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},$cdom,$cnum); } - my $mapurl = &Apache::lonnet::declutter($requrl); - my @crumbs; + @crumbs = (); unless ($ltiscope eq 'resource') { unless ($ltiscope eq 'map') { @crumbs = ({text => $crstype.' Contents', @@ -281,13 +289,9 @@ sub handler { } } } - my $maptitle = &Apache::lonnet::gettitle($mapurl); push(@crumbs,{text => $maptitle, no_mt => 1}); - my $args = {'bread_crumbs' => \@crumbs, - 'bread_crumbs_nomenu' => 1}; - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - + $args = {'bread_crumbs' => \@crumbs, + 'bread_crumbs_nomenu' => 1}; $r->print(&Apache::loncommon::start_page($maptitle,undef,$args)); my $renderArgs = { 'cols' => [0,1,2,3], @@ -307,14 +311,27 @@ sub handler { # If no resources were found let the user know. if ($renderArgs->{'counter'} == 0) { - $r->print("

". - &mt("This folder is empty.")."

"); + $r->print('

'. + &mt('No items found in folder'). + '

'); } $r->print(&Apache::loncommon::end_page()); - $r->rflush(); - return OK; + } else { + $r->print(&Apache::loncommon::start_page($maptitle,undef,$args). + '

'. + &mt('Folder no longer appears to be a part of the course'). + '

'. + &Apache::loncommon::end_page()); } + } else { + $r->print(&Apache::loncommon::start_page($maptitle,undef,$args). + '

'. + &mt('Error: could not determine contents of folder'). + '

'. + &Apache::loncommon::end_page()); } + $r->rflush(); + return OK; } }