[LON-CAPA-cvs] cvs: loncom /interface lonhelpmenu.pm

raeburn raeburn at source.lon-capa.org
Thu Aug 8 10:31:54 EDT 2013


raeburn		Thu Aug  8 14:31:54 2013 EDT

  Modified files:              
    /loncom/interface	lonhelpmenu.pm 
  Log:
  - xhtml
  
  
Index: loncom/interface/lonhelpmenu.pm
diff -u loncom/interface/lonhelpmenu.pm:1.41 loncom/interface/lonhelpmenu.pm:1.42
--- loncom/interface/lonhelpmenu.pm:1.41	Fri Jul 19 17:11:09 2013
+++ loncom/interface/lonhelpmenu.pm	Thu Aug  8 14:31:54 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # generate frame-based help system
 #
-# $Id: lonhelpmenu.pm,v 1.41 2013/07/19 17:11:09 bisitz 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 @@
         $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 @@
         my $displayurl = &escape($origurl);
         $scripttag = (<<"SCRIPT_ONE");
 <script>
+// <![CDATA[
 function gohelpdesk() {
     var actiontype = null;
     try {
@@ -129,6 +130,7 @@
         return false;
     }
 }
+// ]]>
 </script>
 SCRIPT_TWO
     }
@@ -140,9 +142,8 @@
 	 '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';
@@ -150,40 +151,40 @@
 
     my $general_help = &Apache::loncommon::general_help();
     $r->print('
-  <tr height="50">
-   <td width="5"> </td>
+  <tr>
+   <td width="5" height="50"> </td>
    <td>
-    <fieldset><legend><img src="'.$location.'/lonIcons/minilogo.gif" height="20" width="29" valign="bottom" alt="('.&mt('LON-CAPA help/support').')" />  '.&mt('LON-CAPA help/support').'</legend>
+    <fieldset><legend><img src="'.$location.'/lonIcons/minilogo.gif" height="20" width="29" alt="('.&mt('LON-CAPA help/support').')" />  '.&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="('.&mt('General help').')" valign="middle" /> '.&mt('General Help').'</a> </span></td>');
+		  <img src="'.$location.'/help/help.png" border="0" alt="('.&mt('General help').')" /> '.&mt('General Help').'</a> </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="('.&mt('Topic help').')" valign="middle" /> '.$topic.'</a> </span></td>');
+		  '<img src="'.$location.'/help/help.png" border="0" alt="('.&mt('Topic help').')" /> '.$topic.'</a> </span></td>');
     }
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print('
-            <td><span class="LC_nobreak"> <a href="javascript:gohelpdesk()"><img src="'.$location.'/lonIcons/helpdesk.gif" border="0" alt="('.&mt('Ask helpdesk').')" valign="middle" /> '.&mt('Ask helpdesk').'</a> </span></td>');
+            <td><span class="LC_nobreak"> <a href="javascript:gohelpdesk()"><img src="'.$location.'/lonIcons/helpdesk.gif" border="0" alt="('.&mt('Ask helpdesk').')" /> '.&mt('Ask helpdesk').'</a> </span></td>');
     }
     if ($faq && $env{'user.adv'}) {
         $r->print('
-             <td><span class="LC_nobreak"> <a href="'.$faqbaseurl.'/fom/cache/'.$faq.'.html" target="bodyframe"><img src="'.$location.'/lonMisc/smallFAQ.gif" border="0" alt="('.&mt('FAQ').')" valign="middle" /> '.&mt('FAQ').'</a> </span>
+             <td><span class="LC_nobreak"> <a href="'.$faqbaseurl.'/fom/cache/'.$faq.'.html" target="bodyframe"><img src="'.$location.'/lonMisc/smallFAQ.gif" border="0" alt="('.&mt('FAQ').')" /> '.&mt('FAQ').'</a> </span>
             </td>');
     }
     if ($env{'user.adv'}) {
     	if ($helpconfig{'helpsettings'}{'submitbugs'} eq '1' ||
     		$helpconfig{'helpsettings'}{'submitbugs'} eq '' ) {
         	$r->print('
-            	<td><span class="LC_nobreak" <b><a href="'.$bugurl.'" target="bodyframe"><img src="'.$location.'/lonMisc/smallBug.gif" border="0" alt="('.&mt('Report a bug').')" valign="middle" /> '.&mt('Report a bug').'</a> </b></span></td>');
+            	<td><span class="LC_nobreak"> <b><a href="'.$bugurl.'" target="bodyframe"><img src="'.$location.'/lonMisc/smallBug.gif" border="0" alt="('.&mt('Report a bug').')" /> '.&mt('Report a bug').'</a> </b></span></td>');
 		}
     }
     if ($stayOnPage) {
         $r->print('
-            <td><span class="LC_nobreak"> <a href="'.$origurl.'" target="_top"><img src="'.$location.'/lonIcons/move_up.gif" border="0" alt="('.&mt('Return to last location').')" valign="middle" /> '.&mt('Return to last location').'</a> </span></td>');
+            <td><span class="LC_nobreak"> <a href="'.$origurl.'" target="_top"><img src="'.$location.'/lonIcons/move_up.gif" border="0" alt="('.&mt('Return to last location').')" /> '.&mt('Return to last location').'</a> </span></td>');
     } else {
         $r->print('
-            <td><span class="LC_nobreak" <a href="javascript:window.close()" target="_top"><img src="$location/lonIcons/closepage.gif" border="0" alt="('.&mt('Close window').')" valign="bottom" /> '.&mt('Close').'</a> </span></td>');
+            <td><span class="LC_nobreak"> <a href="javascript:window.close()" target="_top"><img src="$location/lonIcons/closepage.gif" border="0" alt="('.&mt('Close window').')" /> '.&mt('Close').'</a> </span></td>');
     }
     $r->print(<<END);
   </tr>
@@ -192,7 +193,7 @@
   </td>
   <td width='100%'> </td>
  </tr>
- <tr height='5'>
+ <tr>
   <td colspan='3' height='5'> </td>
  </tr>
 </table>




More information about the LON-CAPA-cvs mailing list