--- loncom/interface/lonmainmenu.pm	2006/04/10 18:35:04	1.2
+++ loncom/interface/lonmainmenu.pm	2009/05/27 16:54:57	1.7
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # displays the main menu
 #
-# $Id: lonmainmenu.pm,v 1.2 2006/04/10 18:35:04 albertel Exp $
+# $Id: lonmainmenu.pm,v 1.7 2009/05/27 16:54:57 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,27 +52,10 @@ sub handler {
     return OK if $r->header_only;
 
     my $form;
-    if ($env{'environment.remote'} ne 'off' &&
-	$env{'browser.interface'} ne 'textual') {
+    if ($env{'environment.remote'} ne 'off') {
 	$form=&Apache::lonmenu::serverform();
     }
-    my $function='student';
-    if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
-	$function='coordinator';
-    }
-    if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
-	$function='admin';
-    }
-    if (($env{'request.role'}=~/^(au|ca)/) ||
-	($env{'request.noversionuri'}=~/^(\/priv|\~)/)) {
-	$function='author';
-    }
-    my $domain=&Apache::loncommon::determinedomain();
-    # FIXME these don't have the effect on the vars in lonmenu
-    # that they used to have
-    my $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
-    my $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
-    my $font=&Apache::loncommon::designparm($function.'.font',$domain);
+
     my $script_tag;
     if ($env{'environment.remote'} ne 'off') {
         my $utility=&Apache::lonmenu::utilityfunctions('/adm/menu');
@@ -83,12 +66,13 @@ $utility
 ENDSCRIPT
     }
 # ---- Print the screen, pretend to be in text mode to generate text-based menu
-    unless ($env{'browser.interface'} eq 'textual') {
-	$env{'browser.interface'}='faketextual';
-	$env{'environment.remote'}='off';
-    }
-    $r->print(&Apache::loncommon::start_page('Main Menu',$script_tag));
-    $r->print('<table>'.&Apache::lonmenu::inlinemenu().'</table>'.$form);
+    $env{'browser.interface'}='faketextual';
+    $env{'environment.remote'}='off';
+
+    $r->print(&Apache::loncommon::start_page( 'Main Menu',
+                                              $script_tag,
+                                              {'bread_crumbs' => 1}));
+    $r->print(&Apache::lonmenu::inlinemenu().$form);
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }