--- rat/lonpage.pm	2020/11/11 21:52:05	1.111.2.13
+++ rat/lonpage.pm	2024/07/02 18:53:26	1.111.2.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.111.2.13 2020/11/11 21:52:05 raeburn Exp $
+# $Id: lonpage.pm,v 1.111.2.15 2024/07/02 18:53:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -236,6 +236,7 @@ sub handler {
                   my $nforms=0;
                   my $nuploads=0;
                   my $ntimers=0;
+                  my $hasnumresp;
                   my %turninpaths;
                   my %multiresps;
                   my $turninparent;
@@ -473,6 +474,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=~
@@ -854,8 +860,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);
 		      }
@@ -894,16 +903,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'}) {
@@ -986,8 +997,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;