--- loncom/interface/lonhelp.pm	2013/07/15 17:42:11	1.41
+++ loncom/interface/lonhelp.pm	2022/05/29 20:48:57	1.48
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonhelp.pm,v 1.41 2013/07/15 17:42:11 raeburn Exp $
+# $Id: lonhelp.pm,v 1.48 2022/05/29 20:48:57 raeburn Exp $
 #
 # .tex help system web server handler
 #
@@ -57,13 +57,31 @@ sub processLabelName {
 
 # Serve out the text
 sub servetext {
-    my ($r,$text,$is_mobile,$firstfile) = @_;
-    my $bugs=&Apache::loncommon::help_open_bug('Documentation',&mt('Report a documentation bug'));
-    my $morehelp;#=&Apache::loncommon::help_open_menu(undef,undef,1,undef,undef,undef,undef,'Help and Assistance Menu');
-    my $header=&mt('LON-CAPA Help');
+    my ($r,$uri,$text,$is_mobile,$firstfile) = @_;
+    my $bugs;
+    my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],
+                                              $env{'request.role.domain'});
+    if (ref($helpconfig{'helpsettings'}) eq 'HASH') {
+        if ($helpconfig{'helpsettings'}{'submitbugs'} eq '1') {
+            $bugs = &Apache::loncommon::help_open_bug('Documentation',&mt('Report a documentation bug'));
+        }
+    }
+    my %lt = &Apache::lonlocal::texthash(
+                                           header  => 'LON-CAPA Help',
+                                           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"/>$header</h3><hr />
+    src="/adm/help/gif/lonhelpheader.gif" />$goback$lt{'header'}</h3><hr />
     <!-- BEGIN -->
 HEADER
     if ($is_mobile) {
@@ -83,18 +101,20 @@ HEADER
     }
 
     if (&Apache::lonnavmaps::advancedUser()) {
-	my $search=&mt('Search LON-CAPA help');
-        my $query=&mt('Search');
-	my $uri = $r->uri;
-	$r->print(<<FOOTER);
-    <hr /><form action="$uri" method="post">
-<label>$search: <input type="text" name="searchterm" size="40" /></label><input type="submit" value="$query" />
-</form>
-<br />
+        $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" />
+    <input type="submit" value="$lt{'query'}" />
+    </fieldset>
+    </form>
+    </div>
+    <div class="LC_left_float">
+    </div>
+    <div style="padding:0;clear:both;margin:0;border:0"></div>
 $bugs
-$morehelp
 FOOTER
- 
     }
 
     $r->print(<<ENDBODY);
@@ -138,7 +158,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;
 
@@ -160,6 +180,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...
 
@@ -216,17 +238,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;
      my $start_page=
 	 &Apache::loncommon::start_page('LON-CAPA Help',undef,$starthash);
      my $text='';
+     my $uri = $r->uri;
      if ($env{'form.searchterm'}=~/\w/) {
 	 ($text,my $matches)=&listmatches($docroot,$env{'form.searchterm'},&Apache::lonlocal::current_language().'/');
          if ($matches) {
@@ -238,8 +269,7 @@ sub handler {
              $text=&listmatches($docroot,$env{'form.searchterm'}); 
          }
      } else {
-	 my $filenames = &unescape(substr($ENV{'REQUEST_URI'} , 
-					  rindex($ENV{'REQUEST_URI'}, '/') + 1, -4));
+         my $filenames = &unescape(substr($uri,rindex($uri,'/')+1,-4));
 	 
 	 # Security check on the file; the whole filename must consist
 	 # of nothing but alphanums, ' ,, or ., or the file
@@ -256,6 +286,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/'.
@@ -267,6 +298,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);
@@ -274,7 +309,7 @@ sub handler {
 
      $r->send_http_header;
      $r->print($start_page);
-     &servetext($r,$text,$env{'browser.mobile'},$firstfile);
+     &servetext($r,$uri,$text,$env{'browser.mobile'},$firstfile);
      $r->print(&Apache::loncommon::end_page());
 
      return OK;