--- rat/lonpage.pm 2023/09/11 12:11:26 1.111.2.13.2.6 +++ rat/lonpage.pm 2022/06/29 17:51:10 1.140 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.111.2.13.2.6 2023/09/11 12:11:26 raeburn Exp $ +# $Id: lonpage.pm,v 1.140 2022/06/29 17:51:10 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -268,7 +268,6 @@ sub handler { my $nforms=0; my $nuploads=0; my $ntimers=0; - my $hasnumresp; my %turninpaths; my %multiresps; my $turninparent; @@ -384,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); @@ -422,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')) { @@ -516,11 +512,6 @@ ENDEXT $ntimers++; $hastimer = 1; } - unless ($hasnumresp) { - if ($output=~/\]+class\s*=\s*[\'\"]*([^\'\"\>]+|)LC_numresponse_text/) { - $hasnumresp = 1; - } - } $output=~ s/\<((?:input|select|button|textarea)[^\>]+)name\s*\=\s*[\'\"]*([^\'\"]+)[\'\"]*([^\>]*)\>/\<$1 name="$prefix$2" $3\>/gsi; $output=~ @@ -692,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()); @@ -751,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)) { @@ -962,11 +953,8 @@ ENDEXT &mt('Processing your submission ...').''); } unless (($target eq 'tex') || ($target eq 'tex_answer')) { - my $args = {'discussion' => 1}; - if ($hasnumresp) { - $args->{'dashjs'} = 1; - } - $r->print(&Apache::loncommon::end_page($args)); + $r->print(&Apache::loncommon::end_page({'discussion' + => 1,})); } else { $r->print('\end{document}'.$number_of_columns); } @@ -977,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)) { @@ -1022,18 +993,16 @@ sub get_buttons { my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid}, $resid, $hash->{'src_'.$rid}); - my ($aname,$shownsymb); + my $aname; if (($hash->{'encrypted_'.$rid}) && (!$env{'request.role.adv'})) { $aname = 'LC_'.$rid; - $shownsymb = &Apache::lonenc::encrypted($symb); } else { - $shownsymb = $symb; - my $dispsymb = $symb; + my $shownsymb = $symb; if ($symb =~ /\#([^\#]+)$/) { my $escan = &escape('#'); - $dispsymb =~ s/#([^\#]+)$/$escan$1/; + $shownsymb =~ s/#([^\#]+)$/$escan$1/; } - $aname = &escape($dispsymb); + $aname = &escape($shownsymb); } my $metainfo = ''; unless ($env{'request.role.adv'}) { @@ -1116,8 +1085,8 @@ sub get_buttons { &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,$hash->{'src_'.$rid},$symb); if ($cfile ne '') { my $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver, - $forceedit,1,$symb,$shownsymb, - undef,&escape($env{'form.title'}), + $forceedit,1,$symb,undef, + &escape($env{'form.title'}), $hostname); if ($jscall) { $editbutton = 1; @@ -1188,7 +1157,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') {