--- loncom/interface/lonmenu.pm	2010/01/18 20:47:57	1.244.2.9
+++ loncom/interface/lonmenu.pm	2009/07/09 19:28:36	1.273
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.244.2.9 2010/01/18 20:47:57 raeburn Exp $
+# $Id: lonmenu.pm,v 1.273 2009/07/09 19:28:36 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,15 +26,10 @@
 # http://www.lon-capa.org/
 #
 #
-# There are two parameters controlling the action of this module:
-#
-# browser.interface - if this is 'textual', it overrides the second parameter
-# and goes to screen reader PDA mode
+# There is one parameter controlling the action of this module:
 #
 # 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'
-#
+# control, otherwise they render the main window controls; 
 
 =head1 NAME
 
@@ -51,8 +46,6 @@ described at http://www.lon-capa.org.
 
 =over
 
-=item show_course()
-
 Little texts
 
 =item initlittle()
@@ -144,29 +137,12 @@ use Apache::loncommon();
 use Apache::lonenc();
 use Apache::lonlocal;
 use LONCAPA qw(:DEFAULT :match);
-use HTML::Entities();
 
 use vars qw(@desklines %category_names %category_members %category_positions $readdesk);
 
 
 my @inlineremote;
 
-
-
-sub show_course {
-    my $course = !$env{'user.adv'};
-    if (!$env{'user.adv'}) {
-	foreach my $env (keys(%env)) {
-	    next if ($env !~ m/^user\.priv\./);
-	    if ($env !~ m/^user\.priv\.(?:st|cm)/) {
-		$course = 0;
-		last;
-	    }
-	}
-    }
-    return $course;
-}
-
 sub initlittle {
     return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
 				       'nav' => 'Navigate Contents',
@@ -179,7 +155,7 @@ sub initlittle {
                                        'login' => 'Log In',
 				       'launch' => 'Launch Remote Control',
                                        'groups' => 'Groups',
-                                       'gdoc' => 'Community Documents',
+                                       'gdoc' => 'Group Documents',
                                        );
 }
 
@@ -207,8 +183,8 @@ sub menubuttons {
     my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
 
     my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
-    $logo = '<td class="LC_top_nav_logo"><a href="/adm/about.html"><img src="'.
-	$logo.'" alt="LON-CAPA Logo" /></a></td>';
+    $logo = '<a href="/adm/about.html"><img src="'.
+	$logo.'" alt="LON-CAPA Logo" class="LC_noBorder" /></a>';
 
     if ($env{'request.state'} eq 'construct') {
         if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
@@ -235,78 +211,28 @@ sub menubuttons {
         }
     }
 
-    if ($env{'browser.interface'} eq 'textual') {
-# Textual display only
-        if ($env{'request.course.id'}) {
-	    $navmaps=(<<ENDNAV);
-<a href="/adm/navmaps?postdata=$escurl&amp;postsymb=$escsymb" target="_top">$lt{'nav'}</a>
-ENDNAV
-            if (&show_return_link()) {
-                my $escreload=&escape('return:');
-                $reloadlink=(<<ENDRELOAD);
-<a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a>
-ENDRELOAD
-            }
-            my $is_community =
-                (&Apache::loncommon::course_type() eq 'Community');
-            if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-                my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
-                $docs=(<<ENDDOCS);
-<a href="/adm/coursedocs" target="_top">$text</a>
-ENDDOCS
-            }
-            if ($showgroups) {
-                $groups =(<<ENDGROUPS);
-<a href="/adm/coursegroups" target="_top">$lt{'groups'}</a>
-ENDGROUPS
-            }
-	}
-        my $form=&serverform();
-        my $utility=&utilityfunctions();
-	my $output=(<<ENDMAINMENU);
-<script type="text/javascript">
-// BEGIN LON-CAPA Internal
-$utility
-</script>
-<div id="LC_top_nav">
-<a href="/adm/menu" target="_top">$lt{'main'}</a>
-$reloadlink $navmaps $docs $groups $roles
-<a href="/adm/logout" target="_top">$lt{'exit'}</a>
-</div>
-<br />
-<script type="text/javascript">
-// END LON-CAPA Internal
-</script>
-$form
-ENDMAINMENU
-        if ($registration) { $output.=&innerregister($forcereg); }
-	return $output."<hr />";
-    } elsif ($env{'environment.remote'} eq 'off') {
+    if ($env{'environment.remote'} eq 'off') {
 # Remote Control is switched off
 # figure out colors
-	my %lt=&initlittle();
+        my %lt=&initlittle();
 
         my $domain=&Apache::loncommon::determinedomain();
-	my $function =&Apache::loncommon::get_users_function();
+        my $function =&Apache::loncommon::get_users_function();
         my $link=&Apache::loncommon::designparm($function.'.link',$domain);
         my $alink=&Apache::loncommon::designparm($function.'.alink',$domain);
         my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain);
         my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
-	if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
-	    return (<<ENDINLINEMENU);
-   <table id="LC_top_nav">
-    <tr>
-      $logo
-      <td></td>
-      <td class="LC_top_nav_login">
-        <a href="/adm/roles" target="_top">$lt{'login'}</a>
-     </td>
-    </tr>
-  </table>
-</font>
+
+        if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+            return (<<ENDINLINEMENU);
+            <ol class="LC_smallMenu LC_right">
+                <li>$logo</li>
+                <li><a href="/adm/roles" target="_top">$lt{'login'}</a></li>
+            </ol>
+            <hr />
 ENDINLINEMENU
         }
