--- rat/lonpage.pm 2022/09/13 12:22:15 1.141
+++ rat/lonpage.pm 2023/09/10 18:12:55 1.143
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.141 2022/09/13 12:22:15 raeburn Exp $
+# $Id: lonpage.pm,v 1.143 2023/09/10 18:12:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -268,6 +268,7 @@ sub handler {
my $nforms=0;
my $nuploads=0;
my $ntimers=0;
+ my $hasnumresp;
my %turninpaths;
my %multiresps;
my $turninparent;
@@ -512,6 +513,11 @@ 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=~
@@ -683,7 +689,7 @@ ENDEXT
# ---------------------------------------------------------------- End SSI cell
}
}
- }
+ }
}
unless ($contents) {
&Apache::loncommon::content_type($r,'text/html');
@@ -953,8 +959,11 @@ ENDEXT
&mt('Processing your submission ...').'');
}
unless (($target eq 'tex') || ($target eq 'tex_answer')) {
- $r->print(&Apache::loncommon::end_page({'discussion'
- => 1,}));
+ my $args = {'discussion' => 1};
+ if ($hasnumresp) {
+ $args->{'dashjs'} = 1;
+ }
+ $r->print(&Apache::loncommon::end_page($args));
} else {
$r->print('\end{document}'.$number_of_columns);
}
@@ -965,9 +974,30 @@ ENDEXT
}
# ------------------------------------------------------------- End render page
} else {
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- &Apache::lonsequence::viewmap($r,$requrl);
+ 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 {
+ if ($crstype eq 'Placement') {
+ $r->print(''.&mt('Missing page').'');
+ } 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);
+ }
}
# ------------------------------------------------------------------ Untie hash
unless (untie(%hash)) {