--- loncom/interface/lonmenu.pm	2003/11/10 15:15:08	1.99
+++ loncom/interface/lonmenu.pm	2003/12/08 20:21:23	1.105
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.99 2003/11/10 15:15:08 www Exp $
+# $Id: lonmenu.pm,v 1.105 2003/12/08 20:21:23 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,6 @@ use Apache::lonnet;
 use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();
 use Apache::loncommon;
-use Apache::File;
 use Apache::lonlocal;
 
 use vars qw(@desklines $readdesk);
@@ -76,6 +75,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>
@@ -255,8 +257,8 @@ sub innerregister {
 	$newmail.='</td></tr></table></font>';
     }
     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%">':'');
-    my $tableend=($noremote?'</table></font>':'');
+    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)) {
@@ -375,8 +377,20 @@ ENDREALRES
 # Registered, textual output
             my $utility=&utilityfunctions();
             my $form=&serverform();
-            my $inlinebuttons=
+	    my $inlinebuttons='';
+
+	    if ($ENV{'browser.interface'} eq 'textual') {
+		$inlinebuttons=
                         join('',map { (defined($_)?$_:'') } @inlineremote);
+	    } else {
+		$inlinebuttons=(<<ENDINLINE);
+<tr><td>$inlineremote[21]</td><td>&nbsp</td><td>$inlineremote[23]</td></tr>
+<tr><td>$inlineremote[61]</td><td>$inlineremote[62]</td><td>$inlineremote[63]</td></tr>
+<tr><td>$inlineremote[71]</td><td>$inlineremote[72]</td><td>$inlineremote[73]</td></tr>
+<tr><td>$inlineremote[81]</td><td>$inlineremote[82]</td><td>$inlineremote[83]</td></tr>
+<tr><td>$inlineremote[91]</td><td>$inlineremote[92]</td><td>$inlineremote[93]</td></tr>
+ENDINLINE
+	    }
 	    $result =(<<ENDREGTEXT);
 <script>
 // BEGIN LON-CAPA Internal
@@ -631,6 +645,7 @@ sub switch {
     $top=&mt($top);
     $bot=&mt($bot);
     $desc=&mt($desc);
+    $img=&mt($img);
     unless (($ENV{'browser.interface'} eq 'textual')  ||
             ($ENV{'environment.remote'} eq 'off')) {
 # Remote
@@ -646,31 +661,45 @@ 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 $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
+       if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
        my $pic=
-	   '<img border="0" alt="'.$text.'" src="/res/adm/pages/'.$img.'" />';
-       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.'">'.
-     '<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>';
+	   '<img border="0" 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')) {
+# 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.'">'.
+		   '<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>';
+	   } else {
+	       $inlineremote[10*$row+$col]="\n<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>';       
+	   }
        } else {
-	   $inlineremote[10*$row+$col]="\n<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>';       
+# Inline Menu
+	   $inlineremote[10*$row+$col]=
+		   '<a href="javascript:'.$act.';">'.$pic.
+		   '</a><font color="'.$font.'" size="2">'.$desc.
+		   '</font>';
        }
    }
     return '';
@@ -866,11 +895,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
 }
@@ -913,7 +942,8 @@ sub handler {
     $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
     $font=&Apache::loncommon::designparm($function.'.font',$domain);
 # ---- Print the screen, pretent to be in text mode to generate text-based menu
-    unless ($ENV{'brower.interface'} eq 'textual') {
+    unless ($ENV{'browser.interface'} eq 'textual') {
+	$ENV{'browser.interface'}='faketextual';
 	$ENV{'environment.remote'}='off';
     }
     my $utility=&utilityfunctions();
@@ -936,15 +966,17 @@ ENDHEADER
 BEGIN {
   if (! defined($readdesk)) {
    {
-    my $config=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
-				  '/mydesk.tab');
-    while (my $configline=<$config>) {
-       $configline=(split(/\#/,$configline))[0];
-       $configline=~s/^\s+//;
-       chomp($configline);
-       if ($configline) {
-          $desklines[$#desklines+1]=$configline;
-       }
+    my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab';
+    if ( CORE::open( my $config,"<$tabfile") ) {
+        while (my $configline=<$config>) {
+            $configline=(split(/\#/,$configline))[0];
+            $configline=~s/^\s+//;
+            chomp($configline);
+            if ($configline) {
+                $desklines[$#desklines+1]=$configline;
+            }
+        }
+        CORE::close($config);
     }
    }
    $readdesk='done';