--- rat/lonpage.pm	2022/06/29 17:51:10	1.140
+++ rat/lonpage.pm	2023/09/11 13:26:26	1.144
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.140 2022/06/29 17:51:10 raeburn Exp $
+# $Id: lonpage.pm,v 1.144 2023/09/11 13:26:26 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=~/\<input[^\>]+class\s*=\s*['"]*[^'">]*LC_numresponse_text\W/) {
+                                          $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 ...').'</div></form>');
                       }
 		      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('<span class="LC_warning">'.&mt('Missing composite page file.').'</span><br />'.
+                                    &mt("You may want to use the $crstype Editor to remove this item."));
+                      } else {
+                          if ($crstype eq 'Placement') {
+                              $r->print('<span class="LC_warning">'.&mt('Missing page').'</span>');
+                          } else {
+                              $r->print('<span class="LC_info">'.
+                                        &mt('This resource was unavailable when your '.lc($crstype).' session was loaded').'<br />'.
+                                        &mt("Please use 'Contents' to list items available in the $crstype.").'</span>');
+                          }
+                      }
+                      $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)) {
@@ -993,16 +1023,18 @@ sub get_buttons {
     my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid},
 					  $resid,
 					  $hash->{'src_'.$rid});
-    my $aname;
+    my ($aname,$shownsymb);
     if (($hash->{'encrypted_'.$rid}) && (!$env{'request.role.adv'})) {
         $aname = 'LC_'.$rid;
+        $shownsymb = &Apache::lonenc::encrypted($symb);
     } else {
-        my $shownsymb = $symb;
+        $shownsymb = $symb;
+        my $dispsymb = $symb;
         if ($symb =~ /\#([^\#]+)$/) {
             my $escan = &escape('#');
-            $shownsymb =~ s/#([^\#]+)$/$escan$1/;
+            $dispsymb =~ s/#([^\#]+)$/$escan$1/;
         }
-        $aname = &escape($shownsymb);
+        $aname = &escape($dispsymb);
     }
     my $metainfo = '<a name="'.$aname.'"></a>';
     unless ($env{'request.role.adv'}) {
@@ -1085,8 +1117,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,undef,
-                                                                     &escape($env{'form.title'}),
+                                                                     $forceedit,1,$symb,$shownsymb,
+                                                                     undef,&escape($env{'form.title'}),
                                                                      $hostname);
                 if ($jscall) {
                     $editbutton = 1;