-        $roles = '<td><a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a></td>';
+        $roles = '<a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a>';
 # Do we have a NAV link?
         if ($env{'request.course.id'}) {
 	    my $link='/adm/navmaps?postdata='.$escurl.'&amp;postsymb='.
@@ -315,35 +241,35 @@ ENDINLINEMENU
 		$link="javascript:gonav('".$link."')";
 	    }
 	    $navmaps=(<<ENDNAV);
-<td><a href="$link" target="_top">$lt{'nav'}</a></td>
+<li><a href="$link" target="_top">$lt{'nav'}</a></li>
 ENDNAV
-            my $is_community =
-                (&Apache::loncommon::course_type() eq 'Community');
+            my $is_group = (&Apache::loncommon::course_type() eq 'Group');
 	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-                my $text = ($is_community) ? $lt{'gdoc'} : $lt{'docs'};
+                my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'};
 		$docs=(<<ENDDOCS);
-<td><a href="/adm/coursedocs" target="_top">$text</a></td>
+<li><a href="/adm/coursedocs" target="_top">$text</a></li>
 ENDDOCS
             }
             if ($showgroups) {
                 $groups =(<<ENDGROUPS);
-<td><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td>
+<li><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></li>
 ENDGROUPS
             }
 	    if (&show_return_link()) {
                 my $escreload=&escape('return:');
                 $reloadlink=(<<ENDRELOAD);
-<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
+<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li>
 ENDRELOAD
             }
             if ($role_selector) {
-                $roles = '<td>'.$role_selector.'</td><td><a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></td>';
+            	#$roles = '<td>'.$role_selector.'</td><td><a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></td>';
+				$role_selector = '<li>'.$role_selector.'</li>';
             }
         }
 	if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
 	    my $escreload=&escape('return:');
 	    $reloadlink=(<<ENDCRELOAD);
-<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
+<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li>
 ENDCRELOAD
         }
         my $reg='';
@@ -353,27 +279,35 @@ ENDCRELOAD
         my $form=&serverform();
 	my $utility=&utilityfunctions();
 
+	my $messagelink = "";
+	if(&Apache::lonmsg::mynewmail()){
+		$messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message(new)</a>'
+	}else{
+		$messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message</a>'
+	}
         my $helplink=&Apache::loncommon::top_nav_help('Help');
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
-// <![CDATA[
 // BEGIN LON-CAPA Internal
+// <![CDATA[
 $utility
 // ]]>
 </script>
-<table id="LC_top_nav">
-<tr>
-$logo
-<td><a href="/adm/menu" target="_top">$lt{'main'}</a></td>
+<ol class="LC_smallMenu LC_right">
+	<li>$logo</li>
+	<li>$messagelink</li>
+	<li>$roles</li>
+	<li>$helplink</li>
+	<li><a href="/adm/logout" target="_top">$lt{'exit'}</a></li>
+</ol>
+<ul id="LC_TabMainMenuContent">
+<li><a href="/adm/menu" target="_top">$lt{'main'}</a></li>
 $reloadlink
 $navmaps
 $docs
 $groups
-$roles
-<td class="LC_top_nav_help">$helplink</td>
-<td class="LC_top_nav_exit"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
-</tr>
-</table>
+$role_selector
+</ul>
 $form
 <script type="text/javascript">
 // END LON-CAPA Internal
