--- loncom/interface/lonmainmenu.pm	2006/04/07 22:28:40	1.1
+++ loncom/interface/lonmainmenu.pm	2010/03/10 21:25:50	1.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # displays the main menu
 #
-# $Id: lonmainmenu.pm,v 1.1 2006/04/07 22:28:40 albertel Exp $
+# $Id: lonmainmenu.pm,v 1.9 2010/03/10 21:25:50 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,16 +31,14 @@
 # browser.interface - if this is 'textual', it overrides the second parameter
 # and goes to screen reader PDA mode
 #
-# environment.remote - if this is 'on', the routines controll the remote
-# control, otherwise they render the main window controls; ignored it
-# browser.interface is 'textual'
-#
 
 package Apache::lonmainmenu;
 
 use strict;
 use Apache::Constants qw(:common);
 use Apache::loncommon();
+use Apache::lonnet;
+use Apache::lonmenu();
 
 sub handler {
     my $r = shift;
@@ -50,41 +48,15 @@ sub handler {
     return OK if $r->header_only;
 
     my $form;
-    if ($env{'environment.remote'} ne 'off' &&
-	$env{'browser.interface'} ne 'textual') {
-	$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();
-    $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
-    $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
-    $font=&Apache::loncommon::designparm($function.'.font',$domain);
-    my $script_tag;
-    if ($env{'environment.remote'} ne 'off') {
-        my $utility=&Apache::lonmenu::utilityfunctions('/adm/menu');
-        $script_tag=(<<ENDSCRIPT);
-<script type="text/javascript">
-$utility
-</script>
-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);
+# temporarily set interface to "faketextual" and remote to "off", which renders
+# the main menu
+    $env{'browser.interface'}='faketextual';
+
+    $r->print(&Apache::loncommon::start_page( 'Main Menu',
+                                               undef,
+                                              {'bread_crumbs' => 1}));
+    $r->print(&Apache::lonmenu::inlinemenu().$form);
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }