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

Diff for /loncom/interface/lonhelpmenu.pm between versions 1.18 and 1.22

version 1.18, 2004/12/20 21:11:41 version 1.22, 2006/03/21 18:37:51
Line 31  use lib qw(/home/httpd/lib/perl); Line 31  use lib qw(/home/httpd/lib/perl);
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
   
 sub handler {  sub handler {
     my ($r) = @_;      my ($r) = @_;
Line 41  sub handler { Line 42  sub handler {
     if ($r->header_only) {      if ($r->header_only) {
         return OK;          return OK;
     }      }
     my $color = $ENV{'form.color'};      my $color = $env{'form.color'};
     my $faq = $ENV{'form.faq'};      my $faq = $env{'form.faq'};
     my $bug = $ENV{'form.bug'};      my $bug = $env{'form.bug'};
     my $topic = $ENV{'form.topic'};      my $topic = $env{'form.topic'};
     my $function = $ENV{'form.function'};      my $function = $env{'form.function'};
     my $component_help = $ENV{'form.component_help'};      my $component_help = $env{'form.component_help'};
     my $origurl = $ENV{'form.origurl'};      my $origurl = $env{'form.origurl'};
     my $stayOnPage = $ENV{'form.stayonpage'};      my $stayOnPage = $env{'form.stayonpage'};
     my $component_url = $component_help;      my $component_url = $component_help;
     if ($component_url) {      if ($component_url) {
         $component_url = '/adm/help/'.$component_url.'.hlp';          $component_url = '/adm/help/'.$component_url.'.hlp';
Line 60  sub handler { Line 61  sub handler {
     }      }
     my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'};      my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'};
     my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};      my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
     if ($ENV{'form.page'} eq 'banner') {      if ($env{'form.page'} eq 'banner') {
         &display_help_banner($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage);          &display_help_banner($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage);
     } elsif ($ENV{'form.page'} eq 'body') {      } elsif ($env{'form.page'} eq 'body') {
         &display_help_mainpage($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail);          &display_help_mainpage($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail);
     }      }
     return OK;      return OK;
Line 70  sub handler { Line 71  sub handler {
   
 sub display_help_banner {  sub display_help_banner {
     my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_;      my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_;
     my $bodytag = &Apache::loncommon::bodytag('',$function,'rightmargin="0" leftmargin="0" marginwidth="0" topmargin="1" marginheight="1"',1);  
     $bodytag=~s/[\n\r]/ /g;  
     my $fontcolor = &Apache::loncommon::designparm($function.'.font');      my $fontcolor = &Apache::loncommon::designparm($function.'.font');
     my $alinkcolor = &Apache::loncommon::designparm($function.'.alink');      my $alinkcolor = &Apache::loncommon::designparm($function.'.alink');
     my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink');      my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink');
Line 117  function validmail(field) { Line 116  function validmail(field) {
     var str = field.value;      var str = field.value;
     if (window.RegExp) {      if (window.RegExp) {
         var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)";          var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)";
         var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$";          var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"; //"
         var reg1 = new RegExp(reg1str);          var reg1 = new RegExp(reg1str);
         var reg2 = new RegExp(reg2str);          var reg2 = new RegExp(reg2str);
         if (!reg1.test(str) && reg2.test(str)) {          if (!reg1.test(str) && reg2.test(str)) {
Line 137  function validmail(field) { Line 136  function validmail(field) {
 </script>  </script>
 SCRIPT_TWO  SCRIPT_TWO
     }      }
     $r->print(<<END);  
 <html>      my $html=&Apache::lonxml::xmlbegin();
 <head>      my $body_layout = 'rightmargin="0" leftmargin="0" marginwidth="0" topmargin="1" marginheight="1"';
 <title>Help Banner</title>      my $start_page = 
 <style type="text/css">   &Apache::loncommon::start_page('',$scripttag,
 <!--         {'function'    => $function,
  a:link {text-decoration: none; color: $fontcolor; }   'add_entries' => $body_layout,
  a:visited {text-decoration: none; color: $fontcolor; }   'only_body'   => 1,});
  a:active {text-decoration: none; color: $fontcolor; }      $r->print($start_page);
  a:hover {text-decoration: underline; color: $vlinkcolor; }  
 -->  
 </style>  
 $scripttag  
 </head>  
 $bodytag  
 END  
     if ($stayOnPage) {      if ($stayOnPage) {
         $r->print('<table width="700" border="0" cellspacing="0" cellpadding="0" height="55">');          $r->print('<table width="700" border="0" cellspacing="0" cellpadding="0" height="55">');
     } else {      } else {
Line 175  END Line 168  END
   <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff">    <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff">
            <tr bgcolor="$tablecolor">             <tr bgcolor="$tablecolor">
 END  END
     if (($component_url) || ($ENV{'user.adv'})) {      if ($component_url) {
         if ($component_url) {   $r->print("<td align=\"center\"><b><a href=\"$component_url\" target=\"bodyframe\">".
             $r->print("    '<img src="'.$location.'/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;Topic help</a></b>&nbsp;</td>');
             <td align=\"center\"><b><a href=\"$component_url\" target=\"bodyframe\">");  
         } elsif ($ENV{'user.adv'}) {  
             $r->print('<td align="center">&nbsp;<b><a href="/adm/help/nohelptopic.html" target="bodyframe">');  
         }  
         $r->print('  
   <img src="'.$location.'/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;Topic help</a></b>&nbsp;</td>');  
     }      }
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {      if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print('          $r->print('
             <td align="center">&nbsp;<b><a href="javascript:gohelpdesk()"><img src="'.$location.'/lonIcons/helpdesk.gif" border="0" alt="(Ask helpdesk)" valign="middle" />&nbsp;Ask helpdesk</a></b>&nbsp;</td>');              <td align="center">&nbsp;<b><a href="javascript:gohelpdesk()"><img src="'.$location.'/lonIcons/helpdesk.gif" border="0" alt="(Ask helpdesk)" valign="middle" />&nbsp;Ask helpdesk</a></b>&nbsp;</td>');
     }      }
     if ($faq && $ENV{'user.adv'}) {      if ($faq && $env{'user.adv'}) {
         $r->print(<<END);          $r->print(<<END);
             <td align="center">              <td align="center">
              &nbsp;<b><a href="$faqbaseurl/fom/cache/$faq.html" target="bodyframe"><img src="$location/lonMisc/smallFAQ.gif" border="0" alt="(FAQ)" valign="middle" />&nbsp;FAQ</a></b>&nbsp;               &nbsp;<b><a href="$faqbaseurl/fom/cache/$faq.html" target="bodyframe"><img src="$location/lonMisc/smallFAQ.gif" border="0" alt="(FAQ)" valign="middle" />&nbsp;FAQ</a></b>&nbsp;
             </td>              </td>
 END  END
     }      }
     if ($ENV{'user.adv'}) {      if ($env{'user.adv'}) {
         $r->print(<<END);          $r->print(<<END);
             <td align="center">&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></td>              <td align="center">&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></td>
 END  END
Line 230  END Line 217  END
   <td colspan='3' height='5'>&nbsp;</td>    <td colspan='3' height='5'>&nbsp;</td>
  </tr>   </tr>
 </table>  </table>
 </body>  
 </html>  
 END  END
       $r->print(&Apache::loncommon::end_page());
 }  }
   
 sub display_help_mainpage {  sub display_help_mainpage {
     my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_;      my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_;
     my $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0" marginheight="0"',1);  
     $bodytag=~s/[\n\r]/ /g;  
     my %lt =&Apache::lonlocal::texthash(      my %lt =&Apache::lonlocal::texthash(
         'heco' => 'Help Content',  
         'topp' => 'Topic Page',          'topp' => 'Topic Page',
         'chen' => 'Choose an entry below to go directly to a relevant help page',          'chen' => 'Choose an entry below to go directly to a relevant help page',
         'orto' => 'or to submit a help request to the LON-CAPA support staff at your institution.',          'orto' => 'or to submit a help request to the LON-CAPA support staff at your institution.',
         'vthp' => 'Visit the help page for ',          'vthp' => 'Visit the help page for ',
         'disp' => 'Display the page in the inline help system that covers this topic.',          'disp' => 'Display the page in the inline help system that covers this topic.',
         'crac' => 'Create an account for yourself in the LON-CAPA Bugzilla tracking system, if you wish to report bugs you have encountered in the LON-CAPA software, or if you have suggestions for improvements in LON-CAPA.',          'crac' => 'Create an account for yourself in the LON-CAPA Bugzilla tracking system, if you wish to report bugs you have encountered in the LON-CAPA software, or if you have suggestions for improvements in LON-CAPA.',
         'inhs' => 'Inline help system for',          'inhs' => 'Topical help system for',
    'noto' => 'There is no specific topical help item for',
         'coth' => 'Consult the inline help system for this topic.',          'coth' => 'Consult the inline help system for this topic.',
         'cont' => 'Contact the LON-CAPA support team',          'cont' => 'Contact the LON-CAPA support team',
         'suhr' => 'Submit a help request to the team responsible for LON-CAPA support at this institution.',          'suhr' => 'Submit a help request to the team responsible for LON-CAPA support at this institution.',
Line 259  sub display_help_mainpage { Line 244  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.'
     );      );
   
     $r->print(<<END);      my $start_page =
 <html>   &Apache::loncommon::start_page('Help Content',undef,
  <head>         {'function'    => $function,
   <title>$lt{'heco'}</title>   'add_entries' => 'topmargin="0" marginheight="0"',
  </head>   'only_body'   => 1,});
 $bodytag      $r->print($start_page);
 END  
     $r->print($lt{'chen'});      $r->print($lt{'chen'});
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {      if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print(', '.$lt{'orto'});          $r->print(', '.$lt{'orto'});
Line 273  END Line 257  END
         $r->print(".");          $r->print(".");
     }      }
     if ($topic) {      if ($topic) {
         if ( ($component_url) || ($ENV{'user.adv'}) ) {          if ( ($component_url) || ($env{'user.adv'}) ) {
             if ($component_url) {              if ($component_url) {
                 $r->print("                  $r->print("
           <ul>            <ul>
Line 281  END Line 265  END
           </ul>            </ul>
           <p>$lt{'disp'}</p>            <p>$lt{'disp'}</p>
                 ");                  ");
             } elsif ($ENV{'user.adv'}) {              } elsif ($env{'user.adv'}) {
                 $r->print("                  $r->print("
               <ul>                <ul>
                <li><td align=\"center\">&nbsp;<a href=\"/adm/help/nohelptopic.html\">$lt{'inhs'} $topic</a></li></ul>                 <li><td align=\"center\">&nbsp;<a href=\"/adm/help/nohelptopic.html\">$lt{'noto'} $topic</a></li></ul>
                <p>$lt{'coth'}</p>");                 <p>$lt{'coth'}</p>");
             }              }
         }          }
Line 295  END Line 279  END
            <li><a href=\"/adm/support?origurl=".&Apache::lonnet::escape($origurl)."&function=$function\">$lt{'cont'}</a></li>             <li><a href=\"/adm/support?origurl=".&Apache::lonnet::escape($origurl)."&function=$function\">$lt{'cont'}</a></li>
           </ul>            </ul>
           <p>$lt{'suhr'}");            <p>$lt{'suhr'}");
          unless ($ENV{'user.adv'}) {           unless ($env{'user.adv'}) {
              $r->print('<br /><b>'.&mt('Note').'</b>: '.$lt{'stuq'}.'. '.&mt('This can be done using the').' <a href="/adm/communicate" target="_top">'.&mt('COM').'</a> '.&mt('button, or the FDBK button when viewing a content page.'));               $r->print('<br /><b>'.&mt('Note').'</b>: '.$lt{'stuq'}.'. '.&mt('This can be done using the').' <a href="/adm/communicate" target="_top">'.&mt('COM').'</a> '.&mt('button, or the FDBK button when viewing a content page.'));
          }           }
          $r->print("</p>");           $r->print("</p>");
     }      }
     if ($faqbaseurl && $ENV{'user.adv'}) {      if ($faqbaseurl && $env{'user.adv'}) {
         if (!defined($faq) ||$faq eq '') {          if (!defined($faq) ||$faq eq '') {
             $faq = '1';              $faq = '1';
         }          }
Line 311  END Line 295  END
           <p>$lt{'tfaq'}</p>            <p>$lt{'tfaq'}</p>
         ");          ");
     }      }
     if ($bugurl && $ENV{'user.adv'}) {      if ($bugurl && $env{'user.adv'}) {
         $bugurl .= '?'.$bug;          $bugurl .= '?'.$bug;
         $r->print("          $r->print("
           <ul>            <ul>
Line 320  END Line 304  END
           <p>$lt{'crea'} $lt{'suim'}</p>            <p>$lt{'crea'} $lt{'suim'}</p>
         ");          ");
     }      }
     $r->print(<<END);      $r->print(&Apache::loncommon::end_page());
  </body>  
 </html>  
 END  
 }  }
   
 1;  1;
Removed from v.1.18  
changed lines
  Added in v.1.22

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