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

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

version 1.20, 2005/04/07 06:56:23 version 1.23, 2006/03/23 22:32:10
Line 71  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 118  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 138  function validmail(field) { Line 136  function validmail(field) {
 </script>  </script>
 SCRIPT_TWO  SCRIPT_TWO
     }      }
     my $html=&Apache::lonxml::xmlbegin();  
     $r->print(<<END);      my $body_layout = 'rightmargin="0" leftmargin="0" marginwidth="0" topmargin="1" marginheight="1"';
 $html      my $start_page = 
 <head>   &Apache::loncommon::start_page('',$scripttag,
 <title>Help Banner</title>         {'function'    => $function,
 <style type="text/css">   'add_entries' => $body_layout,
 <!--   'only_body'   => 1,});
  a:link {text-decoration: none; color: $fontcolor; }      $r->print($start_page);
  a:visited {text-decoration: none; color: $fontcolor; }  
  a:active {text-decoration: none; color: $fontcolor; }  
  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 177  END Line 167  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('
Line 232  END Line 216  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 260  sub display_help_mainpage { Line 242  sub display_help_mainpage {
         'crea' => '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.',          'crea' => '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.',
         '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 $html=&Apache::lonxml::xmlbegin();  
     $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 286  END Line 267  END
             } 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 322  END Line 303  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.20  
changed lines
  Added in v.1.23

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