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

version 1.8, 2004/07/12 17:02:07 version 1.18, 2004/12/20 21:11:41
Line 30  use strict; Line 30  use strict;
 use lib qw(/home/httpd/lib/perl);  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;
   
 sub handler {  sub handler {
     my ($r) = @_;      my ($r) = @_;
Line 76  sub display_help_banner { Line 77  sub display_help_banner {
     my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink');      my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink');
     my $pagecolor = &Apache::loncommon::designparm($function.'.pgbg');      my $pagecolor = &Apache::loncommon::designparm($function.'.pgbg');
     my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');      my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
       my $location=&Apache::loncommon::lonhttpdurl("/adm");
     if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) {      if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) {
         $tablecolor = '#CCCCFF';          $tablecolor = '#EEEE99';
       }
       my $scripttag = '';
       if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
           my $displayurl = &Apache::lonnet::escape($origurl);
           $scripttag = (<<"SCRIPT_ONE");
   <script>
   function gohelpdesk() {
       var actiontype = null;
       try {
           actiontype = parent.bodyframe.document.logproblem.action.value;
       }
       catch(error) {
           parent.bodyframe.location = "/adm/support?origurl=$displayurl&function=$function";
           return;
       }
       if (actiontype) {
           var loc = parent.bodyframe.location.href;
           if (loc.indexOf("/adm/support") > -1) {
               if (parent.bodyframe.document.logproblem.action.value == "process") {
                   if (validmail(parent.bodyframe.document.logproblem.email) == false) {
                       alert("The e-mail address you entered: "+parent.bodyframe.document.logproblem.email.value+" is not a valid e-mail address.");
                       return;
                   }
                   parent.bodyframe.document.logproblem.submit();
                   return;
               }
           }
           parent.bodyframe.location = "/adm/support?origurl=$displayurl&function=$function";
           return;
     }      }
   }
   SCRIPT_ONE
           $scripttag .= (<<'SCRIPT_TWO');
   function validmail(field) {
       var str = field.value;
       if (window.RegExp) {
           var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)";
           var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$";
           var reg1 = new RegExp(reg1str);
           var reg2 = new RegExp(reg2str);
           if (!reg1.test(str) && reg2.test(str)) {
               return true;
           }
           return false;
       }
       else
       {
   
           if(str.indexOf("@") >= 0) {
               return true;
           }
           return false;
       }
   }
   </script>
   SCRIPT_TWO
       }
     $r->print(<<END);      $r->print(<<END);
 <html>  <html>
 <head>  <head>
Line 93  sub display_help_banner { Line 149  sub display_help_banner {
  a:hover {text-decoration: underline; color: $vlinkcolor; }   a:hover {text-decoration: underline; color: $vlinkcolor; }
 -->  -->
 </style>  </style>
   $scripttag
 </head>  </head>
 $bodytag  $bodytag
 END  END
Line 105  END Line 162  END
   <tr height="50">    <tr height="50">
    <td width='5'>&nbsp;</td>     <td width='5'>&nbsp;</td>
    <td>     <td>
     <fieldset><legend><img src="/adm/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 width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#000000">
   <tr>    <tr>
    <td>     <td>
Line 121  END Line 178  END
     if (($component_url) || ($ENV{'user.adv'})) {      if (($component_url) || ($ENV{'user.adv'})) {
         if ($component_url) {          if ($component_url) {
             $r->print("              $r->print("
             <td align=\"center\">&nbsp;<b><a href=\"$component_url\" target=\"bodyframe\">");              <td align=\"center\"><b><a href=\"$component_url\" target=\"bodyframe\">");
         } elsif ($ENV{'user.adv'}) {          } elsif ($ENV{'user.adv'}) {
             $r->print('<td align="center">&nbsp;<b><a href="/adm/help/nohelptopic.html" target="bodyframe">');              $r->print('<td align="center">&nbsp;<b><a href="/adm/help/nohelptopic.html" target="bodyframe">');
         }          }
         $r->print('          $r->print('
   <image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;Topic help</a></b>&nbsp;</td>');    <img src="'.$location.'/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;Topic help</a></b>&nbsp;</td>');
     }      }
     if ($requestmail) {      if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print('          $r->print('
             <td align="center">&nbsp;<b><a href="/adm/support?origurl='.$origurl.'&function='.$function.'" target="bodyframe"><image src="/adm/lonMisc/feedback.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"><image src="/adm/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"><image src="/adm/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
     }      }
     if ($stayOnPage) {      if ($stayOnPage) {
         $r->print(<<END);          $r->print(<<END);
             <td align="center">&nbsp;<b><a href="$origurl" target="_top"><image src="/adm/lonIcons/move_up.gif" border="0" alt="(Return to last location)" valign="middle" />&nbsp;Return to last location</a></b>&nbsp;</td>              <td align="center">&nbsp;<b><a href="$origurl" target="_top"><img src="$location/lonIcons/move_up.gif" border="0" alt="(Return to last location)" valign="middle" />&nbsp;Return to last location</a></b>&nbsp;</td>
 END  END
     } else {      } else {
         $r->print(<<END);          $r->print(<<END);
             <td align="center">&nbsp;<b><a href="javascript:window.close()" target="_top"><image src="/adm/lonIcons/closepage.gif" border="0" alt="(Close window)" valign="bottom" />&nbsp;Close</a></b>&nbsp;</td>              <td align="center">&nbsp;<b><a href="javascript:window.close()" target="_top"><img src="$location/lonIcons/closepage.gif" border="0" alt="(Close window)" valign="bottom" />&nbsp;Close</a></b>&nbsp;</td>
 END  END
     }      }
     $r->print(<<END);      $r->print(<<END);
Line 194  sub display_help_mainpage { Line 251  sub display_help_mainpage {
         '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.',
           'stuq' => 'Questions about course content should not be directed to the support team, but instead should be sent to the course instructor',
         'faqo' => 'FAQ-O-Matic Help system',          'faqo' => 'FAQ-O-Matic Help system',
         'tfaq' => 'The FAQ-O-Matic is a compendium of answers provided to common questions asked by users of LON-CAPA over the past couple of years.',          'tfaq' => 'The FAQ-O-Matic is a compendium of answers provided to common questions asked by users of LON-CAPA over the past couple of years.',
         'lbug' => 'LON-CAPA Bugzilla bug/feature request tracking system',          'lbug' => 'LON-CAPA Bugzilla bug/feature request tracking system',
Line 209  sub display_help_mainpage { Line 267  sub display_help_mainpage {
 $bodytag  $bodytag
 END  END
     $r->print($lt{'chen'});      $r->print($lt{'chen'});
     if ($requestmail) {      if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print(', '.$lt{'orto'});          $r->print(', '.$lt{'orto'});
     } else {      } else {
         $r->print(".");          $r->print(".");
Line 231  END Line 289  END
             }              }
         }          }
     }      }
     if ($requestmail) {      if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print("          $r->print("
           <ul>            <ul>
            <li><a href=\"/adm/support?origurl=$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>            <p>$lt{'suhr'}");
           <ul>           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("</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';
         }          }
         $r->print("          $r->print("
             <ul>
            <li><a href=\"$faqbaseurl/fom/cache/$faq.html\">$lt{'faqo'}</a></li>             <li><a href=\"$faqbaseurl/fom/cache/$faq.html\">$lt{'faqo'}</a></li>
           </ul>            </ul>
           <p>$lt{'tfaq'}</p>            <p>$lt{'tfaq'}</p>

Removed from v.1.8  
changed lines
  Added in v.1.18


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