--- loncom/interface/lonmenu.pm	2006/04/21 20:45:42	1.176
+++ loncom/interface/lonmenu.pm	2006/04/21 22:00:56	1.177
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.176 2006/04/21 20:45:42 albertel Exp $
+# $Id: lonmenu.pm,v 1.177 2006/04/21 22:00:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,22 +64,6 @@ sub initlittle {
                                        'groups' => 'Groups');
 }
 
-sub get_colors {
-    my ($font,$pgbg,$tabbg);
-    if ($env{'browser.interface'} eq 'textual') {
-	$pgbg='#FFFFFF';
-        $tabbg='#FFFFFF';
-	$font='#000000';
-    } else {
-	my $domain   =&Apache::loncommon::determinedomain();
-	my $function =&Apache::loncommon::get_users_function();
-	
-        $pgbg  =&Apache::loncommon::designparm($function.'.pgbg', $domain);
-        $tabbg =&Apache::loncommon::designparm($function.'.tabbg',$domain);
-        $font  =&Apache::loncommon::designparm($function.'.font', $domain);
-    }
-    return ($font,$pgbg,$tabbg);
-}
 # ============================= This gets called at the top of the body section
 
 sub menubuttons {
@@ -320,18 +304,26 @@ sub innerregister {
     
     my $textual=($textinter || $noremote);
 
-    @inlineremote=();
-    undef @inlineremote;
+    undef(@inlineremote);
 
     my $reopen=&Apache::lonmenu::reopenmenu();
 
-    my ($font,$pgbg,$tabbg) = &get_colors();
-
     my $newmail='';
     if ($noremote) {
-	$newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'"><font face="Arial,Helvetica,sans-serif">';
+	$newmail='<table id="LC_nav_location"><tr>';
     }
-    if (($textual) && ($env{'request.symb'}) && ($env{'request.course.id'})) {
+    if (&Apache::lonmsg::newmail()) { 
+	if ($textual) {
+	    $newmail.= '<td class="LC_new_mail">
+                   <a href="/adm/communicate" target="_top">'.
+		   &mt('You have new messages').'</a></td>';
+	} else {
+	    $newmail= 'swmenu.setstatus("you have","messages");';
+	}
+    } elsif (($textual) 
+	     && ($env{'request.symb'}) 
+	     && ($env{'request.course.id'})) {
+	$newmail.= '<td class="LC_current_location">';
 	my ($mapurl,$rid,$resurl)=
 	    &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
         $newmail.=$env{'course.'.$env{'request.course.id'}.'.description'};
@@ -343,23 +335,19 @@ sub innerregister {
         if ($restitle) {
 	    $newmail.=': '.$restitle;
         }
-        $newmail.='&nbsp;&nbsp;&nbsp;';
-    }
-    if (&Apache::lonmsg::newmail()) { 
-       $newmail=($textual?
- '<b><a href="/adm/communicate" target="_top">You have new messages</a></b><br />':
-                          'swmenu.setstatus("you have","messages");');
+        $newmail.='&nbsp;&nbsp;&nbsp;</td>';
     }
     if ($env{'request.state'} eq 'construct') {
         $newmail = $titletable;
     } else {
 	if ($noremote) {
-	    $newmail.='</font></td></tr></table>';
+	    $newmail.='</td></tr></table>';
 	}
     }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
-    my $tablestart=($noremote?'<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%">':'').($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');
-    my $tableend=($noremote?'</table></font>':'').($textinter?'<a name="content" />':'');
+    my $tablestart=($noremote?'<table id="LC_menubuttons">':'').
+	($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');
+    my $tableend=($noremote?'</table>':'').($textinter?'<a name="content" />':'');
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
     if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) {
@@ -814,8 +802,6 @@ sub switch {
     $desc=&mt($desc);
     $img=&mt($img);
 
-    my ($font,$pgbg,$tabbg) = &get_colors();
-
     unless (($env{'browser.interface'} eq 'textual')  ||
             ($env{'environment.remote'} eq 'off')) {
 # Remote
@@ -842,34 +828,33 @@ sub switch {
        my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
        if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
        my $pic=
-	   '<img border="0" alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}.
+	   '<img alt="'.$text.'" src="http://'.$ENV{'HTTP_HOST'}.
 	   ':'.$lonhttpdPort.'/res/adm/pages/'.$img.'" align="'.
 	   ($nobreak==3?'right':'left').'" />';
-       if (($env{'browser.interface'} eq 'textual') || ($env{'browser.interface'} eq 'faketextual')) {
+       if ($env{'browser.interface'} eq 'faketextual') {
 # Accessibility
 	   if ($nobreak==3) {
 	       $inlineremote[10*$row+$col]="\n".
-		   '<td width="40%" align="right"><font color="'.$font.'" size="+1">'.$text.
-		   '</font></td><td width="10%" align="right" bgcolor="'.$tabbg.'">'.
+		   '<td class="LC_menubuttons_text" align="right">'.$text.
+		   '</td><td class="LC_menubuttons_img" align="left">'.
 		   '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
 	   } elsif ($nobreak) {
 	       $inlineremote[10*$row+$col]="\n<tr>".
-		   '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
-		   '<a href="javascript:'.$act.';">'.$pic.
-		   '</a></td><td width="40%" align="left"><font color="'.$font.'" size="+1">'.$text.'</font></td>';
+		   '<td class="LC_menubuttons_img" align="left">'.
+		   '<a href="javascript:'.$act.';">'.$pic.'</a></td>
+                    <td class="LC_menubuttons_text" align="left">'.$text.'</td>';
 	   } else {
 	       $inlineremote[10*$row+$col]="\n<tr>".
-		   '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
+		   '<td class="LC_menubuttons_img" align="left">'.
 		   '<a href="javascript:'.$act.';">'.$pic.
-		   '</a></td><td colspan="3"><font color="'.$font.'">'.$desc.
-		   '</font></td></tr>';       
+		   '</a></td><td class="LC_menubuttons_text" colspan="3">'.
+		   $desc.'</td></tr>';
 	   }
        } else {
 # Inline Menu
 	   $inlineremote[10*$row+$col]=
 		   '<a href="javascript:'.$act.';">'.$pic.
-		   '</a><font color="'.$font.'" size="2">'.$desc.
-		   '</font>';
+		   '</a><span class="LC_menubuttons_inline_text">'.$desc.'</span>';
        }
    }
     return '';