--- loncom/interface/lonhelp.pm	2013/12/18 01:23:21	1.42
+++ loncom/interface/lonhelp.pm	2025/02/21 21:28:48	1.50
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonhelp.pm,v 1.42 2013/12/18 01:23:21 raeburn Exp $
+# $Id: lonhelp.pm,v 1.50 2025/02/21 21:28:48 raeburn Exp $
 #
 # .tex help system web server handler
 #
@@ -71,9 +71,20 @@ sub servetext {
                                            search  => 'Search LON-CAPA help',
                                            query   => 'Search',
                                         );
+    my $goback;
+    if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
+        (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
+        my $backicon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL').'/').'clickhere.gif';
+        $goback = '<a href="javascript:history.go(-1);" class="LC_menubuttons_link" title="Go Back">'.
+                  '<img src="'.$backicon.'" alt="'.&mt('Go Back').'" class="LC_icon" border="0" />'.
+                  '</a>&nbsp;';
+    }
     $r->print(<<HEADER);
-    <h3 style="font: sans-serif"><img align="right" alt="help logo"
-    src="/adm/help/gif/lonhelpheader.gif" />$lt{'header'}</h3><hr />
+    <div class="LC_landmark" role="complementary">
+    <h1 style="font-family: Verdana,Arial,Helvetica,sans-serif; font-size: 1.17em;">
+    <img align="right" alt="help logo" src="/adm/help/gif/lonhelpheader.gif" />
+    $goback$lt{'header'}</h1><hr /></div>
+    <div class="LC_landmark" role="main">
     <!-- BEGIN -->
 HEADER
     if ($is_mobile) {
@@ -96,13 +107,13 @@ HEADER
         $r->print(<<FOOTER);
     <hr /><div class="LC_left_float">
     <form action="$uri" method="post">
-    <fieldset><legend>$lt{'search'}</legend>
-    <input type="text" name="searchterm" size="40" />
+    <fieldset><legend><label for="searchterm">$lt{'search'}</label></legend>
+    <input type="text" name="searchterm" id="searchterm" size="40" />
     <input type="submit" value="$lt{'query'}" />
     </fieldset>
     </form>
     </div>
-    <div class=""LC_left_float">
+    <div class="LC_left_float">
     </div>
     <div style="padding:0;clear:both;margin:0;border:0"></div>
 $bugs
@@ -110,6 +121,7 @@ FOOTER
     }
 
     $r->print(<<ENDBODY);
+    </div>
     <!-- END -->
 ENDBODY
 
@@ -150,7 +162,7 @@ sub render {
              '\\begin{html}<a href="/adm/help/'.
               $label .
               $ext . 
-             '"><img src="'.$icon.'" border="0" /></a>' .
+             '"><img src="'.$icon.'" border="0" alt="'.&mt('Help').'" /></a>' .
              '\\end{html}'
              |gxe;
 
@@ -172,6 +184,8 @@ sub render {
     # Fix the pretty quotes
     $tex =~ s/('')|(``)/&quot;/g; #" to get emacs syntax highlighter happy
 
+    $tex =~ s/`/'/g;
+
     # For some reason all captions come out as "Figure 0:", so
     # just duck the issue...
 
@@ -228,16 +242,26 @@ sub handler {
      if ($env{'form.searchterm'}=~/\w/) {
         $caller = 'search';
      }
-     my $starthash = {
-           only_body   => 1,
-           add_entries => {
-                            'onload' => "javascript:expand_div('$caller');",
-                          },
-     };
 
+     my $starthash;
+
+     if ($env{'browser.mobile'}) {
+         $starthash = {
+                        only_body   => 1,
+                        add_entries => {
+                                         'onload' => "javascript:expand_div('$caller');",
+                                       },
+                      };
+     } else {
+         $starthash = {
+                        only_body   => 1,
+                      };
+     }
      my $firstfile;
+     $env{'form.texengine'} = 'tth';
      my $start_page=
 	 &Apache::loncommon::start_page('LON-CAPA Help',undef,$starthash);
+     delete($env{'form.texengine'});
      my $text='';
      my $uri = $r->uri;
      if ($env{'form.searchterm'}=~/\w/) {
@@ -268,6 +292,7 @@ sub handler {
 	 $filenames =~ s/:/,/g;
 	 my @files = split(/,/, $filenames);
          $firstfile = '/adm/help/'.$files[0].'.hlp';
+         my $count = 0;
 
 	 for my $filename (@files) {
 	     if (-e $docroot.'/adm/help/tex/'.
@@ -279,6 +304,10 @@ sub handler {
 					   . '/adm/help/tex/'.$filename.'.tex'))
 	         or return HTTP_NOT_FOUND;
 	     $tex .= join('', <$file>);
+             $count ++;
+             if (scalar(@files) > $count) {
+                 $tex .= '\hrulefill';
+             }
 	 }
 
 	 $text = &render($tex, $docroot);