--- loncom/interface/lonhelpmenu.pm	2012/12/17 15:55:50	1.40
+++ loncom/interface/lonhelpmenu.pm	2013/08/08 14:31:54	1.42
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # generate frame-based help system
 #
-# $Id: lonhelpmenu.pm,v 1.40 2012/12/17 15:55:50 raeburn Exp $
+# $Id: lonhelpmenu.pm,v 1.42 2013/08/08 14:31:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -57,9 +57,9 @@ sub handler {
         $component_url = '/adm/help/'.$component_url.'.hlp';
     }
     my $bugurl = $Apache::lonnet::perlvar{'BugzillaHost'};
-    $bugurl .= 'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.$origurl;
+    $bugurl .= 'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.$origurl;
     if ($bug) {
-        $bugurl .= '&component='.$bug;
+        $bugurl .= '&component='.$bug;
     }
     my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'};
     my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
@@ -81,6 +81,7 @@ sub display_help_banner {
         my $displayurl = &escape($origurl);
         $scripttag = (<<"SCRIPT_ONE");
 <script>
+// <![CDATA[
 function gohelpdesk() {
     var actiontype = null;
     try {
@@ -129,6 +130,7 @@ function validmail(field) {
         return false;
     }
 }
+// ]]>
 </script>
 SCRIPT_TWO
     }
@@ -140,55 +142,49 @@ SCRIPT_TWO
 	 'topmargin'    => "1",
 	 'marginheight' => "1");
     my $start_page = 
-	&Apache::loncommon::start_page('',$scripttag,
-				       {'add_entries' => \%body_layout,
-					'only_body'   => 1,});
+	&Apache::loncommon::start_page('Help',$scripttag,
+					{'only_body'   => 1,});
     $r->print($start_page);
 
     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>
+    $r->print('
+  <tr>
+   <td width="5" height="50">&nbsp;</td>
    <td>
-    <fieldset><legend><img src="$location/lonIcons/minilogo.gif" height='20' width='29' valign='bottom' />&nbsp;&nbsp;LON-CAPA help/support</legend>
+    <fieldset><legend><img src="'.$location.'/lonIcons/minilogo.gif" height="20" width="29" alt="('.&mt('LON-CAPA help/support').')" />&nbsp;&nbsp;'.&mt('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
+	<td><span class="LC_nobreak"><a href="/adm/help/'.$general_help.'.hlp" target="bodyframe">
+		  <img src="'.$location.'/help/help.png" border="0" alt="('.&mt('General help').')" />&nbsp;'.&mt('General Help').'</a>&nbsp;</span></td>');
     if ($component_url) {
 	$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>');
+		  '<img src="'.$location.'/help/help.png" border="0" alt="('.&mt('Topic help').')" />&nbsp;'.$topic.'</a>&nbsp;</span></td>');
     }
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print('
-            <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>');
+            <td><span class="LC_nobreak">&nbsp;<a href="javascript:gohelpdesk()"><img src="'.$location.'/lonIcons/helpdesk.gif" border="0" alt="('.&mt('Ask helpdesk').')" />&nbsp;'.&mt('Ask helpdesk').'</a>&nbsp;</span></td>');
     }
     if ($faq && $env{'user.adv'}) {
-        $r->print(<<END);
-             <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
+        $r->print('
+             <td><span class="LC_nobreak">&nbsp;<a href="'.$faqbaseurl.'/fom/cache/'.$faq.'.html" target="bodyframe"><img src="'.$location.'/lonMisc/smallFAQ.gif" border="0" alt="('.&mt('FAQ').')" />&nbsp;'.&mt('FAQ').'</a>&nbsp;</span>
+            </td>');
     }
     if ($env{'user.adv'}) {
     	if ($helpconfig{'helpsettings'}{'submitbugs'} eq '1' ||
     		$helpconfig{'helpsettings'}{'submitbugs'} eq '' ) {
-        	$r->print(<<END);
-            	<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
+        	$r->print('
+            	<td><span class="LC_nobreak">&nbsp;<b><a href="'.$bugurl.'" target="bodyframe"><img src="'.$location.'/lonMisc/smallBug.gif" border="0" alt="('.&mt('Report a bug').')" />&nbsp;'.&mt('Report a bug').'</a>&nbsp;</b></span></td>');
 		}
     }
     if ($stayOnPage) {
-        $r->print(<<END);
-            <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
+        $r->print('
+            <td><span class="LC_nobreak">&nbsp;<a href="'.$origurl.'" target="_top"><img src="'.$location.'/lonIcons/move_up.gif" border="0" alt="('.&mt('Return to last location').')" />&nbsp;'.&mt('Return to last location').'</a>&nbsp;</span></td>');
     } else {
-        $r->print(<<END);
-            <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('
+            <td><span class="LC_nobreak">&nbsp;<a href="javascript:window.close()" target="_top"><img src="$location/lonIcons/closepage.gif" border="0" alt="('.&mt('Close window').')" />&nbsp;'.&mt('Close').'</a>&nbsp;</span></td>');
     }
     $r->print(<<END);
   </tr>
@@ -197,7 +193,7 @@ END
   </td>
   <td width='100%'>&nbsp;</td>
  </tr>
- <tr height='5'>
+ <tr>
   <td colspan='3' height='5'>&nbsp;</td>
  </tr>
 </table>