@@ -407,16 +341,13 @@ sub registerurl {
     if ($env{'request.state'} eq 'construct') {
 	$force_title=&Apache::lonxml::display_title();
     }
-    if (($env{'browser.interface'} eq 'textual') ||
-        ($env{'environment.remote'} eq 'off') ||
+    if (($env{'environment.remote'} eq 'off') ||
         ((($env{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map(
 	   &unescape($env{'request.noversionuri'})))) &&
         (!$forcereg))) {
  	return $result.
-               '<script type="text/javascript">'."\n".
-               'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n".
-               '</script>'.$force_title;
+          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
     }
 # Graphical display after login only
     if ($env{'request.registered'} && !$forcereg) { return ''; }
@@ -435,57 +366,50 @@ sub innerregister {
 
     $env{'request.registered'} = 1;
 
-    my $textinter=($env{'browser.interface'} eq 'textual');
-    my $noremote=($env{'environment.remote'} eq 'off');
+    my $noremote = ($env{'environment.remote'} eq 'off');
     
-    my $textual=($textinter || $noremote);
-
     undef(@inlineremote);
 
     my $reopen=&Apache::lonmenu::reopenmenu();
 
     my $newmail='';
-    if ($noremote) {
-	$newmail='<table id="LC_nav_location"><tr>';
-    }
-    if (&Apache::lonmsg::newmail()) { 
-	if ($textual) {
-	    $newmail.= '<td class="LC_new_mail">
-                   <a href="/adm/communicate" target="_top">'.
-		   &mt('You have new messages').'</a></td>';
-	} else {
-	    $newmail= 'swmenu.setstatus("you have","messages");';
-	}
+    my $breadcrumb;
+
+    if (&Apache::lonmsg::newmail() && !$noremote) { 
+        # We have new mail and remote is up
+        $newmail= 'swmenu.setstatus("you have","messages");';
     } 
-    if (($textual) 
+    if ($noremote
 	     && ($env{'request.symb'}) 
 	     && ($env{'request.course.id'})) {
-	$newmail.= '<td class="LC_current_location">';
-	my ($mapurl,$rid,$resurl)=
-	    &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
-        my $coursetitle=$env{'course.'.$env{'request.course.id'}.'.description'};
-        $newmail.=$coursetitle;
-        my $maptitle=&Apache::lonnet::gettitle($mapurl);
-	my $restitle=&Apache::lonnet::gettitle(&Apache::lonnet::symbread());
-        if ($maptitle && ($maptitle ne 'default.sequence') && ($maptitle ne $coursetitle)) {
-	    $newmail.=', '.$maptitle;
-        }
-        if ($restitle) {
-	    $newmail.=': '.$restitle;
-        }
-        $newmail.='&nbsp;&nbsp;&nbsp;</td>';
+
+        my ($mapurl,$rid,$resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
+        my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};
+
+        my $maptitle = &Apache::lonnet::gettitle($mapurl);
+        my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());
+        my @crumbs = ({text  => "Course Content", 
+                       href  => "Javascript:gonav('/adm/navmaps')"}, 
+                      {text  => '...',
+                       no_mt => 1});
+
+        push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle 
+                                                   && $maptitle ne 'default.sequence' 
+                                                   && $maptitle ne $coursetitle);
+
+        push @crumbs, {text => $restitle, no_mt => 1} if $restitle; 
+
+        Apache::lonhtmlcommon::clear_breadcrumbs();
+        Apache::lonhtmlcommon::add_breadcrumb(@crumbs);
+        $breadcrumb .= Apache::lonhtmlcommon::breadcrumbs(undef,undef,0);
+        #
     }
     if ($env{'request.state'} eq 'construct') {
         $newmail = $titletable;
-    } else {
-	if ($noremote) {
-	    $newmail.='</tr></table>';
-	}
-    }
-    my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
-    my $tablestart=($noremote?'<table id="LC_menubuttons">':'').
-	($textinter?'<br /><a href="#content">'.&mt('Skip to Content').'</a><br />':'');
-    my $tableend=($noremote?'</table>':'').($textinter?'<a name="content" />':'');
+    } 
+    my $timesync   = ( $noremote ? '' : 'swmenu.syncclock(1000*'.time.');' );
+    my $tablestart = ( $noremote ? '<table id="LC_menubuttons">' : '');
+    my $tableend   = ( $noremote ? '</table>' : '');
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
     if (($env{'request.noversionuri'}!~m|^/(res/)*adm/|) || ($forcereg)) {
@@ -566,19 +490,24 @@ sub innerregister {
             my $uploaded;
             if ($env{'request.filename'}) {
                 my $file=&Apache::lonnet::declutter($env{'request.filename'});
-                $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/;
-                # Check that the user has permission to edit this resource
-                ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
-                if (defined($cfudom)) {
-		    my $home=&Apache::lonnet::homeserver($cfuname,$cfudom);
-		    my $allowed=0;
-		    my @ids=&Apache::lonnet::current_machine_ids();
-		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
-		    if ($allowed) {
-                        $cfile=$file;
+                if (defined($cnum) && defined($cdom)) {
+                    $uploaded = &is_course_upload($file,$cnum,$cdom);
+                }
+                if (!$uploaded) {
+                    $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/;
+                    # Check that the user has permission to edit this resource
+                    ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
+                    if (defined($cfudom)) {
+		        my $home=&Apache::lonnet::homeserver($cfuname,$cfudom);
+		        my $allowed=0;
+		        my @ids=&Apache::lonnet::current_machine_ids();
+		        foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+		        if ($allowed) {
+                            $cfile=$file;
+                        }
                     }
                 }
-            }        
+            }
             # Finally, turn the button on or off
             if ($cfile && !$const_space) {
                 $editbutton=&switch
@@ -589,7 +518,7 @@ sub innerregister {
                 $editbutton=&clear(6,1);
             }
         }
-        if (($noeditbutton) && ($env{'request.filename'})) {
+        if (($noeditbutton) && ($env{'request.filename'})) { 
             if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
                 my $file=&Apache::lonnet::declutter($env{'request.filename'});
                 if (defined($cnum) && defined($cdom)) {
@@ -616,7 +545,7 @@ sub innerregister {
             if ($currdir =~ m-/$-) {
                 $is_const_dir = 1;
             } else {
-                $currdir =~ s#[^/]+$##;
+                $currdir =~ s|[^/]+$||;
 		my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn);
 		my $esc_currdir = &Apache::loncommon::escape_single($currdir);
                 $menuitems=(<<ENDMENUITEMS);
@@ -652,13 +581,6 @@ if(length($annotation) > 0){
 $menuitems.="&anno-[_1]&tations[_1]&annotate()&";
 $menuitems.="Make notes and annotations about this resource&&1\n";
 
-            unless ($noremote) {
-                my $showreqcrs = &check_for_rcrs();
-                if ($showreqcrs) {
-                    $menuitems.="s&8&1&rcrs.gif&request[_1]&course[_16]".
-                                "&go('/adm/requestcourse')&Course requests\n";
-                }
-            }
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
 		if (!$env{'request.enc'}) {
 		    $menuitems.=(<<ENDREALRES);
@@ -695,16 +617,12 @@ ENDMENUITEMS
             }
         }
 
-        if ($textual) {
+        if ($noremote) {
 	    my $addremote=0;
-	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; } }
+	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
 	    my $inlinebuttons='';
 	    if ($addremote) {
-# Registered, textual output
-		if ($env{'browser.interface'} eq 'textual') {
-		    $inlinebuttons=
-                        join('',map { (defined($_)?$_:'') } @inlineremote);
-		} else {
+            # Registered, textual output
                     if ($env{'environment.icons'} eq 'iconsonly') {
                         $inlinebuttons=(<<ENDARROWSINLINE);
 <tr><td>
@@ -736,13 +654,13 @@ ENDLINE
 			    }
 			}
 		    }
-		}
 	    }
 	    $result =(<<ENDREGTEXT);
 <script type="text/javascript">
 // BEGIN LON-CAPA Internal
 </script>
 $timesync
+$breadcrumb
 $tablestart
 $inlinebuttons
 $tableend
@@ -764,7 +682,6 @@ ENDREGTEXT
 	    $result = (<<ENDREGTHIS);
      
 <script type="text/javascript">
-// <![CDATA[
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -800,23 +717,21 @@ var swmenu=null;
       }
 
 // END LON-CAPA Internal 
-// ]]>
 </script>
 ENDREGTHIS
         }
 # =============================================================================
     } else {
 # ========================================== This can or will not be registered
-        if ($textual) {
-# Not registered, textual
-	    $result= (<<ENDDONOTREGTEXT);
+        if ($noremote) {
+# Not registered
+            $result= (<<ENDDONOTREGTEXT);
 ENDDONOTREGTEXT
         } else {
 # Not registered, graphical
            $result = (<<ENDDONOTREGTHIS);
 
 <script type="text/javascript">
-// <![CDATA[
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
@@ -841,7 +756,6 @@ var swmenu=null;
     }
 
 // END LON-CAPA Internal
-// ]]>
 </script>
 ENDDONOTREGTHIS
        }
@@ -901,8 +815,7 @@ sub unloadevents() {
 
 sub startupremote {
     my ($lowerurl)=@_;
-    if (($env{'browser.interface'} eq 'textual') ||
-        ($env{'environment.remote'} eq 'off')) {
+    if ($env{'environment.remote'} eq 'off') {
      return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />');
     }
 #
@@ -913,7 +826,6 @@ sub startupremote {
     my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
     return(<<ENDREMOTESTARTUP);
 <script type="text/javascript">
-// <![CDATA[
 var timestart;
 function wheelswitch() {
     if (typeof(document.wheel) != 'undefined') {
@@ -963,7 +875,7 @@ function main() {
    timestart=date.getTime();
    wait();
 }
-// ]]>
+
 </script>
 ENDREMOTESTARTUP
 }
@@ -971,22 +883,17 @@ ENDREMOTESTARTUP
 sub setflags() {
     return(<<ENDSETFLAGS);
 <script type="text/javascript">
-// <![CDATA[
     menuloaded=0;
     tim=0;
-// ]]>
 </script>
 ENDSETFLAGS
 }
 
 sub maincall() {
-    if (($env{'browser.interface'} eq 'textual') ||
-        ($env{'environment.remote'} eq 'off')) { return ''; }
+    if ($env{'environment.remote'} eq 'off') { return ''; }
     return(<<ENDMAINCALL);
 <script type="text/javascript">
-// <![CDATA[
     main();
-// ]]>
 </script>
 ENDMAINCALL
 }
@@ -994,13 +901,12 @@ ENDMAINCALL
 sub load_remote_msg {
     my ($lowerurl)=@_;
 
-    if (($env{'browser.interface'} eq 'textual') ||
-        ($env{'environment.remote'} eq 'off')) { return ''; }
+    if ($env{'environment.remote'} eq 'off') { return ''; }
 
     my $esclowerurl=&escape($lowerurl);
-    my $link=&mt('[_1]Continue[_2] on in Inline Menu mode',
-		 '<a href="/adm/remote?action=collapse&amp;url='.$esclowerurl.'">',
-                 '</a>');
+    my $link=&mt('[_1]Continue[_2] on in Inline Menu mode'
+                ,'<a href="/adm/remote?action=collapse&amp;url='.$esclowerurl.'">'
+                ,'</a>');
     return(<<ENDREMOTEFORM);
 <p>
 <form name="wheel">
@@ -1019,8 +925,7 @@ sub get_menu_name {
 
 
 sub reopenmenu {
-   if (($env{'browser.interface'} eq 'textual') ||
-       ($env{'environment.remote'} eq 'off')) { return ''; }
+   if ($env{'environment.remote'} eq 'off') { return ''; }
    my $menuname = &get_menu_name();
    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
    return('window.open('.$nothing.',"'.$menuname.'","",false);');
@@ -1029,14 +934,8 @@ sub reopenmenu {
 
 sub open {
     my $returnval='';
-    if (($env{'browser.interface'} eq 'textual') ||
-        ($env{'environment.remote'} eq 'off')) { 
-	return 
-         '<script type="text/javascript">'."\n".
-         '// <![CDATA['."\n".
-         'self.name="loncapaclient";'."\n".
-         '// ]]>'."\n".
-         '</script>';
+    if ($env{'environment.remote'} eq 'off') { 
+	return '<script type="text/javascript">self.name="loncapaclient";</script>';
     }
     my $menuname = &get_menu_name();
     
@@ -1049,13 +948,11 @@ sub open {
 #}
 #ENDRESIZE
 #    }
-    $returnval=(<<ENDOPEN);
-// <![CDATA[
+    $returnval.=(<<ENDOPEN);
 window.status='Opening LON-CAPA Remote Control';
-var menu=window.open("/res/adm/pages/menu.html","$menuname",
+var menu=window.open("/res/adm/pages/menu.html?inhibitmenu=yes","$menuname",
 "height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
 self.name='loncapaclient';
-// ]]>
 ENDOPEN
     return '<script type="text/javascript">'.$returnval.'</script>';
 }
@@ -1065,8 +962,7 @@ ENDOPEN
 
 sub clear {
     my ($row,$col)=@_;
-    unless (($env{'browser.interface'} eq 'textual') ||
-            ($env{'environment.remote'} eq 'off')) {
+    unless ($env{'environment.remote'} eq 'off') {
        return "\n".qq(window.status+='.';swmenu.clearbut($row,$col););
    } else { 
        $inlineremote[10*$row+$col]='';
@@ -1091,23 +987,10 @@ sub switch {
     my $idx=10*$row+$col;
     $category_members{$cat}.=':'.$idx;
 
-    unless (($env{'browser.interface'} eq 'textual')  ||
-            ($env{'environment.remote'} eq 'off')) {
+    unless ($env{'environment.remote'} eq 'off') {
 # Remote
        return "\n".
  qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
-   } elsif ($env{'browser.interface'} eq 'textual') {
-# Accessibility
-       if ($nobreak==2) { return ''; }
-       my $text=$top.' '.$bot;
-       $text=~s/\s*\-\s*//gs;
-       if ($nobreak) {
-	   $inlineremote[$idx]=
-	       '<a href="javascript:'.$act.';">'.$text.'</a>';
-       } else {
-	   $inlineremote[$idx]="\n<br />".
-	       $desc.' <a href="javascript:'.$act.';">'.$text.'</a>';
-       }
    } else {
 # Inline Remote
        if ($env{'environment.icons'} ne 'classic') {
@@ -1120,22 +1003,22 @@ sub switch {
        my $pic=
 	   '<img alt="'.$text.'" src="'.
 	   &Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img).
-	   '" align="'.($nobreak==3?'right':'left').'" />';
+	   '" align="'.($nobreak==3?'right':'left').'" class="LC_noBorder" />';
        if ($env{'browser.interface'} eq 'faketextual') {
 # Accessibility
 	   if ($nobreak==3) {
 	       $inlineremote[$idx]="\n".
 		   '<td class="LC_menubuttons_text" align="right">'.$text.
-		   '</td><td class="LC_menubuttons_img" align="left">'.
+		   '</td><td align="left">'.
 		   '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
 	   } elsif ($nobreak) {
 	       $inlineremote[$idx]="\n<tr>".
-		   '<td class="LC_menubuttons_img" align="left">'.
+		   '<td align="left">'.
 		   '<a href="javascript:'.$act.';">'.$pic.'</a></td>
                     <td class="LC_menubuttons_text" align="left"><a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$text.'</span></a></td>';
 	   } else {
 	       $inlineremote[$idx]="\n<tr>".
-		   '<td class="LC_menubuttons_img" align="left">'.
+		   '<td align="left">'.
 		   '<a href="javascript:'.$act.';">'.$pic.
 		   '</a></td><td class="LC_menubuttons_text" colspan="3">'.
 		   '<a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$desc.'</span></a></td></tr>';
@@ -1170,8 +1053,7 @@ sub secondlevel {
 
 sub openmenu {
     my $menuname = &get_menu_name();
-    if (($env{'browser.interface'} eq 'textual') ||
-        ($env{'environment.remote'} eq 'off')) { return ''; }
+    if ($env{'environment.remote'} eq 'off') { return ''; }
     my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
     return "window.open(".$nothing.",'".$menuname."');";
 }
@@ -1186,10 +1068,10 @@ sub inlinemenu {
         for (my $row=1; $row<=8; $row++) {
             foreach my $cat (keys(%category_members)) {
                if ($category_positions{$cat} ne "$col,$row") { next; }
-               #$output.='<table id="LC_menubuttons_mainmenu"><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
-               $output.='<fieldset id="LC_mainmenu_fieldset">';
-	       $output.='<legend class="LC_mainmenu_fieldset_category">'.&mt($category_names{$cat}).'</legend>';
-               $output.='<table id="LC_menubuttons_mainmenu">';
+               #$output.='<table><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
+               $output.='<div class="LC_Box">';
+	       $output.='<h4 class="LC_hcell">'.&mt($category_names{$cat}).'</h4>';
+               $output.='<table>';
                my %active=();
                foreach my $menu_item (split(/\:/,$category_members{$cat})) {
                   if ($inlineremote[$menu_item]) {
@@ -1200,7 +1082,7 @@ sub inlinemenu {
                   $output.=$inlineremote[$item];
                }
                $output.='</table>';
-               $output.='</fieldset>';
+               $output.='</div>';
             }
          }
          $output.="</td>";
@@ -1212,8 +1094,7 @@ sub inlinemenu {
 sub rawconfig {
     my $textualoverride=shift;
     my $output='';
-    unless (($env{'browser.interface'} eq 'textual') ||
-            ($env{'environment.remote'} eq 'off')) {
+    unless ($env{'environment.remote'} eq 'off') {
        $output.=
  "window.status='Opening Remote Control';var swmenu=".&openmenu().
 "\nwindow.status='Configuring Remote Control ';";
@@ -1326,14 +1207,16 @@ sub rawconfig {
                     $output.=&clear($row,$col);
                     next;
                 }
-            } elsif (($prt eq 'reqcrsnsc') || ($prt eq 'reqcrsshc')) {
-                if (($prt eq 'reqcrsnsc') && ($show_course))   {
-                    next;
-                }
-                if (($prt eq 'reqcrsshc') && (!$show_course)) {
-                    next;
+            } elsif ($prt eq 'reqcrs') {
+                my $showreqcrs = 0;
+                foreach my $type ('official','unofficial') {
+                    if (&Apache::lonnet::usertools_access($env{'user.name'},
+                                                    $env{'user.domain'},
+                                                    $type,undef,'requestcourses')) {
+                        $showreqcrs = 1;
+                        last;
+                    }
                 }
-                my $showreqcrs = &check_for_rcrs();
                 if (!$showreqcrs) {
                     $output.=&clear($row,$col);
                     next;
@@ -1342,11 +1225,9 @@ sub rawconfig {
             $prt='any';
             $output.=&secondlevel(
           $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
-
         }
     }
-    unless (($env{'browser.interface'} eq 'textual') ||
-            ($env{'environment.remote'} eq 'off')) {
+    unless ($env{'environment.remote'} eq 'off') {
        $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';";
        if (&Apache::lonmsg::newmail()) { 
 	   $output.='swmenu.setstatus("you have","messages");';
@@ -1356,37 +1237,13 @@ sub rawconfig {
     return $output;
 }
 
-sub check_for_rcrs {
-    my $showreqcrs = 0;
-    my @reqtypes = ('official','unofficial','community');
-    foreach my $type (@reqtypes) {
-        if (&Apache::lonnet::usertools_access($env{'user.name'},
-                                              $env{'user.domain'},
-                                              $type,undef,'requestcourses')) {
-            $showreqcrs = 1;
-            last;
-        }
-    }
-    if (!$showreqcrs) {
-        foreach my $type (@reqtypes) {
-            if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
-                $showreqcrs = 1;
-                last;
-            }
-        }
-    }
-    return $showreqcrs;
-}
-
 # ======================================================================= Close
 
 sub close {
-    if (($env{'browser.interface'} eq 'textual') ||
-        ($env{'environment.remote'} eq 'off')) { return ''; }
+    if ($env{'environment.remote'} eq 'off') { return ''; }
     my $menuname = &get_menu_name();
     return(<<ENDCLOSE);
 <script type="text/javascript">
-// <![CDATA[
 window.status='Accessing Remote Control';
 menu=window.open("/adm/rat/empty.html","$menuname",
                  "height=350,width=150,scrollbars=no,menubar=no");
@@ -1396,7 +1253,6 @@ menu.autologout=0;
 window.status='Closing Remote Control';
 menu.close();
 window.status='Done.';
-// ]]>
 </script>
 ENDCLOSE
 }
@@ -1426,8 +1282,10 @@ NAVCONTROL
 
 sub utilityfunctions {
     my $caller = shift;
-    unless (($env{'browser.interface'} eq 'textual')  ||
-        ($env{'environment.remote'} eq 'off') || ($caller eq '/adm/menu')) { return ''; }
+    unless ($env{'environment.remote'} eq 'off' || 
+            $caller eq '/adm/menu') { 
+            return ''; }
+            
     my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
     $currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
     
@@ -1586,7 +1444,7 @@ function set_bookmark() {
    +'<center><form method="post"'
    +' name="newlink" action="/adm/bookmarks" target="bmquery" '
    +'> <table width="340" height="150" '
-   +'bgcolor="ffffff" align="center"><tr><td>Link Name:<br /><input '
+   +'bgcolor="#FFFFFF" align="center"><tr><td>Link Name:<br /><input '
    +'type="text" name="title" size="45" value="'+clienttitle+'" />'
    +'<br />Address:<br /><input type="text" name="address" size="45" '
    +'value="'+clienthref+'" /><br /><center><input type="submit" '
@@ -1667,18 +1525,13 @@ sub hidden_button_check {
 
 sub roles_selector {
     my ($cdom,$cnum) = @_;
-    my $crstype = &Apache::loncommon::course_type();
     my $now = time;
     my (%courseroles,%seccount);
     my $is_cc;
     my $role_selector;
-    if ($crstype eq 'Community') {
-        $ccrole = 'co';
-    } else {
-        $ccrole = 'cc';
-    }
-    if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) {
-        my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum});
+    if ($env{'user.role.cc./'.$cdom.'/'.$cnum}) {
+        my ($start,$end) = split(/\./,$env{'user.role.cc./'.$cdom.'/'.$cnum});
+        
         if ((($start) && ($start<0)) || 
             (($end) && ($end<$now))  ||
             (($start) && ($now<$start))) {
@@ -1706,7 +1559,7 @@ sub roles_selector {
                 }
                 if (ref($courseroles{$role}) eq 'ARRAY') {
                     if ($sec ne '') {
-                        if (!grep(/^Q$sec\E$/,@{$courseroles{$role}})) {
+                        if (!grep(/^\Q$sec\E$/,@{$courseroles{$role}})) {
                             push(@{$courseroles{$role}},$sec);
                             $seccount{$role} ++;
                         }
@@ -1721,22 +1574,15 @@ sub roles_selector {
             }
         }
     }
-    my $switchtext;
-    if ($crstype eq 'Community') {
-        $switchtext = &mt('Switch community role to...')
-    } else {
-        $switchtext = &mt('Switch course role to...')
-    }
-
-    my @roles_order = ($ccrole,'in','ta','ep','ad','st');
+    my @roles_order = ('cc','in','ta','ep','ad','st');
     if (keys(%courseroles) > 1) {
         $role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles);
         $role_selector .= '<form name="rolechooser" method="post" action="/adm/roles">
                           <select name="switchrole" onchange="javascript:adhocRole('."'switchrole'".')">';
-        $role_selector .= '<option value="">'.$switchtext.'</option>';
+        $role_selector .= '<option value="">'.&mt('Switch course role to...').'</option>';
         foreach my $role (@roles_order) {
             if (defined($courseroles{$role})) {
-                $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role,$crstype).'</option>'; 
+                $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>'; 
             }
         }
         foreach my $role (sort(keys(%courseroles))) {
@@ -1746,7 +1592,7 @@ sub roles_selector {
         }
         $role_selector .= '</select>'."\n".
                '<input type="hidden" name="destinationurl" value="'.
-               &HTML::Entities::encode($ENV{'REQUEST_URI'},'"<>&').'" />'."\n".
+               $ENV{'REQUEST_URI'}.'" />'."\n".
                '<input type="hidden" name="gotorole" value="1" />'."\n".
                '<input type="hidden" name="selectrole" value="" />'."\n".
                '<input type="hidden" name="switch" value="1" />'."\n".
@@ -1760,11 +1606,11 @@ sub get_all_courseroles {
     unless ((ref($courseroles) eq 'HASH') && (ref($seccount) eq 'HASH')) {
         return;
     }
-    my ($result,$cached) =
+    my ($result,$cached) = 
         &Apache::lonnet::is_cached_new('getcourseroles',$cdom.'_'.$cnum);
     if (defined($cached)) {
         if (ref($result) eq 'HASH') {
-            if ((ref($result->{'roles'}) eq 'HASH') &&
+            if ((ref($result->{'roles'}) eq 'HASH') && 
                 (ref($result->{'seccount'}) eq 'HASH')) {
                 %{$courseroles} = %{$result->{'roles'}};
                 %{$seccount} = %{$result->{'seccount'}};
@@ -1783,7 +1629,7 @@ sub get_all_courseroles {
         }
         if (ref($courseroles->{$urole}) eq 'ARRAY') {
             if ($usec ne '') {
-                if (!grep(/^\Q$usec\E$/,@{$courseroles->{$urole}})) {
+                if (!grep(/^Q$usec\E$/,@{$courseroles->{$urole}})) {
                     push(@{$courseroles->{$urole}},$usec);
                     $seccount->{$urole} ++;
                 }
@@ -1800,7 +1646,7 @@ sub get_all_courseroles {
     @{$courseroles->{'st'}} = ();
     if (keys(%sections_count) > 0) {
         push(@{$courseroles->{'st'}},keys(%sections_count));
-        $seccount->{'st'} = scalar(keys(%sections_count));
+        $seccount->{'st'} = scalar(keys(%sections_count)); 
     }
     my $rolehash = {
                      'roles'    => $courseroles,