--- rat/lonpage.pm 2023/01/19 17:23:33 1.111.2.13.2.5 +++ rat/lonpage.pm 2022/09/13 12:22:15 1.141 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.111.2.13.2.5 2023/01/19 17:23:33 raeburn Exp $ +# $Id: lonpage.pm,v 1.141 2022/09/13 12:22:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -383,7 +383,7 @@ ENDEXT } elsif ($cellemb{$_} eq 'ssi') { # --------------------------------------------------------- This is an SSI cell my $prefix='p_'.$_.'_'; - my $idprefix='p_'.join('_',($mapid,$resid,'')); + my $idprefix= 'p_'.join('_',($mapid,$resid,'')); my %posthash=('request.prefix' => $prefix, 'LONCAPA_INTERNAL_no_discussion' => 'true', 'symb' => $symb); @@ -421,9 +421,6 @@ ENDEXT } elsif ($env{'form.'.$prefix.'markaccess'} eq 'yes') { $posthash{'markaccess'} = $env{'form.'.$prefix.'markaccess'}; } - if ($env{'environment.remote'} eq 'on') { - $posthash{'inhibitmenu'} = 'yes'; - } my $output=Apache::lonnet::ssi($src,%posthash); $output=~s|//(\s*)?\s||gs; if (($target eq 'tex') || ($target eq 'tex_answer')) { @@ -686,13 +683,13 @@ ENDEXT # ---------------------------------------------------------------- End SSI cell } } - } + } } unless ($contents) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; $r->print(&Apache::loncommon::start_page(undef,undef, - {'force_register' => 1})); + {'force_register' => 1,})); $r->print(&mt('This page is either empty or it only contains resources that are currently hidden').'. '); $r->print('

'.&mt('Please use the LON-CAPA navigation arrows to move to another item in the course'). &Apache::loncommon::end_page()); @@ -745,7 +742,7 @@ ENDEXT $uniquetimes{$item} = 1; } } - if (scalar(keys(%uniquetimes)) == 1) { + if (scalar(keys(%uniquetimes)) == 1) { my (%uniquedisplays,%uniquedones,$currdisp,$donebuttontime, $donebuttonextras); if (keys(%countdowndisp)) { @@ -968,26 +965,9 @@ ENDEXT } # ------------------------------------------------------------- End render page } else { - if ($hash{'map_type_'.$hash{'map_pc_'.$requrl}} eq 'none') { - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - $r->print(&Apache::loncommon::start_page(undef,undef, - {'force_register' => 1,})); - my $crstype = &Apache::loncommon::course_type(); - if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { - $r->print(''.&mt('Missing composite page file.').'
'. - &mt("You may want to use the $crstype Editor to remove this item.")); - } else { - $r->print(''. - &mt('This resource was unavailable when your '.lc($crstype).' session was loaded').'
'. - &mt("Please use 'Contents' to list items available in the $crstype.").'
'); - } - $r->print(&Apache::loncommon::end_page()); - } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - &Apache::lonsequence::viewmap($r,$requrl); - } + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + &Apache::lonsequence::viewmap($r,$requrl); } # ------------------------------------------------------------------ Untie hash unless (untie(%hash)) { @@ -1179,7 +1159,7 @@ sub add_countdown_timer { $donebuttontext = &mt('Done'); $type = 'map'; } - $donebutton = + $donebutton = &Apache::lonmenu::done_button_js($type,'','',$proctor,$donebuttontext); } unless ($env{'environment.icons'} eq 'iconsonly') {