--- loncom/interface/lonhelpmenu.pm	2006/03/23 22:32:10	1.23
+++ loncom/interface/lonhelpmenu.pm	2008/07/08 01:08:57	1.35
@@ -32,21 +32,21 @@ use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonlocal;
 use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 sub handler {
     my ($r) = @_;
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['page','color','function','faq','bug','topic','component_help','origurl','stayonpage']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['page','faq','bug','topic','component_help','origurl','stayonpage']);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
     if ($r->header_only) {
         return OK;
     }
-    my $color = $env{'form.color'};
     my $faq = $env{'form.faq'};
     my $bug = $env{'form.bug'};
     my $topic = $env{'form.topic'};
-    my $function = $env{'form.function'};
     my $component_help = $env{'form.component_help'};
     my $origurl = $env{'form.origurl'};
     my $stayOnPage = $env{'form.stayonpage'};
@@ -62,27 +62,19 @@ sub handler {
     my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'};
     my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
     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,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage);
     } 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,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail);
     }
     return OK;
 }
 
 sub display_help_banner {
-    my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_;
-    my $fontcolor = &Apache::loncommon::designparm($function.'.font');
-    my $alinkcolor = &Apache::loncommon::designparm($function.'.alink');
-    my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink');
-    my $pagecolor = &Apache::loncommon::designparm($function.'.pgbg');
-    my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
+    my ($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage) = @_;
     my $location=&Apache::loncommon::lonhttpdurl("/adm");
-    if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) {
-        $tablecolor = '#EEEE99';
-    }
     my $scripttag = '';
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
-        my $displayurl = &Apache::lonnet::escape($origurl);
+        my $displayurl = &escape($origurl);
         $scripttag = (<<"SCRIPT_ONE");
 <script>
 function gohelpdesk() {
@@ -91,7 +83,7 @@ function gohelpdesk() {
         actiontype = parent.bodyframe.document.logproblem.action.value;
     }
     catch(error) {
-        parent.bodyframe.location = "/adm/support?origurl=$displayurl&function=$function";
+        parent.bodyframe.location = "/adm/support?origurl=$displayurl";
         return;
     }
     if (actiontype) {
@@ -106,7 +98,7 @@ function gohelpdesk() {
                 return;
             }
         }
-        parent.bodyframe.location = "/adm/support?origurl=$displayurl&function=$function";
+        parent.bodyframe.location = "/adm/support?origurl=$displayurl";
         return;
     }
 }
@@ -137,80 +129,66 @@ function validmail(field) {
 SCRIPT_TWO
     }
 
