--- loncom/interface/lonhelp.pm	2006/06/26 22:22:00	1.28
+++ loncom/interface/lonhelp.pm	2008/02/26 09:28:07	1.37
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonhelp.pm,v 1.28 2006/06/26 22:22:00 albertel Exp $
+# $Id: lonhelp.pm,v 1.37 2008/02/26 09:28:07 bisitz Exp $
 #
 # .tex help system web server handler
 #
@@ -58,17 +58,12 @@ sub processLabelName {
 # Serve out the text
 sub servetext {
     my ($r,$text) = @_;
-    my $bugs=&Apache::loncommon::help_open_bug('Documentation');
-    my $start_page=
-	&Apache::loncommon::start_page('LON-CAPA Help',undef,
-				       {'only_body' => 1,});
-    my $end_page=
-	&Apache::loncommon::end_page();
+    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');
     $r->print(<<HEADER);
-    $start_page
     <h3 style="font: sans-serif"><img align="right" alt="help logo"
-    src="/adm/help/gif/lonhelpheader.gif"/>$header</h3><hr />$bugs
+    src="/adm/help/gif/lonhelpheader.gif"/>$header</h3><hr />
     <!-- BEGIN -->
 HEADER
 
@@ -76,22 +71,21 @@ HEADER
 
     if (&Apache::lonnavmaps::advancedUser()) {
 	my $search=&mt('Search LON-CAPA help');
-	my $about=&mt('About LON-CAPA help and More Help');
         my $query=&mt('Search');
 	my $uri = $r->uri;
 	$r->print(<<FOOTER);
     <hr /><form action="$uri" method="post">
-$search: <input type="text" name="searchterm" size="40" /><input type="submit" value="$query" />
+<label>$search: <input type="text" name="searchterm" size="40" /></label><input type="submit" value="$query" />
 </form>
 <br />
-<a href="/adm/help/abouthelp.html">$about</a>
+$bugs
+$morehelp
 FOOTER
  
     }
 
     $r->print(<<ENDBODY);
     <!-- END -->
-    $end_page
 ENDBODY
 
 }
@@ -99,7 +93,7 @@ ENDBODY
 # Render takes a tex fragment, transforms it for TtH, and returns the
 # HTML equivalent
 sub render {
-    my ($tex, $docroot, $serverroot) = @_;
+    my ($tex, $docroot) = @_;
     tie (my %fragmentLabels, 'GDBM_File', $docroot . '/adm/help/fragmentLabels.gdbm', 0, 0);
 
     # This tells TtH what to do with captions, labels, and other
@@ -111,13 +105,21 @@ sub render {
     # absolute paths for use with help.loncapa.org
     $tex =~ s|  \\ref\{([^}]*)\}
              |
-              if (not(exists($fragmentLabels{$1}))) {
-	          &Apache::lonnet::logthis("ERROR: $1 not a valid help label");
-              };
-             '\\begin{html}<a href="http://' . $serverroot ."/adm/help/".
-              substr($fragmentLabels{$1}, 0, -4) .
+              my $label=$1;
+              if ($1!~/\.hlp$/) {
+                  if ((!exists($fragmentLabels{$1})) && ($1!~/\.hlp$/)) {
+	             &Apache::lonnet::logthis("ERROR: $1 not a valid help label");
+                     $label='Error';
+                  } else {
+                     $label=substr($fragmentLabels{$1}, 0, -4);
+		  }
+	      } else {
+		  $label=~s/\.hlp$//;
+	      }
+             '\\begin{html}<a href="/adm/help/'.
+              $label .
               '.hlp#' . &processLabelName($1) . 
-             '"><img src="http://' . $serverroot . '/adm/help/gif/smallHelp.gif" border="0" /></a>' .
+             '"><img src="/adm/help/gif/smallHelp.gif" border="0" /></a>' .
              '\\end{html}'
              |gxe;
 
@@ -126,7 +128,7 @@ sub render {
 
     # Figures leftover without captions
     $tex =~ s|  \\includegraphics(\[[^]]*\])*\{([^}]*)\}
-             |  '\\begin{html}<img src="http://' . $serverroot . '/adm/help/gif/' . $2 . '.gif" border="2"'.
+             |  '\\begin{html}<img src="/adm/help/gif/' . $2 . '.gif" border="2"'.
                 ' bordercolor="#000000"/>\\end{html}'
              |gxe;
 
@@ -143,7 +145,7 @@ sub render {
     # just duck the issue...
 
     $tex =~ s/Figure 0://g;
-	     $tex.=$Apache::lontexconvert::errorstring;
+    $tex.=$Apache::lontexconvert::errorstring;
     untie %fragmentLabels;
 
     return $tex;
@@ -164,9 +166,9 @@ sub listmatches {
 		    $line=~s/\{//gs;
 		    $line=~s/\}//gs;
 		    $line=~s/\\/ /gs;
-		    $line=~s/(\Q$term\E)/\<b\>$1\<\/b\>/gsi;
                     $line=~s/\</\&lt\;/gs;
                     $line=~s/\>/\&gt\;/gs;
+		    $line=~s/(\Q$term\E)/\<b\>$1\<\/b\>/gsi;
 		    $quote.='<br />...'.$line.'...';
 		}
 	    }
@@ -188,10 +190,12 @@ sub handler {
      my $r = shift;
 
      my $docroot = $r->dir_config('lonDocRoot');
-     my $serverroot = $ENV{'HTTP_HOST'};
 
      &Apache::lonlocal::get_language_handle($r);
      &Apache::loncommon::content_type($r,"text/html");
+     my $start_page=
+	 &Apache::loncommon::start_page('LON-CAPA Help',undef,
+					{'only_body' => 1,});
      my $text='';
      if ($env{'form.searchterm'}=~/\w/) {
 	 ($text,my $matches)=&listmatches($docroot,$env{'form.searchterm'},&Apache::lonlocal::current_language().'/');
@@ -204,8 +208,8 @@ 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($ENV{'REQUEST_URI'} , 
+					  rindex($ENV{'REQUEST_URI'}, '/') + 1, -4));
 	 
 	 # Security check on the file; the whole filename must consist
 	 # of nothing but alphanums, ' ,, or ., or the file
@@ -234,11 +238,14 @@ sub handler {
 	     $tex .= join('', <$file>);
 	 }
 
-	 $text = &render($tex, $docroot, $serverroot);
+	 $text = &render($tex, $docroot);
      }
 
      $r->send_http_header;
+     $r->print($start_page);
      &servetext($r,$text);
+     $r->print(&Apache::loncommon::end_page());
+
      return OK;
 }