[BACK]Return to lonhelp.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhelp.pm between versions 1.34 and 1.39

version 1.34, 2006/12/01 21:47:25 version 1.39, 2008/07/08 01:08:57
Line 58  sub processLabelName { Line 58  sub processLabelName {
 # Serve out the text  # Serve out the text
 sub servetext {  sub servetext {
     my ($r,$text) = @_;      my ($r,$text) = @_;
     my $bugs=&Apache::loncommon::help_open_bug('Documentation','Report a documentation bug');      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 $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,});  
     my $end_page=  
  &Apache::loncommon::end_page();  
     my $header=&mt('LON-CAPA Help');      my $header=&mt('LON-CAPA Help');
     $r->print(<<HEADER);      $r->print(<<HEADER);
     $start_page  
     <h3 style="font: sans-serif"><img align="right" alt="help logo"      <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"/>$header</h3><hr />
     <!-- BEGIN -->      <!-- BEGIN -->
Line 81  HEADER Line 75  HEADER
  my $uri = $r->uri;   my $uri = $r->uri;
  $r->print(<<FOOTER);   $r->print(<<FOOTER);
     <hr /><form action="$uri" method="post">      <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>  </form>
 <br />  <br />
 $bugs  $bugs
Line 92  FOOTER Line 86  FOOTER
   
     $r->print(<<ENDBODY);      $r->print(<<ENDBODY);
     <!-- END -->      <!-- END -->
     $end_page  
 ENDBODY  ENDBODY
   
 }  }
Line 100  ENDBODY Line 93  ENDBODY
 # Render takes a tex fragment, transforms it for TtH, and returns the  # Render takes a tex fragment, transforms it for TtH, and returns the
 # HTML equivalent  # HTML equivalent
 sub render {  sub render {
     my ($tex, $docroot, $serverroot) = @_;      my ($tex, $docroot) = @_;
     tie (my %fragmentLabels, 'GDBM_File', $docroot . '/adm/help/fragmentLabels.gdbm', 0, 0);      tie (my %fragmentLabels, 'GDBM_File', $docroot . '/adm/help/fragmentLabels.gdbm', 0, 0);
   
     # This tells TtH what to do with captions, labels, and other      # This tells TtH what to do with captions, labels, and other
Line 126  sub render { Line 119  sub render {
              '\\begin{html}<a href="/adm/help/'.               '\\begin{html}<a href="/adm/help/'.
               $label .                $label .
               '.hlp#' . &processLabelName($1) .                 '.hlp#' . &processLabelName($1) . 
              '"><img src="/adm/help/gif/smallHelp.gif" border="0" /></a>' .               '"><img src="/adm/help/help.png" border="0" /></a>' .
              '\\end{html}'               '\\end{html}'
              |gxe;               |gxe;
   
Line 197  sub handler { Line 190  sub handler {
      my $r = shift;       my $r = shift;
   
      my $docroot = $r->dir_config('lonDocRoot');       my $docroot = $r->dir_config('lonDocRoot');
      my $serverroot = $ENV{'HTTP_HOST'};  
   
      &Apache::lonlocal::get_language_handle($r);       &Apache::lonlocal::get_language_handle($r);
      &Apache::loncommon::content_type($r,"text/html");       &Apache::loncommon::content_type($r,"text/html");
        my $start_page=
    &Apache::loncommon::start_page('LON-CAPA Help',undef,
    {'only_body' => 1,});
      my $text='';       my $text='';
      if ($env{'form.searchterm'}=~/\w/) {       if ($env{'form.searchterm'}=~/\w/) {
  ($text,my $matches)=&listmatches($docroot,$env{'form.searchterm'},&Apache::lonlocal::current_language().'/');   ($text,my $matches)=&listmatches($docroot,$env{'form.searchterm'},&Apache::lonlocal::current_language().'/');
Line 243  sub handler { Line 238  sub handler {
      $tex .= join('', <$file>);       $tex .= join('', <$file>);
  }   }
   
  $text = &render($tex, $docroot, $serverroot);   $text = &render($tex, $docroot);
      }       }
   
      $r->send_http_header;       $r->send_http_header;
        $r->print($start_page);
      &servetext($r,$text);       &servetext($r,$text);
        $r->print(&Apache::loncommon::end_page());
   
      return OK;       return OK;
 }  }
   
Removed from v.1.34  
changed lines
  Added in v.1.39

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>