-    my $body_layout = 'rightmargin="0" leftmargin="0" marginwidth="0" topmargin="1" marginheight="1"';
+    my %body_layout = 
+	('rightmargin'  => "0",
+	 'leftmargin'   => "0",
+	 'marginwidth'  => "0",
+	 'topmargin'    => "1",
+	 'marginheight' => "1");
     my $start_page = 
 	&Apache::loncommon::start_page('',$scripttag,
-				       {'function'    => $function,
-					'add_entries' => $body_layout,
+				       {'add_entries' => \%body_layout,
 					'only_body'   => 1,});
     $r->print($start_page);
 
-    if ($stayOnPage) {
-        $r->print('<table width="700" border="0" cellspacing="0" cellpadding="0" height="55">');
-    } else {
-        $r->print('<table width="600" border="0" cellspacing="0" cellpadding="0" height="55">');
-    }
+    my $width = ($stayOnPage) ? '95%' : '600';
+    $r->print('<table id="LC_helpmenu" width="'.$width.'">');
+
+    my $general_help = &Apache::loncommon::general_help();
     $r->print(<<END);
   <tr height="50">
    <td width='5'>&nbsp;</td>
    <td>
-    <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">
-  <tr>
-   <td>
-    <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#000000">
-     <tr>
-      <td>
-       <table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="#ffffff">
-        <tr>
-         <td>
-	  <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff">
-           <tr bgcolor="$tablecolor">
+    <fieldset><legend><img src="$location/lonIcons/minilogo.gif" height='20' width='29' valign='bottom' />&nbsp;&nbsp;LON-CAPA help/support</legend>
+ <table id="LC_helpmenu_links">
+   <tr>
+	<td><span class="LC_nobreak"><a href="/adm/help/$general_help.hlp" target="bodyframe">
+		  <img src="'.$location.'/help/help.png" border="0" alt="(General help)" valign="middle" />&nbsp;General Help</a>&nbsp;</span></td>
 END
     if ($component_url) {
-	$r->print("<td align=\"center\"><b><a href=\"$component_url\" target=\"bodyframe\">".
-		  '<img src="'.$location.'/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;Topic help</a></b>&nbsp;</td>');
+	$r->print("<td><span class=\"LC_nobreak\"><a href=\"$component_url\" target=\"bodyframe\">".
+		  '<img src="'.$location.'/help/help.png" border="0" alt="(Topic help)" valign="middle" />&nbsp;'.$topic.'</a>&nbsp;</span></td>');
     }
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $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><span class="LC_nobreak">&nbsp;<a href="javascript:gohelpdesk()"><img src="'.$location.'/lonIcons/helpdesk.gif" border="0" alt="(Ask helpdesk)" valign="middle" />&nbsp;Ask helpdesk</a>&nbsp;</span></td>');
     }
     if ($faq && $env{'user.adv'}) {
         $r->print(<<END);
-            <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;
+             <td><span class="LC_nobreak">&nbsp;<a href="$faqbaseurl/fom/cache/$faq.html" target="bodyframe"><img src="$location/lonMisc/smallFAQ.gif" border="0" alt="(FAQ)" valign="middle" />&nbsp;FAQ</a>&nbsp;</span>
             </td>
 END
     }
     if ($env{'user.adv'}) {
         $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><span class="LC_nobreak"&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></span></td>
 END
     }
     if ($stayOnPage) {
         $r->print(<<END);
-            <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>
+            <td><span class="LC_nobreak">&nbsp;<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>&nbsp;</span></td>
 END
     } else {
         $r->print(<<END);
-            <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>
+            <td><span class="LC_nobreak"&nbsp;<a href="javascript:window.close()" target="_top"><img src="$location/lonIcons/closepage.gif" border="0" alt="(Close window)" valign="bottom" />&nbsp;Close</a>&nbsp;</span></td>
 END
     }
     $r->print(<<END);
-           </tr>
-          </table>
-         </td>
-        </tr>
-       </table>
-      </td>
-     </tr>
-    </table>
-   </td>
   </tr>
  </table>
 </fieldset>
   </td>
-  <td width='5'>&nbsp;</td>
+  <td width='100%'>&nbsp;</td>
  </tr>
  <tr height='5'>
   <td colspan='3' height='5'>&nbsp;</td>
@@ -221,7 +199,7 @@ END
 }
 
 sub display_help_mainpage {
-    my ($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_;
+    my ($r,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail) = @_;
 
     my %lt =&Apache::lonlocal::texthash(
         'topp' => 'Topic Page',
@@ -231,8 +209,6 @@ sub display_help_mainpage {
         '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.',
         'inhs' => 'Topical help system for',
-	'noto' => 'There is no specific topical help item for',
-        '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',
@@ -243,18 +219,21 @@ 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.'
     );
 
+    my %body_layout = 
+	('topmargin'    => "0",
+	 'marginheight' => "0");
     my $start_page =
 	&Apache::loncommon::start_page('Help Content',undef,
-				       {'function'    => $function,
-					'add_entries' => 'topmargin="0" marginheight="0"',
+				       {'add_entries' => \%body_layout,
 					'only_body'   => 1,});
     $r->print($start_page);
-    $r->print($lt{'chen'});
+    $r->print('<b>'.$lt{'chen'});
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print(', '.$lt{'orto'});
     } else {
         $r->print(".");
     }
+    $r->print('</b>');
     if ($topic) {
         if ( ($component_url) || ($env{'user.adv'}) ) {
             if ($component_url) {
@@ -264,18 +243,13 @@ sub display_help_mainpage {
           </ul>
           <p>$lt{'disp'}</p>
                 ");
-            } elsif ($env{'user.adv'}) {
-                $r->print("
-              <ul>
-               <li><td align=\"center\">&nbsp;<a href=\"/adm/help/nohelptopic.html\">$lt{'noto'} $topic</a></li></ul>
-               <p>$lt{'coth'}</p>");
             }
         }
     }
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print("
           <ul>
-           <li><a href=\"/adm/support?origurl=".&Apache::lonnet::escape($origurl)."&function=$function\">$lt{'cont'}</a></li>
+           <li><a href=\"/adm/support?origurl=".&escape($origurl)."\">$lt{'cont'}</a></li>
           </ul>
           <p>$lt{'suhr'}");
          unless ($env{'user.adv'}) {