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

Diff for /loncom/interface/lonhelpmenu.pm between versions 1.41 and 1.42

version 1.41, 2013/07/19 17:11:09 version 1.42, 2013/08/08 14:31:54
Line 57  sub handler { Line 57  sub handler {
         $component_url = '/adm/help/'.$component_url.'.hlp';          $component_url = '/adm/help/'.$component_url.'.hlp';
     }      }
     my $bugurl = $Apache::lonnet::perlvar{'BugzillaHost'};      my $bugurl = $Apache::lonnet::perlvar{'BugzillaHost'};
     $bugurl .= 'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.$origurl;      $bugurl .= 'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.$origurl;
     if ($bug) {      if ($bug) {
         $bugurl .= '&component='.$bug;          $bugurl .= '&component='.$bug;
     }      }
     my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'};      my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'};
     my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};      my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
Line 81  sub display_help_banner { Line 81  sub display_help_banner {
         my $displayurl = &escape($origurl);          my $displayurl = &escape($origurl);
         $scripttag = (<<"SCRIPT_ONE");          $scripttag = (<<"SCRIPT_ONE");
 <script>  <script>
   // <![CDATA[
 function gohelpdesk() {  function gohelpdesk() {
     var actiontype = null;      var actiontype = null;
     try {      try {
Line 129  function validmail(field) { Line 130  function validmail(field) {
         return false;          return false;
     }      }
 }  }
   // ]]>
 </script>  </script>
 SCRIPT_TWO  SCRIPT_TWO
     }      }
Line 140  SCRIPT_TWO Line 142  SCRIPT_TWO
  'topmargin'    => "1",   'topmargin'    => "1",
  'marginheight' => "1");   'marginheight' => "1");
     my $start_page =       my $start_page = 
  &Apache::loncommon::start_page('',$scripttag,   &Apache::loncommon::start_page('Help',$scripttag,
        {'add_entries' => \%body_layout,   {'only_body'   => 1,});
  'only_body'   => 1,});  
     $r->print($start_page);      $r->print($start_page);
   
     my $width = ($stayOnPage) ? '95%' : '600';      my $width = ($stayOnPage) ? '95%' : '600';
