--- loncom/interface/lonhelpmenu.pm	2004/11/27 17:13:21	1.15
+++ loncom/interface/lonhelpmenu.pm	2004/12/20 21:11:41	1.18
@@ -30,6 +30,7 @@ use strict;
 use lib qw(/home/httpd/lib/perl);
 use Apache::Constants qw(:common);
 use Apache::loncommon();
+use Apache::lonlocal;
 
 sub handler {
     my ($r) = @_;
@@ -78,9 +79,64 @@ 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>
@@ -93,6 +149,7 @@ sub display_help_banner {
  a:hover {text-decoration: underline; color: $vlinkcolor; }
 -->
 </style>
+$scripttag
 </head>
 $bodytag
 END
@@ -121,16 +178,16 @@ END
     if (($component_url) || ($ENV{'user.adv'})) {
         if ($component_url) {
             $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'}) {
-            $r->print('<td align="center">&nbsp;<b><a href="$location/help/nohelptopic.html" target="bodyframe">');
+            $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/^[^\@]+\@[^\@]+$/) {
         $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);
@@ -194,6 +251,7 @@ sub display_help_mainpage {
         'coth' => 'Consult the inline help system for this topic.',
         'cont' => 'Contact the LON-CAPA support team',
         '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',
         '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',
@@ -236,8 +294,11 @@ END
           <ul>
            <li><a href=\"/adm/support?origurl=".&Apache::lonnet::escape($origurl)."&function=$function\">$lt{'cont'}</a></li>
           </ul>
-          <p>$lt{'suhr'}</p>
-        ");
+          <p>$lt{'suhr'}");
+         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 (!defined($faq) ||$faq eq '') {
