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

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 12 Jul 2005 15:55:08 -0000


albertel		Tue Jul 12 11:55:08 2005 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
  Log:
  - some html cleanups 
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.156 loncom/interface/lonmenu.pm:1.157
--- loncom/interface/lonmenu.pm:1.156	Tue Jul  5 17:30:14 2005
+++ loncom/interface/lonmenu.pm	Tue Jul 12 11:55:06 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.156 2005/07/05 21:30:14 albertel Exp $
+# $Id: lonmenu.pm,v 1.157 2005/07/12 15:55:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -167,7 +167,7 @@
         <a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a>
      </td>
      <td align="right" bgcolor="$tabbg">
-       <img align="right" src="$logo" />
+       <img align="right" src="$logo" alt="Logo" />
        <b>LON-CAPA</b>&nbsp;
      </td>
    </tr>
@@ -216,6 +216,8 @@
         my $form=&serverform();
 	my $utility=&utilityfunctions();
 	my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
+	my $face= 'face="Arial,Helvetica,sans-serif"';
+
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
 // BEGIN LON-CAPA Internal
@@ -223,30 +225,29 @@
 $utility
 // ]]>
 </script>
-<font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
+<table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
 <tr>
 <td bgcolor="$tabbg">
-<a href="/adm/menu" target="_top"><font color="$font">$lt{'main'}</font></a>
+<a href="/adm/menu" target="_top"><font $face color="$font">$lt{'main'}</font></a>
 </td>
 $reloadlink
 $navmaps
 $docs
 <td bgcolor="$tabbg">
 <a href="/adm/remote?action=launch&amp;url=$escurl" target="_top">
-<font color="$font">$lt{'launch'}</font></a></td>
+<font $face color="$font">$lt{'launch'}</font></a></td>
 <td bgcolor="$tabbg">
-<a href="/adm/roles" target="_top"><font color="$font">$lt{'roles'}</font></a>
+<a href="/adm/roles" target="_top"><font $face color="$font">$lt{'roles'}</font></a>
 </td>
 <td bgcolor="$tabbg">
-<a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a>
+<a href="/adm/logout" target="_top"><font $face color="$font">$lt{'exit'}</font></a>
 </td>
 <td bgcolor="$tabbg">
-<img align="right" src="$logo" />
+<img align="right" src="$logo" alt="Logo" />
 <b>LON-CAPA</b></td>
 $form
 </tr>
 </table>
-</font>
 <script type="text/javascript">
 // END LON-CAPA Internal
 </script>
@@ -319,7 +320,7 @@
 
     my $newmail='';
     if ($noremote) {
-	$newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';
+	$newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'"><font face="Arial,Helvetica,sans-serif">';
     }
     if (($textual) && ($env{'request.symb'}) && ($env{'request.course.id'})) {
 	my ($mapurl,$rid,$resurl)=
@@ -344,7 +345,7 @@
         $newmail = $titletable;
     } else {
 	if ($noremote) {
-	    $newmail.='</td></tr></table></font>';
+	    $newmail.='</font></td></tr></table>';
 	}
     }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
@@ -1142,7 +1143,6 @@
 
 sub serverform {
     return(<<ENDSERVERFORM);
-
 <form name="server" action="/adm/logout" method="post" target="_top">
 <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />