--- loncom/interface/lonhelp.pm	2006/07/14 16:46:36	1.30
+++ loncom/interface/lonhelp.pm	2007/04/17 15:45:03	1.35
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonhelp.pm,v 1.30 2006/07/14 16:46:36 www Exp $
+# $Id: lonhelp.pm,v 1.35 2007/04/17 15:45:03 www Exp $
 #
 # .tex help system web server handler
 #
@@ -59,6 +59,7 @@ sub processLabelName {
 sub servetext {
     my ($r,$text) = @_;
     my $bugs=&Apache::loncommon::help_open_bug('Documentation','Report a documentation bug');
+    my $morehelp;#=&Apache::loncommon::help_open_menu(undef,undef,1,undef,undef,undef,undef,'Help and Assistance Menu');
     my $start_page=
 	&Apache::loncommon::start_page('LON-CAPA Help',undef,
 				       {'only_body' => 1,});
@@ -76,16 +77,15 @@ 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
  
     }
@@ -123,10 +123,10 @@ sub render {
 	      } else {
 		  $label=~s/\.hlp$//;
 	      }
-             '\\begin{html}<a href="http://' . $serverroot ."/adm/help/".
+             '\\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;
 
@@ -135,7 +135,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;
 
@@ -152,7 +152,7 @@ sub render {
     # just duck the issue...
 
     $tex =~ s/Figure 0://g;
-	     $tex.=$Apache::lontexconvert::errorstring;
+    $tex.=$Apache::lontexconvert::errorstring;
     untie %fragmentLabels;
 
     return $tex;
@@ -213,8 +213,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