Line 150  SCRIPT_TWO Line 151  SCRIPT_TWO
   
     my $general_help = &Apache::loncommon::general_help();      my $general_help = &Apache::loncommon::general_help();
     $r->print('      $r->print('
   <tr height="50">    <tr>
    <td width="5">&nbsp;</td>     <td width="5" height="50">&nbsp;</td>
    <td>     <td>
     <fieldset><legend><img src="'.$location.'/lonIcons/minilogo.gif" height="20" width="29" valign="bottom" alt="('.&mt('LON-CAPA help/support').')" />&nbsp;&nbsp;'.&mt('LON-CAPA help/support').'</legend>      <fieldset><legend><img src="'.$location.'/lonIcons/minilogo.gif" height="20" width="29" alt="('.&mt('LON-CAPA help/support').')" />&nbsp;&nbsp;'.&mt('LON-CAPA help/support').'</legend>
  <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/help.png" border="0" alt="('.&mt('General help').')" valign="middle" />&nbsp;'.&mt('General Help').'</a>&nbsp;</span></td>');    <img src="'.$location.'/help/help.png" border="0" alt="('.&mt('General help').')" />&nbsp;'.&mt('General Help').'</a>&nbsp;</span></td>');
     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/help.png" border="0" alt="('.&mt('Topic help').')" valign="middle" />&nbsp;'.$topic.'</a>&nbsp;</span></td>');    '<img src="'.$location.'/help/help.png" border="0" alt="('.&mt('Topic help').')" />&nbsp;'.$topic.'</a>&nbsp;</span></td>');
     }      }
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {      if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print('          $r->print('
             <td><span class="LC_nobreak">&nbsp;<a href="javascript:gohelpdesk()"><img src="'.$location.'/lonIcons/helpdesk.gif" border="0" alt="('.&mt('Ask helpdesk').')" valign="middle" />&nbsp;'.&mt('Ask helpdesk').'</a>&nbsp;</span></td>');              <td><span class="LC_nobreak">&nbsp;<a href="javascript:gohelpdesk()"><img src="'.$location.'/lonIcons/helpdesk.gif" border="0" alt="('.&mt('Ask helpdesk').')" />&nbsp;'.&mt('Ask helpdesk').'</a>&nbsp;</span></td>');
     }      }
     if ($faq && $env{'user.adv'}) {      if ($faq && $env{'user.adv'}) {
         $r->print('          $r->print('
              <td><span class="LC_nobreak">&nbsp;<a href="'.$faqbaseurl.'/fom/cache/'.$faq.'.html" target="bodyframe"><img src="'.$location.'/lonMisc/smallFAQ.gif" border="0" alt="('.&mt('FAQ').')" valign="middle" />&nbsp;'.&mt('FAQ').'</a>&nbsp;</span>               <td><span class="LC_nobreak">&nbsp;<a href="'.$faqbaseurl.'/fom/cache/'.$faq.'.html" target="bodyframe"><img src="'.$location.'/lonMisc/smallFAQ.gif" border="0" alt="('.&mt('FAQ').')" />&nbsp;'.&mt('FAQ').'</a>&nbsp;</span>
             </td>');              </td>');
     }      }
     if ($env{'user.adv'}) {      if ($env{'user.adv'}) {
     if ($helpconfig{'helpsettings'}{'submitbugs'} eq '1' ||      if ($helpconfig{'helpsettings'}{'submitbugs'} eq '1' ||
     $helpconfig{'helpsettings'}{'submitbugs'} eq '' ) {      $helpconfig{'helpsettings'}{'submitbugs'} eq '' ) {
         $r->print('          $r->print('
             <td><span class="LC_nobreak"&nbsp;<b><a href="'.$bugurl.'" target="bodyframe"><img src="'.$location.'/lonMisc/smallBug.gif" border="0" alt="('.&mt('Report a bug').')" valign="middle" />&nbsp;'.&mt('Report a bug').'</a>&nbsp;</b></span></td>');              <td><span class="LC_nobreak">&nbsp;<b><a href="'.$bugurl.'" target="bodyframe"><img src="'.$location.'/lonMisc/smallBug.gif" border="0" alt="('.&mt('Report a bug').')" />&nbsp;'.&mt('Report a bug').'</a>&nbsp;</b></span></td>');
  }   }
     }      }
     if ($stayOnPage) {      if ($stayOnPage) {
         $r->print('          $r->print('
             <td><span class="LC_nobreak">&nbsp;<a href="'.$origurl.'" target="_top"><img src="'.$location.'/lonIcons/move_up.gif" border="0" alt="('.&mt('Return to last location').')" valign="middle" />&nbsp;'.&mt('Return to last location').'</a>&nbsp;</span></td>');              <td><span class="LC_nobreak">&nbsp;<a href="'.$origurl.'" target="_top"><img src="'.$location.'/lonIcons/move_up.gif" border="0" alt="('.&mt('Return to last location').')" />&nbsp;'.&mt('Return to last location').'</a>&nbsp;</span></td>');
     } else {      } else {
         $r->print('          $r->print('
             <td><span class="LC_nobreak"&nbsp;<a href="javascript:window.close()" target="_top"><img src="$location/lonIcons/closepage.gif" border="0" alt="('.&mt('Close window').')" valign="bottom" />&nbsp;'.&mt('Close').'</a>&nbsp;</span></td>');              <td><span class="LC_nobreak">&nbsp;<a href="javascript:window.close()" target="_top"><img src="$location/lonIcons/closepage.gif" border="0" alt="('.&mt('Close window').')" />&nbsp;'.&mt('Close').'</a>&nbsp;</span></td>');
     }      }
     $r->print(<<END);      $r->print(<<END);
   </tr>    </tr>
Line 192  SCRIPT_TWO Line 193  SCRIPT_TWO
   </td>    </td>
   <td width='100%'>&nbsp;</td>    <td width='100%'>&nbsp;</td>
  </tr>   </tr>
  <tr height='5'>   <tr>
   <td colspan='3' height='5'>&nbsp;</td>    <td colspan='3' height='5'>&nbsp;</td>
  </tr>   </tr>
 </table>  </table>
Removed from v.1.41  
changed lines
  Added in v.1.42

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