Diff for /loncom/interface/lonhelpmenu.pm between versions 1.23 and 1.26

version 1.23, 2006/03/23 22:32:10 version 1.26, 2006/06/26 21:54:34
Line 32  use Apache::Constants qw(:common); Line 32  use Apache::Constants qw(:common);
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
   
 sub handler {  sub handler {
     my ($r) = @_;      my ($r) = @_;
Line 82  sub display_help_banner { Line 84  sub display_help_banner {
     }      }
     my $scripttag = '';      my $scripttag = '';
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {      if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         my $displayurl = &Apache::lonnet::escape($origurl);          my $displayurl = &escape($origurl);
         $scripttag = (<<"SCRIPT_ONE");          $scripttag = (<<"SCRIPT_ONE");
 <script>  <script>
 function gohelpdesk() {  function gohelpdesk() {
Line 137  function validmail(field) { Line 139  function validmail(field) {
 SCRIPT_TWO  SCRIPT_TWO
     }      }
   
     my $body_layout = 'rightmargin="0" leftmargin="0" marginwidth="0" topmargin="1" marginheight="1"';      my %body_layout = 
    ('rightmargin'  => "0",
    'leftmargin'   => "0",
    'marginwidth'  => "0",
    'topmargin'    => "1",
    'marginheight' => "1");
     my $start_page =       my $start_page = 
  &Apache::loncommon::start_page('',$scripttag,   &Apache::loncommon::start_page('',$scripttag,
        {'function'    => $function,         {'function'    => $function,
  'add_entries' => $body_layout,   'add_entries' => \%body_layout,
  'only_body'   => 1,});   'only_body'   => 1,});
     $r->print($start_page);      $r->print($start_page);
   
Line 155  SCRIPT_TWO Line 162  SCRIPT_TWO
    <td width='5'>&nbsp;</td>     <td width='5'>&nbsp;</td>
    <td>     <td>
     <fieldset><legend><img src="$location/lonIcons/minilogo.gif" height='20' width='29' valign='bottom' />&nbsp;&nbsp;<b><font size="+1">LON-CAPA help/support</font></b></legend>      <fieldset><legend><img src="$location/lonIcons/minilogo.gif" height='20' width='29' valign='bottom' />&nbsp;&nbsp;<b><font size="+1">LON-CAPA help/support</font></b></legend>
  <table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#000000">   <table id="LC_helpmenu_links">
   <tr>     <tr>
    <td>  
     <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#000000">  
      <tr>  
       <td>  
        <table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#ffffff">  
         <tr>  
          <td>  
   <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff">  
            <tr bgcolor="$tablecolor">  
 END  END
     if ($component_url) {      if ($component_url) {
  $r->print("<td align=\"center\"><b><a href=\"$component_url\" target=\"bodyframe\">".   $r->print("<td align=\"center\"><b><a href=\"$component_url\" target=\"bodyframe\">".
Line 197  END Line 195  END
 END  END
     }      }
     $r->print(<<END);      $r->print(<<END);
            </tr>  
           </table>  
          </td>  
         </tr>  
        </table>  
       </td>  
      </tr>  
     </table>  
    </td>  
   </tr>    </tr>
  </table>   </table>
 </fieldset>  </fieldset>
Line 243  sub display_help_mainpage { Line 232  sub display_help_mainpage {
         'suim' => ' Suggested improvements may include additional functionality, improved usability, or changes to wording used in LON-CAPA pages, including the embedded help system.'          'suim' => ' Suggested improvements may include additional functionality, improved usability, or changes to wording used in LON-CAPA pages, including the embedded help system.'
     );      );
   
       my %body_layout = 
    ('topmargin'    => "0",
    'marginheight' => "0");
     my $start_page =      my $start_page =
  &Apache::loncommon::start_page('Help Content',undef,   &Apache::loncommon::start_page('Help Content',undef,
        {'function'    => $function,         {'function'    => $function,
  'add_entries' => 'topmargin="0" marginheight="0"',   'add_entries' => \%body_layout,
  'only_body'   => 1,});   'only_body'   => 1,});
     $r->print($start_page);      $r->print($start_page);
     $r->print($lt{'chen'});      $r->print($lt{'chen'});
Line 275  sub display_help_mainpage { Line 267  sub display_help_mainpage {
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {      if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print("          $r->print("
           <ul>            <ul>
            <li><a href=\"/adm/support?origurl=".&Apache::lonnet::escape($origurl)."&function=$function\">$lt{'cont'}</a></li>             <li><a href=\"/adm/support?origurl=".&escape($origurl)."&function=$function\">$lt{'cont'}</a></li>
           </ul>            </ul>
           <p>$lt{'suhr'}");            <p>$lt{'suhr'}");
          unless ($env{'user.adv'}) {           unless ($env{'user.adv'}) {

Removed from v.1.23  
changed lines
  Added in v.1.26


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