Diff for /loncom/interface/lonhelpmenu.pm between versions 1.33 and 1.39

version 1.33, 2007/09/05 05:03:41 version 1.39, 2009/11/10 19:13:00
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # generate frame-based help system  # generate frame-based help system
 #  #
   # $Id$
   #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
 #  #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).  # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
Line 72  sub handler { Line 74  sub handler {
 sub display_help_banner {  sub display_help_banner {
     my ($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_;      my ($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_;
     my $location=&Apache::loncommon::lonhttpdurl("/adm");      my $location=&Apache::loncommon::lonhttpdurl("/adm");
       my $dom = $env{'request.role.domain'};
       my %helpconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$dom);
     my $scripttag = '';      my $scripttag = '';
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {      if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         my $displayurl = &escape($origurl);          my $displayurl = &escape($origurl);
Line 153  SCRIPT_TWO Line 157  SCRIPT_TWO
  <table id="LC_helpmenu_links">   <table id="LC_helpmenu_links">
    <tr>     <tr>
  <td><span class="LC_nobreak"><a href="/adm/help/$general_help.hlp" target="bodyframe">   <td><span class="LC_nobreak"><a href="/adm/help/$general_help.hlp" target="bodyframe">
   <img src="$location/help/gif/smallHelp.gif" border="0" alt="(General help)" valign="middle" />&nbsp;General Help</a>&nbsp;</span></td>    <img src="$location/help/help.png" border="0" alt="(General help)" valign="middle" />&nbsp;General Help</a>&nbsp;</span></td>
 END  END
     if ($component_url) {      if ($component_url) {
  $r->print("<td><span class=\"LC_nobreak\"><a href=\"$component_url\" target=\"bodyframe\">".   $r->print("<td><span class=\"LC_nobreak\"><a href=\"$component_url\" target=\"bodyframe\">".
   '<img src="'.$location.'/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;'.$topic.'</a>&nbsp;</span></td>');    '<img src="'.$location.'/help/help.png" border="0" alt="(Topic help)" valign="middle" />&nbsp;'.$topic.'</a>&nbsp;</span></td>');
     }      }
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {      if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print('          $r->print('
Line 170  END Line 174  END
 END  END
     }      }
     if ($env{'user.adv'}) {      if ($env{'user.adv'}) {
         $r->print(<<END);      if ($helpconfig{'helpsettings'}{'submitbugs'} eq '1' ||
             <td><span class="LC_nobreak"&nbsp;<b><a href="$bugurl" target="bodyframe"><img src="$location/lonMisc/smallBug.gif" border="0" alt="(Report a bug)" valign="middle" />&nbsp;Report a bug</a>&nbsp;</b></span></td>      $helpconfig{'helpsettings'}{'submitbugs'} eq '' ) {
           $r->print(<<END);
               <td><span class="LC_nobreak"&nbsp;<b><a href="$bugurl" target="bodyframe"><img src="$location/lonMisc/smallBug.gif" border="0" alt="(Report a bug)" valign="middle" />&nbsp;Report a bug</a>&nbsp;</b></span></td>
 END  END
    }
     }      }
     if ($stayOnPage) {      if ($stayOnPage) {
         $r->print(<<END);          $r->print(<<END);

Removed from v.1.33  
changed lines
  Added in v.1.39


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