--- loncom/interface/lonmenu.pm	2003/11/01 16:37:21	1.97
+++ loncom/interface/lonmenu.pm	2003/11/10 15:15:08	1.99
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.97 2003/11/01 16:37:21 www Exp $
+# $Id: lonmenu.pm,v 1.99 2003/11/10 15:15:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,7 +66,6 @@ sub initlittle {
 # ============================= This gets called at the top of the body section
 
 sub menubuttons {
-    &Apache::lonlocal::reroutetrans();
     my $forcereg=shift;
     my $target  =shift;
     my $registration=shift;
@@ -149,7 +148,7 @@ ENDRELOAD
 <script>
 // BEGIN LON-CAPA Internal
 </script>
-<table bgcolor="$pgbg" width="100%" border="0" cellpadding="3" cellspacing="3">
+<font face="Arial,Helvetica,sans-serif"><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>
@@ -164,6 +163,7 @@ $navmaps
 <b>LON-CAPA</b></td>
 </tr>
 </table>
+</font>
 <script>
 // END LON-CAPA Internal
 </script>
@@ -177,7 +177,6 @@ ENDINLINEMENU
 # ====================================== This gets called in the header section
 
 sub registerurl {
-    &Apache::lonlocal::reroutetrans();
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
@@ -213,7 +212,6 @@ sub registerurl {
 # =========== and in the body of the document
 
 sub innerregister {
-    &Apache::lonlocal::reroutetrans();
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
@@ -233,7 +231,7 @@ sub innerregister {
 
     my $newmail='';
     if ($noremote) {
-	$newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%"><tr><td bgcolor="'.$tabbg.'">';
+	$newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';
     }
     if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
 	my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'});
@@ -254,11 +252,11 @@ sub innerregister {
                           'swmenu.setstatus("you have","messages");');
     }
     if ($noremote) {
-	$newmail.='</td></tr></table>';
+	$newmail.='</td></tr></table></font>';
     }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
-    my $tablestart=($noremote?'<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%">':'');
-    my $tableend=($noremote?'</table>':'');
+    my $tablestart=($noremote?'<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%">':'');
+    my $tableend=($noremote?'</table></font>':'');
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
     if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
@@ -655,21 +653,24 @@ sub switch {
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
        $text=~s/\s*\-\s*//gs;
+       my $pic=
+	   '<img border="0" alt="'.$text.'" src="/res/adm/pages/'.$img.'" />';
        if ($nobreak==3) {
 	   $inlineremote[10*$row+$col]="\n".
-     '<td width="50%" colspan="2" align="right" bgcolor="'.$tabbg.'">'.
-     '<a href="javascript:'.$act.';"><font color="'.$font.'" size="+1">'.$text.
-     '</font></a></td></tr>';
+     '<td width="40%" align="right"><font color="'.$font.'" size="+1">'.$text.
+     '</font></td><td width="10%" align="right" bgcolor="'.$tabbg.'">'.
+     '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
        } elsif ($nobreak) {
 	   $inlineremote[10*$row+$col]="\n<tr>".
-     '<td width="50%" colspan="2" align="left" bgcolor="'.$tabbg.'">'.
-     '<a href="javascript:'.$act.';"><font color="'.$font.'" size="+1">'.$text.
-     '</font></a></td>';
+     '<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>';
        } else {
 	   $inlineremote[10*$row+$col]="\n<tr>".
-     '<td width="50%" colspan="4" align="left" bgcolor="'.$tabbg.'">'.
-     '<a href="javascript:'.$act.';"><font color="'.$font.'">'.$desc.
-     '</font></a></td></tr>';       
+     '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
+     '<a href="javascript:'.$act.';">'.$pic.
+     '</a></td><td colspan="3"><font color="'.$font.'">'.$desc.
+     '</font></td></tr>';       
        }
    }
     return '';
@@ -894,8 +895,6 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
-    &Apache::lonlocal::clearreroutetrans();
-
     my $form=&serverform();
     my $bodytag=&Apache::loncommon::bodytag('Main Menu');
     my $function='student';
@@ -928,7 +927,6 @@ $utility
 $bodytag
 ENDHEADER
     $r->print('<table>'.&inlinemenu().'</table>'.$form);
-    $r->print(&Apache::lonlocal::endreroutetrans());
     $r->print('</body></html>');
     return OK;
 }