--- loncom/interface/lonmenu.pm	2003/11/07 23:22:21	1.98
+++ loncom/interface/lonmenu.pm	2003/11/11 20:27:15	1.102
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.98 2003/11/07 23:22:21 www Exp $
+# $Id: lonmenu.pm,v 1.102 2003/11/11 20:27:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -76,6 +76,9 @@ sub menubuttons {
     if ($ENV{'browser.interface'} eq 'textual') {
 # Textual display only
 	my %lt=&initlittle();
+        $pgbg='#FFFFFF';
+        $tabbg='#FFFFFF';
+	$font='#000000';
         if ($ENV{'request.course.id'}) {
 	    $navmaps=(<<ENDNAV);
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">$lt{'nav'}</a>
@@ -148,7 +151,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>
@@ -163,6 +166,7 @@ $navmaps
 <b>LON-CAPA</b></td>
 </tr>
 </table>
+</font>
 <script>
 // END LON-CAPA Internal
 </script>
@@ -230,7 +234,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'});
@@ -251,11 +255,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%">':'').($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');
+    my $tableend=($noremote?'</table></font>':'').($textinter?'<a name="content" />':'');
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
     if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
@@ -645,28 +649,31 @@ sub switch {
 	       '<a href="javascript:'.$act.';">'.$text.'</a>';
        } else {
 	   $inlineremote[10*$row+$col]="\n<br />".
-	       '<a href="javascript:'.$act.';">'.$desc.'</a>';
+	       $desc.' <a href="javascript:'.$act.';">'.$text.'</a>';
        }
    } else {
 # Inline Remote
        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 '';
@@ -862,11 +869,11 @@ function gocmd(url,cmd) {
 }
 
 function catalog_info() {
-   loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizeable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+   loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
 }
 
 function chat_win() {
-   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizeable=yes,location=no,menubar=no,toolbar=no');
+   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
 }
 ENDUTILITY
 }