--- loncom/interface/lonmenu.pm	2006/04/20 04:22:38	1.175
+++ loncom/interface/lonmenu.pm	2006/04/21 20:45:42	1.176
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.175 2006/04/20 04:22:38 albertel Exp $
+# $Id: lonmenu.pm,v 1.176 2006/04/21 20:45:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -101,7 +101,7 @@ sub menubuttons {
     my $showgroups=0;
     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'};
@@ -121,8 +121,6 @@ sub menubuttons {
         }
     }
 
-    my ($font,$pgbg,$tabbg) = &get_colors();
-
     if ($env{'browser.interface'} eq 'textual') {
 # Textual display only
         if ($env{'request.course.id'}) {
@@ -134,18 +132,17 @@ ENDNAV
          ($env{'request.noversionuri'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
                 my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);
-<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a>
+<a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
 ENDRELOAD
             }
 	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
                $docs=(<<ENDDOCS);
-<a href="/adm/coursedocs" target="_top"><font $face color="$font">$lt{'docs'}</font></a>
+<a href="/adm/coursedocs" target="_top">$lt{'docs'}</a>
 ENDDOCS
             }
             if ($showgroups) {
                 $groups =(<<ENDGROUPS);
-<td bgcolor="$tabbg">
-<a href="/adm/coursegroups" target="_top"><font $face color="$font">$lt{'groups'}</font></a></td>
+<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td>
 ENDGROUPS
             }
 	}
@@ -156,10 +153,12 @@ ENDGROUPS
 // BEGIN LON-CAPA Internal
 $utility
 </script>
+<div id="LC_top_nav">
 <a href="/adm/menu" target="_top">$lt{'main'}</a>
 $reloadlink $navmaps $docs $groups
-<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>
+<a href="/adm/roles" target="_top">$lt{'roles'}</a>
+<a href="/adm/logout" target="_top">$lt{'exit'}</a>
+</div>
 <br />
 <script type="text/javascript">
 // END LON-CAPA Internal
@@ -182,13 +181,12 @@ ENDMAINMENU
 	if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
 	    my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
 	    return (<<ENDINLINEMENU);
-<font face="Arial,Helvetica,sans-serif">
-   <table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
+   <table id="LC_top_nav">
     <tr>
-      <td bgcolor="$tabbg">
-        <a href="/adm/logout" target="_top"><font color="$font">$lt{'exit'}</font></a>
+      <td>
+        <a href="/adm/logout" target="_top">$lt{'exit'}</a>
      </td>
-     <td align="right" bgcolor="$tabbg">
+     <td align="right">
        <img align="right" src="$logo" alt="Logo" />
        <b>LON-CAPA</b>&nbsp;
      </td>
@@ -205,19 +203,16 @@ ENDINLINEMENU
 		$link="javascript:gonav('".$link."')";
 	    }
 	    $navmaps=(<<ENDNAV);
-<td bgcolor="$tabbg">
-<a href="$link" target="_top"><font $face color="$font">$lt{'nav'}</font></a></td>
+<td><a href="$link" target="_top">$lt{'nav'}</a></td>
 ENDNAV
 	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
 		$docs=(<<ENDDOCS);
-<td bgcolor="$tabbg">
-<a href="/adm/coursedocs" target="_top"><font $face color="$font">$lt{'docs'}</font></a></td>
+<td><a href="/adm/coursedocs" target="_top">$lt{'docs'}</a></td>
 ENDDOCS
             }
             if ($showgroups) {
                 $groups =(<<ENDGROUPS);
-<td bgcolor="$tabbg">
-<a href="/adm/coursegroups" target="_top"><font $face color="$font">$lt{'groups'}</font></a></td>
+<td><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td>
 ENDGROUPS
             }
 	    if (
@@ -232,16 +227,14 @@ ENDGROUPS
 		 ) {
                 my $escreload=&Apache::lonnet::escape('return:');
                 $reloadlink=(<<ENDRELOAD);
-<td bgcolor="$tabbg">
-<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a></td>
+<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
 ENDRELOAD
             }
         }
 	if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
 	    my $escreload=&Apache::lonnet::escape('return:');
 	    $reloadlink=(<<ENDCRELOAD);
-<td bgcolor="$tabbg">
-<a href="/adm/flip?postdata=$escreload" target="_top"><font $face color="$font">$lt{'ret'}</font></a></td>
+<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
 ENDCRELOAD
         }
         my $reg='';
@@ -259,27 +252,17 @@ ENDCRELOAD
 $utility
 // ]]>
 </script>
-<table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
+<table id="LC_top_nav">
 <tr>
-<td bgcolor="$tabbg">
-<a href="/adm/menu" target="_top"><font $face color="$font">$lt{'main'}</font></a>
-</td>
+<td><a href="/adm/menu" target="_top">$lt{'main'}</a></td>
 $reloadlink
 $navmaps
 $docs
 $groups
-<td bgcolor="$tabbg">
-<a href="/adm/remote?action=launch&amp;url=$escurl" target="_top">
-<font $face color="$font">$lt{'launch'}</font></a></td>
-<td bgcolor="$tabbg">
-<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 $face color="$font">$lt{'exit'}</font></a>
-</td>
-<td bgcolor="$tabbg">
-<img align="right" src="$logo" alt="Logo" />
-<b>LON-CAPA</b></td>
+<td><a href="/adm/remote?action=launch&amp;url=$escurl" target="_top">$lt{'launch'}</td>
+<td><a href="/adm/roles" target="_top">$lt{'roles'}</a></td>
+<td><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
+<td><img align="right" src="$logo" alt="Logo" /><b>LON-CAPA</b></td>
 </tr>
 </table>
 $form
@@ -510,7 +493,6 @@ s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&
 ENDREALRES
 	    }
         }
-	    &Apache::lonnet::logthis("menuitems $menuitems");
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);