loncom/interface/lonhelpmenu.pm - diff

Return to lonhelpmenu.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhelpmenu.pm between versions 1.16 and 1.17

-version 1.16, 2004/12/04 21:15:33
+version 1.17, 2004/12/20 19:58:41
  Line 78  sub display_help_banner {
      my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
      my $location=&Apache::loncommon::lonhttpdurl("/adm");
      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);
  <html>
  <head>
- Line 93  sub display_help_banner {
+ Line 148  sub display_help_banner {
   a:hover {text-decoration: underline; color: $vlinkcolor; }
  -->
  </style>
+ $scripttag
  </head>
  $bodytag
  END
- Line 130  END
+ Line 186  END
      }
      if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
          $r->print('
-             <td align="center">&nbsp;<b><a href="/adm/support?origurl='.&Apache::lonnet::escape($origurl).'&function='.$function.'" target="bodyframe"><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'}) {
          $r->print(<<END);

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

Removed from v.1.16
changed lines
	Added in v.1.17