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

[albertel]

albertel		Thu Jul 14 17:37:25 2005 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
  Log:
  - missed some font tags BUG#4241
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.157 loncom/interface/lonmenu.pm:1.158
--- loncom/interface/lonmenu.pm:1.157	Tue Jul 12 11:55:06 2005
+++ loncom/interface/lonmenu.pm	Thu Jul 14 17:37:22 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.157 2005/07/12 15:55:06 albertel Exp $
+# $Id: lonmenu.pm,v 1.158 2005/07/14 21:37:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -84,6 +84,7 @@
     my $docs='';
     my $escurl=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
     my $escsymb=&Apache::lonnet::escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
+    my $face= 'face="Arial,Helvetica,sans-serif"';
     if ($env{'request.state'} eq 'construct') {
         if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
             my $returnurl = $env{'request.filename'};
@@ -106,12 +107,12 @@
          ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);
-<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a>
+<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a>
 ENDRELOAD
             }
 	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
                $docs=(<<ENDDOCS);
-<a href="/adm/coursedocs" target="_top"><font color="$font">$lt{'docs'}</font></a>
+<a href="/adm/coursedocs" target="_top"><font $face color="$font">$lt{'docs'}</font></a>
 ENDDOCS
             }
 	}
@@ -124,8 +125,8 @@
 </script>
 <a href="/adm/menu" target="_top">$lt{'main'}</a>
 $reloadlink $navmaps $docs
-<a href="/adm/roles" target="_top"><font color="$font">$lt{'roles'}</font></a>
-<a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a>
+<a href="/adm/roles" target="_top"><font $face color="$font">$lt{'roles'}</font></a>
+<a href="/adm/logout" target="_top"><font $face color="$font">$lt{'exit'}</font></a>
 <br />
 <script type="text/javascript">
 // END LON-CAPA Internal
@@ -184,12 +185,12 @@
 	    }
 	    $navmaps=(<<ENDNAV);
 <td bgcolor="$tabbg">
-<a href="$link"><font color="$font">$lt{'nav'}</font></a></td>
+<a href="$link"><font $face color="$font">$lt{'nav'}</font></a></td>
 ENDNAV
 	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
 		$docs=(<<ENDDOCS);
 <td bgcolor="$tabbg">
-<a href="/adm/coursedocs"><font color="$font">$lt{'docs'}</font></a></td>
+<a href="/adm/coursedocs"><font $face color="$font">$lt{'docs'}</font></a></td>
 ENDDOCS
             }
 	    if (
@@ -205,7 +206,7 @@
                 my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);
 <td bgcolor="$tabbg">
-<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">$lt{'ret'}</font></a></td>
+<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a></td>
 ENDRELOAD
             }
         }
@@ -216,7 +217,6 @@
         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">