--- loncom/interface/lonmenu.pm	2012/05/28 22:22:20	1.369.2.11
+++ loncom/interface/lonmenu.pm	2013/06/26 04:25:41	1.416
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.11 2012/05/28 22:22:20 raeburn Exp $
+# $Id: lonmenu.pm,v 1.416 2013/06/26 04:25:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -106,10 +106,11 @@ secondary_menu().
 
 =item primary_menu()
 
-This routine evaluates @primary_menu and returns XHTML for the menu
-that contains following links: About, Message, Roles, Help, Logout
+This routine evaluates @primary_menu and returns a two item array, 
+with the array elements containing XHTML for the left and right sides of 
+the menu that contains the following links: About, Message, Roles, Help, Logout 
 @primary_menu is filled within the BEGIN block of this module with 
-entries from mydesk.tab 
+entries from mydesk.tab
 
 =item secondary_menu()
 
@@ -117,9 +118,9 @@ Same as primary_menu() but operates on @
 
 =item create_submenu()
 
-Creates XHTML for unordered list of sub-menu items which belong to a
+Creates XHTML for unordered list of sub-menu items which belong to a 
 particular top-level menu item. Uses hover pseudo class in css to display
-dropdown list when mouse hovers over top-level item. Support for IE6
+dropdown list when mouse hovers over top-level item. Support for IE6 
 (no hover psuedo class) via LC_hoverable class for <li> tag for top-
 level item, which employs jQuery to handle behavior on mouseover.
 
@@ -182,7 +183,7 @@ use HTML::Entities();
 use Apache::lonwishlist();
 
 use vars qw(@desklines %category_names %category_members %category_positions 
-            $readdesk @primary_menu %primary_submenu @secondary_menu %secondary_submenu);
+            $readdesk @primary_menu %primary_submenu @secondary_menu);
 
 my @inlineremote;
 
@@ -203,15 +204,16 @@ sub prep_menuitem {
            . qq| href="$$menuitem[0]" target="_top">$link</a></li>|;
 }
 
-# primary_menu() evaluates @primary_menu and returns XHTML for the menu
-# that contains following links:
-# About, Message, Personal, Roles, Help, Logout
+# primary_menu() evaluates @primary_menu and returns a two item array,
+# with the array elements containing XHTML for the left and right sides of 
+# the menu that contains the following links:
+# Personal, About, Message, Roles, Help, Logout
 # @primary_menu is filled within the BEGIN block of this module with 
 # entries from mydesk.tab
 sub primary_menu {
-    my $menu;
+    my (%menu);
     # each element of @primary contains following array:
-    # (link url, icon path, alt text, link text, condition)
+    # (link url, icon path, alt text, link text, condition, position)
     my $public;
     if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
         || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {
@@ -236,6 +238,10 @@ sub primary_menu {
                 && !&Apache::loncommon::show_course(); ##
         
         my $title = $menuitem->[3];
+        my $position = $menuitem->[5];
+        if ($position eq '') {
+            $position = 'right';
+        }
         if (defined($primary_submenu{$title})) {
             my ($link,$target);
             if ($menuitem->[0] ne '') {
@@ -247,20 +253,17 @@ sub primary_menu {
             my @primsub;
             if (ref($primary_submenu{$title}) eq 'ARRAY') {
                 foreach my $item (@{$primary_submenu{$title}}) {
-                    next if (($item->[2] eq 'wishlist') && 
-                             ((!&Apache::lonnet::allowed('bre',"/res/$env{'user.domain'}/")) &&
-                              (!&Apache::lonnet::allowed('bro',"/res/$env{'user.domain'}/"))));
-                    next if (($item->[2] eq 'reqcrs') && (!&check_for_rcrs()));
-                    next if ((($item->[2] eq 'portfolio') || 
-                             ($item->[2] eq 'blog')) && 
+                    next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'}));
+                    next if ((($item->[2] eq 'portfolio') ||
+                             ($item->[2] eq 'blog')) &&
                              (!&Apache::lonnet::usertools_access('','',$item->[2],
                                                            undef,'tools')));
                     push(@primsub,$item);
                 }
                 if (@primsub > 0) {
-                    $menu .= &create_submenu($link,$target,$title,\@primsub);
+                    $menu{$position} .= &create_submenu($link,$target,$title,\@primsub);
                 } elsif ($link) {
-                    $menu .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
+                    $menu{$position} .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
                 }
             }
         } elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink
@@ -271,19 +274,17 @@ sub primary_menu {
                                                                   'helpdeskmail',
                                                                   $defdom,$origmail);
                 if ($to ne '') {
-                    $menu .= &prep_menuitem($menuitem); 
+                    $menu{$position} .= &prep_menuitem($menuitem); 
                 }
             } else {
-                $menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
+                $menu{$position} .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
             }
         } else {
-            $menu .= prep_menuitem($menuitem);
+            $menu{$position} .= prep_menuitem($menuitem);
         }
     }
-    $menu =~ s/\[domain\]/$env{'user.domain'}/g;
-    $menu =~ s/\[user\]/$env{'user.name'}/g;
-
-    return "<ol class=\"LC_primary_menu LC_right\">$menu</ol>";
+    return ("<ol class=\"LC_primary_menu LC_floatleft\">$menu{'left'}</ol>",
+            "<ol class=\"LC_primary_menu LC_floatright LC_right\">$menu{'right'}</ol>");
 }
 
 #returns hashref {user=>'',dom=>''} containing:
@@ -320,31 +321,60 @@ sub secondary_menu {
                                                : '');
     my $canedit       = &Apache::lonnet::allowed('mdc', $env{'request.course.id'});
     my $canviewroster = $env{'course.'.$env{'request.course.id'}.'.student_classlist_view'};
-    my $canviewgrps   = &Apache::lonnet::allowed('vcg', $crs_sec);
-    my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec);
-    my $canviewwnew   = &Apache::lonnet::allowed('whn', $crs_sec);
+    my $canviewgrps   = &Apache::lonnet::allowed('vcg', $crs_sec); 
+    my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec); 
+    my $canviewwnew   = &Apache::lonnet::allowed('whn', $crs_sec); 
     my $canmodpara    = &Apache::lonnet::allowed('opa', $crs_sec);
     my $canvgr        = &Apache::lonnet::allowed('vgr', $crs_sec);
-    my $canmgr        = &Apache::lonnet::allowed('mgr', $crs_sec);
+    my $canmgr        = &Apache::lonnet::allowed('mgr', $crs_sec); 
     my $author        = &getauthor();
 
+    my ($cdom,$cnum,$showsyllabus,$showfeeds);
+    if ($env{'request.course.id'}) {
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        if ($canedit) {
+            $showsyllabus = 1;
+            $showfeeds = 1;
+        } else {
+            unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) {
+                if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) ||
+                    ($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) ||
+                    ($env{'course.'.$env{'request.course.id'}.'.updatedsyllabus'}) ||
+                    ($env{'request.course.syllabustime'})) {
+                    $showsyllabus = 1;
+                }
+            }
+            if ($env{'request.course.feeds'}) {
+                $showfeeds = 1;
+            }
+        }
+    }
+
+    my ($canmodifycoauthor); 
+    if ($env{'request.role'} eq "au./$env{'user.domain'}/") {
+        my $extent = "$env{'user.domain'}/$env{'user.name'}";
+        if ((&Apache::lonnet::allowed('cca',$extent)) ||
+            (&Apache::lonnet::allowed('caa',$extent))) {
+            $canmodifycoauthor = 1;
+        }
+    }
+
     my %groups = &Apache::lonnet::get_active_groups(
                      $env{'user.domain'}, $env{'user.name'},
                      $env{'course.' . $env{'request.course.id'} . '.domain'},
                      $env{'course.' . $env{'request.course.id'} . '.num'});
 
+    my ($roleswitcher_js,$roleswitcher_form);
+
     foreach my $menuitem (@secondary_menu) {
         # evaluate conditions 
         next if    ref($menuitem)  ne 'ARRAY';
         next if    $$menuitem[4]   ne 'always'
-                && $$menuitem[4]   ne 'author'
+                && ($$menuitem[4]   ne 'author' && $$menuitem[4] ne 'cca')
                 && !$env{'request.course.id'};
         next if    $$menuitem[4]   =~ /^mdc/
                 && !$canedit;
-        next if    $$menuitem[4]  eq 'mdcCourse'
-                && ($crstype eq 'Community');
-        next if    $$menuitem[4]  eq 'mdcCommunity'
-                && ($crstype eq 'Course');
         next if    $$menuitem[4]  eq 'nvgr'
                 && $canvgr;
         next if    $$menuitem[4]  eq 'vgr'
@@ -361,47 +391,38 @@ sub secondary_menu {
                 && !$canviewwnew;
         next if    $$menuitem[4]   eq 'opa'
                 && !$canmodpara;
-        next if    $$menuitem[4]   eq 'nvcg'
-                && ($canviewgrps || !%groups);
+        next if    $$menuitem[4]   =~ /showgroups$/
+                && !$canviewgrps
+                && !%groups;
+        next if    $$menuitem[4]   eq 'showsyllabus'
+                && !$showsyllabus;
+        next if    $$menuitem[4]   eq 'showfeeds'
+                && !$showfeeds;
         next if    $$menuitem[4]    eq 'author'
                 && !$author;
+        next if    $$menuitem[4]    eq 'cca'
+                && !$canmodifycoauthor;
 
-        my $title = $menuitem->[3];
-        if (defined($secondary_submenu{$title})) {
-            my ($link,$target);
-            if ($menuitem->[0] ne '') {
-                $link = $menuitem->[0];
-                $target = '_top';
-            } else {
-                $link = '#';
-            }
-            my @scndsub;   
-            if (ref($secondary_submenu{$title}) eq 'ARRAY') {
-                foreach my $item (@{$secondary_submenu{$title}}) {
-                    if (ref($item) eq 'ARRAY') {
-                        next if ($item->[2] eq 'vgr' && !$canvgr);
-                        next if ($item->[2] eq 'opa' && !$canmodpara);
-                        next if ($item->[2] eq 'cst' && !$canmodifyuser);
-                        next if ($item->[2] eq 'mgr' && !$canmgr);
-                        next if ($item->[2] eq 'vcg' && !$canviewgrps);
-                        push(@scndsub,$item); 
-                    }
-                }
-                if (@scndsub > 0) {
-                    $menu .= &create_submenu($link,$target,$title,\@scndsub);
-                } elsif ($link) {
-                    $menu .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
-                }
-            }
-        } elsif ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
+        if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
             # special treatment for role selector
-            my $roles_selector = &roles_selector(
+            ($roleswitcher_js,$roleswitcher_form,my $switcher) =
+                &roles_selector(
                         $env{'course.' . $env{'request.course.id'} . '.domain'},
-                        $env{'course.' . $env{'request.course.id'} . '.num'}  );
-
-            $menu .= $roles_selector ? "<li style=\"padding: 0 0.8em;\">$roles_selector</li>"
-                                     : '';
+                        $env{'course.' . $env{'request.course.id'} . '.num'}
+                );
+            $menu .= $switcher;
         } else {
+            if ($$menuitem[3] eq 'Syllabus' && $env{'request.course.id'}) {
+                my $url = $$menuitem[0];
+                $url =~ s{\[cdom\]/\[cnum\]}{$cdom/$cnum};
+                if (&Apache::lonnet::is_on_map($url)) {
+                    unless ($$menuitem[0] =~ /\?register=1/) {
+                        $$menuitem[0] .= '?register=1';
+                    }
+                } else {
+                    $$menuitem[0] =~ s{\?register=1}{};
+                }
+            }
             $menu .= &prep_menuitem(\@$menuitem);
         }
     }
@@ -425,8 +446,17 @@ sub secondary_menu {
     }
     $menu =~ s/\[uname\]/$$author{user}/g;
     $menu =~ s/\[udom\]/$$author{dom}/g;
-
-    return "<ul id=\"LC_secondary_menu\">$menu</ul>";
+    if ($showsyllabus || $showfeeds) {
+        $menu =~ s/\[cnum\]/$cnum/g;
+        $menu =~ s/\[cdom\]/$cdom/g;
+    }
+    if ($menu) {
+        $menu = "<ul id=\"LC_secondary_menu\">$menu</ul>";
+    }
+    if ($roleswitcher_form) {
+        $menu .= "\n$roleswitcher_js\n$roleswitcher_form";
+    }
+    return $menu;
 }
 
 sub create_submenu {
@@ -436,9 +466,19 @@ sub create_submenu {
     if ($target ne '') {
         $disptarget = ' target="'.$target.'"';
     }
+    my $name;
+    if ($title eq 'Personal') {
+        if ($env{'user.name'} && $env{'user.domain'}) {
+            $name = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+        } else {
+            $name = &mt($title);
+        }
+    } else {
+        $name = &mt($title);
+    }
     my $menu = '<li class="LC_hoverable">'.
-               '<a href="'.$link.'"'.$disptarget.'>'. 
-               '<span class="LC_nobreak">'.&mt($title).
+               '<a href="'.$link.'"'.$disptarget.'>'.
+               '<span class="LC_nobreak">'.$name.
                '<span class="LC_fontsize_small" style="font-weight:normal;">'.
                ' &#9660;</span></span></a>'.
                '<ul>';
@@ -447,12 +487,18 @@ sub create_submenu {
     foreach my $item (@{$submenu}) {
         $count ++;
         if (ref($item) eq 'ARRAY') {
+            my $href = $item->[0];
+            if ($href =~ /(aboutme|rss\.html)$/) {
+                next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne ''));
+                $href =~ s/\[domain\]/$env{'user.domain'}/g;
+                $href =~ s/\[user\]/$env{'user.name'}/g;
+            }
             my $borderbot;
             if ($count == $numsub) {
                 $borderbot = 'border-bottom:1px solid black;';
             }
             $menu .= '<li style="margin:0;padding:0;'.
-                     $borderbot.'"><a href="'.$item->[0].'">'.
+                     $borderbot.'"><a href="'.$href.'">'.
                      &mt($item->[1]).'</a></li>';
         }
     }
@@ -461,7 +507,7 @@ sub create_submenu {
 }
 
 sub innerregister {
-    my ($forcereg,$bread_crumbs) = @_;
+    my ($forcereg,$bread_crumbs,$group) = @_;
     my $const_space = ($env{'request.state'} eq 'construct');
     my $is_const_dir = 0;
 
@@ -471,229 +517,163 @@ sub innerregister {
 
     undef(@inlineremote);
 
-    my $resurl; 
-    if ( $env{'request.symb'} && $env{'request.course.id'} ) {
+    my ($mapurl,$resurl);
 
-        (my $mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
-        my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};
+    if ($env{'request.course.id'}) {
+        if ($env{'request.symb'}) {
+            ($mapurl, my $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 $maptitle = &Apache::lonnet::gettitle($mapurl);
+            my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());
 
 #SD
 #course_type only Course and Community?
 #
-        my @crumbs;
-        unless (($forcereg) && ($env{'request.noversionuri'} eq '/adm/navmaps')
-                && ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
-            @crumbs = ({text  => Apache::loncommon::course_type() 
-                                . ' Contents', 
-                        href  => "Javascript:gopost('/adm/navmaps','')"});
-        }
-        if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
-            push(@crumbs, {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);
-    }elsif (! $const_space){
+            my @crumbs;
+            unless (($forcereg) &&
+                    ($env{'request.noversionuri'} eq '/adm/navmaps') &&
+                    ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
+                @crumbs = ({text  => Apache::loncommon::course_type() 
+                                    . ' Contents', 
+                            href  => "Javascript:gopost('/adm/navmaps','')"});
+            }
+            if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
+                push(@crumbs, {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);
+        } else {
+            $resurl = $env{'request.noversionuri'};
+            my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'});
+            my $crstype = &Apache::loncommon::course_type();
+            my $title = &mt('View Resource');
+            if ($resurl =~ m{^\Q/uploaded$courseurl/supplemental/\E(default|\d+)/}) {
+                &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folderpath','title']);
+                &Apache::lonhtmlcommon::clear_breadcrumbs();
+                if ($env{'form.title'}) {
+                    $title = $env{'form.title'};
+                }
+                my $trail;
+                if ($env{'form.folderpath'}) {
+                    &prepare_functions($resurl,$forcereg,$group,undef,undef,1);
+                    ($trail) =
+                        &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+                } else {
+                    &Apache::lonhtmlcommon::add_breadcrumb(
+                    {text  => "Supplemental $crstype Content",
+                     href  => "javascript:gopost('/adm/supplemental','')"});
+                    $title = &mt('View Resource');
+                    ($trail) = 
+                        &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+                }
+                return $trail;
+            } elsif ($resurl =~ m{^\Q/uploaded$courseurl/portfolio/syllabus/}) {
+                &Apache::lonhtmlcommon::clear_breadcrumbs();
+                &prepare_functions('/public'.$courseurl."/syllabus",
+                                   $forcereg,$group,undef,undef,1);
+                $title = &mt('Syllabus File');
+                my ($trail) =
+                    &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
+                return $trail;
+            }
+            unless ($env{'request.state'} eq 'construct') {
+                &Apache::lonhtmlcommon::clear_breadcrumbs();
+                &Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'});
+            }
+        }
+    } elsif (! $const_space){
         #a situation when we're looking at a resource outside of context of a 
         #course or construction space (e.g. with cumulative rights)
         &Apache::lonhtmlcommon::clear_breadcrumbs();
-        &Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'});
+        unless ($env{'request.noversionuri'} =~ m{^/adm/$match_domain/$match_username/aboutme$}) {
+            &Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'});
+        }
     }
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
     return '' unless ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/}) 
                        || $forcereg );
+    my ($cdom,$cnum,%perms,$cfile,$switchserver,$home,$forceedit,
+        $forceview,$editbutton);
+    if (($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) ||
+        ($env{'request.role'} !~/^(aa|ca|au)/)) {
+        $editbutton = &prepare_functions($resurl,$forcereg,$group);
+    }
+    if ($editbutton eq '') {
+        $editbutton = &clear(6,1);
+    }
 
-# -- This applies to homework problems for users with grading privileges
-	my $crs='/'.$env{'request.course.id'};
-	if ($env{'request.course.sec'}) {
-	    $crs.='_'.$env{'request.course.sec'};
-	}
-	$crs=~s/\_/\//g;
-
-        my $hwkadd='';
-        if ($env{'request.symb'} ne '' &&
-	    $env{'request.filename'}=~/$LONCAPA::assess_re/) {
-	    if (&Apache::lonnet::allowed('mgr',$crs)) {
-		$hwkadd.=&switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',
-                       "gocmd('/adm/grades','gradingmenu')",
-                       'Content Grades');
-            } elsif (&Apache::lonnet::allowed('vgr',$crs)) {
-		$hwkadd.=&switch('','',7,2,'subm.png','Content Submissions','missions[_1]',
-                       "gocmd('/adm/grades','submission')",
-		       'Content Submissions');
+#
+# This applies in course context
+#
+    if ($env{'request.course.id'}) {
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $perms{'mdc'} = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+        my @privs;
+        if ($env{'request.symb'} ne '') {
+             if ($env{'request.filename'}=~/$LONCAPA::assess_re/) {
+                 push(@privs,('mgr','vgr'));
+             }
+             push(@privs,'opa');
+        }
+        foreach my $priv (@privs) {
+            $perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'});
+            if (!$perms{$priv} && $env{'request.course.sec'} ne '') {
+                $perms{$priv} = 
+                    &Apache::lonnet::allowed($priv,"$env{'request.course.id'}/$env{'request.course.sec'}");
             }
+        }
+#
+# Determine whether or not to show Grades and Submissions buttons
+#
+        if ($env{'request.symb'} ne '' &&
+            $env{'request.filename'}=~/$LONCAPA::assess_re/) {
+            if ($perms{'mgr'}) {
+                &switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',
+                        "gocmd('/adm/grades','gradingmenu')",
+                        'Content Grades');
+            } elsif ($perms{'vgr'}) {
+                &switch('','',7,2,'subm.png','Content Submissions','missions[_1]',
+                        "gocmd('/adm/grades','submission')",
+                        'Content Submissions');
+             }
+        }
+        if (($env{'request.symb'} ne '') && ($perms{'opa'})) {
+            &switch('','',7,3,'pparm.png','Content Settings','parms[_2]',
+                    "gocmd('/adm/parmset','set')",
+                    'Content Settings');
 	}
-	if ($env{'request.symb'} ne '' &&
-	    &Apache::lonnet::allowed('opa',$crs)) {
-	    $hwkadd.=&switch('','',7,3,'pparm.png','Content Settings','parms[_2]',
-			     "gocmd('/adm/parmset','set')",
-			     'Content Settings');
-	}
-        if ($env{'request.symb'}=~/^uploaded/ &&
-            &Apache::lonnet::allowed('mdc',$crs)) {
-            $hwkadd.=&switch('','',7,4,'docs.png','Folder/Page Content','parms[_2]',
-                             "gocmd('/adm/coursedocs','direct')",
-                             'Folder/Page Content');
-        }
-# -- End Homework
-        ###
-        ### Determine whether or not to display the 'cstr' button for this
-        ### resource
-        ###
-        my $editbutton = '';
-        my $noeditbutton = 1;
-        my ($cnum,$cdom);
-        if ($env{'request.course.id'}) {
-            $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-            $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        }
-        if ($env{'user.author'}) {
-            if ($env{'request.role'}=~/^(aa|ca|au)/) {
-#
-# We have the role of an author
-#
-                # Set defaults for authors
-                my ($top,$bottom) = ('con-','struct');
-                my $action = "go('/priv/".$env{'user.domain'}.'/'.$env{'user.name'}."');";
-                my $cadom  = $env{'request.role.domain'};
-                my $caname = $env{'user.name'};
-                my $desc = "Enter my construction space";
-                # Set defaults for co-authors
-                if ($env{'request.role'} =~ /^ca/) { 
-                    ($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/);
-                    ($top,$bottom) = ('co con-','struct');
-                    $action = "go('/priv/".$cadom.'/'.$caname."');";
-                    $desc = "Enter construction space as co-author";
-                } elsif ($env{'request.role'} =~ /^aa/) {
-                    ($cadom,$caname)=($env{'request.role'}=~/($match_domain)\/($match_username)$/);
-                    ($top,$bottom) = ('co con-','struct');
-                    $action = "go('/priv/".$cadom.'/'.$caname."');";
-                    $desc = "Enter construction space as assistant co-author";
-                }
-                # Check that we are on the correct machine
-                my $home = &Apache::lonnet::homeserver($caname,$cadom);
-		my $allowed=0;
-		my @ids=&Apache::lonnet::current_machine_ids();
-		foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
-		if (!$allowed) {
-		    $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc);
-                    $noeditbutton = 0;
-                }
-            }
-#
-# We are an author for some stuff, but currently do not have the role of author.
-# Figure out if we have authoring privileges for the resource we are looking at.
-# This should maybe become a privilege check in lonnet
-#
-            ##
-            ## Determine if user can edit url.
-            ##
-            my $cfile='';
-            my $cfuname='';
-            my $cfudom='';
-            my $uploaded;
-            my $switchserver='';
-            my $home;
-            if ($env{'request.filename'}) {
-                my $file=&Apache::lonnet::declutter($env{'request.filename'});
-                if (defined($cnum) && defined($cdom)) {
-                    $uploaded = &is_course_upload($file,$cnum,$cdom);
-                }
-                if (!$uploaded) {
+# End grades/submissions check
 
-                    $file=~s{^(priv/$match_domain/$match_username)}{/$1};
-                    $file=~s{^($match_domain/$match_username)}{/priv/$1};
-
-                    # Check that the user has permission to edit this resource
-                    my $setpriv = 1;
-                    ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$setpriv);
-                    if (defined($cfudom)) {
-		        $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;
-                        } else {
-                            $switchserver=$file;
-                        }
-                    }
-                }
-            }
-            # Finally, turn the button on or off
-            if (($cfile || $switchserver) && !$const_space) {
-                my $nocrsedit;
-                # Suppress display where CC has switched to student role.
-                if ($env{'request.course.id'}) {
-                    unless(&Apache::lonnet::allowed('mdc',
-                                                    $env{'request.course.id'})) {
-                        $nocrsedit = 1;
-                    }
-                }
-                if ($nocrsedit) {
-                    $editbutton=&clear(6,1);
-                } else {
-                    my $bot = "go('$cfile')";
-                    if ($switchserver) {
-                        if ( $env{'request.symb'} && $env{'request.course.id'} ) {
-                            $cfile = '/adm/switchserver?otherserver='.$home.'&amp;role='.
-                                     &HTML::Entities::encode($env{'request.role'},'"<>&').'&amp;symb='.
-                                     &HTML::Entities::encode($env{'request.symb'},'"<>&');
-                            $bot = "need_switchserver('$cfile');";
-                        }
-                    }
-                    $editbutton=&switch
-                       ('','',6,1,'pcstr.png','Edit','resource[_2]',
-                        $bot,"Edit this resource");
-                    $noeditbutton = 0;
-                }
-            } elsif ($editbutton eq '') {
-                $editbutton=&clear(6,1);
-            }
-        }
-        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)) {
-                    if (&is_course_upload($file,$cnum,$cdom)) {
-                        my $cfile = &edit_course_upload($file,$cnum,$cdom);
-                        if ($cfile) {
-                            $editbutton=&switch
-                                        ('','',6,1,'pcstr.png','Edit',
-                                         'resource[_2]',"go('".$cfile."');",
-                                         'Edit this resource');
-                        }
-                    }
-                }
-            }
-        }
-        if ($env{'request.course.id'}) {
-            if ($resurl eq "public/$cdom/$cnum/syllabus") {
-                if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) {
-                    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-                        $editbutton=&switch('','',6,1,'pcstr.png','Edit',
-                                            'resource[_2]',
-                                            "go('/adm/courseprefs?phase=display&actions=courseinfo')",
-                                            'Edit this resource');
-                    }
-                }
+#
+# This applies to items inside a folder/page modifiable in the course.
+#
+        if (($env{'request.symb'}=~/^uploaded/) && ($perms{'mdc'})) {
+            my $text = 'Edit Folder';
+            if (($mapurl =~ /\.page$/) ||
+                ($env{'request.symb'}=~
+                     m{uploaded/$cdom/$cnum/default_\d+\.page$}))  {
+                $text = 'Edit Page';
             }
+            &switch('','',7,4,'docs-22x22.png',$text,'parms[_2]',
+                    "gocmd('/adm/coursedocs','direct')",
+                    'Folder/Page Content');
         }
-        ###
-        ###
+# End modifiable folder/page container check
+    }
+# End course context
+
 # Prepare the rest of the buttons
-        my $menuitems;
+        my ($menuitems,$got_prt,$got_wishlist);
         if ($const_space) {
 #
 # We are in construction space
@@ -729,7 +709,7 @@ ENDMENUITEMS
         } elsif ( defined($env{'request.course.id'}) && 
 		 $env{'request.symb'} ne '' ) {
 #
-# We are in a course and looking at a registred URL
+# We are in a course and looking at a registered URL
 # Should probably be in mydesk.tab
 #
 	    $menuitems=(<<ENDMENUITEMS);
@@ -741,12 +721,15 @@ c&8&1
 c&8&2
 s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
-            if (&Apache::lonnet::allowed('bre', $env{'request.course.id'}) eq 'F' && $env{'request.uri'} =~ /^\/res/) {
+            $got_prt = 1;
+            if (($env{'user.adv'}) && ($env{'request.uri'} =~ /^\/res/)
+                && (!$env{'request.enc'})) {
                 # wishlist is only available for users with access to resource-pool
                 # and links can only be set for resources within the resource-pool
                 $menuitems .= (<<ENDMENUITEMS);
 s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS
+                $got_wishlist = 1;
             }
 
 my $currentURL = &Apache::loncommon::get_symb();
@@ -762,28 +745,38 @@ $menuitems.="&Notes&&annotate()&";
 $menuitems.="Make notes and annotations about this resource&&1\n";
 
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
-		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) {
+		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {
 		    $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.png&Info&info[_1]&catalog_info()&Show Metadata
 ENDREALRES
                 }
-	        $menuitems.=(<<ENDREALRES);
+                unless ($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) {
+                    $menuitems.=(<<ENDREALRES);
 s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
+ENDREALRES
+                }
+                $menuitems.=(<<ENDREALRES);
 s&8&2&fdbk.png&Communicate&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
 ENDREALRES
 	    }
         }
 	if ($env{'request.uri'} =~ /^\/res/) {
-	    $menuitems .= (<<ENDMENUITEMS);
+            unless ($got_prt) {
+	        $menuitems .= (<<ENDMENUITEMS);
 s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
-            if (&Apache::lonnet::allowed('bre', $env{'request.course.id'}) eq 'F') {
-                # wishlist is only available for users with access to resource-pool
-                $menuitems .= (<<ENDMENUITEMS);
+                $got_prt = 1;
+            }
+            unless ($got_wishlist) {
+                if (($env{'user.adv'}) && (!$env{'request.enc'})) {
+                    # wishlist is only available for users with access to resource-pool
+                    $menuitems .= (<<ENDMENUITEMS);
 s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS
-            }
-	}
+                    $got_wishlist = 1;
+                }
+	    }
+        }
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);
@@ -833,11 +826,7 @@ ENDMENUITEMS
                 &Apache::lonhtmlcommon::add_breadcrumb_tool(
                      'tools', $inlineremote[63]);
             }
-            
-            unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) {
-                &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                    'advtools', @inlineremote[61,71,72,73,74,92]);
-            }
+            &advtools_crumbs(@inlineremote);
         }
     }
 
@@ -846,200 +835,228 @@ ENDMENUITEMS
            . &Apache::lonhtmlcommon::scripttag('', 'end');
 }
 
-sub is_course_upload {
-    my ($file,$cnum,$cdom) = @_;
-    my $uploadpath = &LONCAPA::propath($cdom,$cnum);
-    $uploadpath =~ s{^\/}{};
-    if (($file =~ m{^\Q$uploadpath\E/userfiles/docs/}) ||
-        ($file =~ m{^userfiles/\Q$cdom\E/\Q$cnum\E/docs/})) {
+sub get_editbutton {
+    my ($cfile,$home,$switchserver,$forceedit,$forceview,$forcereg) = @_;
+    my $jscall;
+    if (($forceview) && ($env{'form.todocs'})) {
+        my ($folderpath,$command);
+        if ($env{'request.symb'}) {
+            $folderpath = &Apache::loncommon::symb_to_docspath($env{'request.symb'});
+        } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
+            $folderpath = $env{'form.folderpath'};
+            $command = '&forcesupplement=1';
+        }
+        $folderpath = &escape(&HTML::Entities::encode(&escape($folderpath),'<>&"'));
+        $jscall = "go('/adm/coursedocs?folderpath=$folderpath$command')";
+    } else {
+        $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
+                                                $forceedit,$forcereg,$env{'request.symb'},
+                                                &escape($env{'form.folderpath'}),
+                                                &escape($env{'form.title'}),$env{'form.idx'},
+                                                &escape($env{'form.suppurl'},$env{'form.todocs'}));
+    }
+    if ($jscall) {
+        my $icon = 'pcstr.png';
+        my $label = 'Edit';
+        if ($forceview) {
+            $icon = 'tolastloc.png';
+            $label = 'Exit Editing';
+        }
+        &switch('','',6,1,$icon,$label,'resource[_2]',
+                $jscall,"Edit this resource");
         return 1;
     }
     return;
 }
 
-sub edit_course_upload {
-    my ($file,$cnum,$cdom) = @_;
-    my $cfile;
-    if ($file =~/\.(htm|html|css|js|txt)$/) {
-        my $ext = $1;
-        my $url = &Apache::lonnet::hreflocation('',$file);
-        my $home = &Apache::lonnet::homeserver($cnum,$cdom);
-        my @ids=&Apache::lonnet::current_machine_ids();
-        my $dest;
-        if ($home && grep(/^\Q$home\E$/,@ids)) {
-            $dest = $url.'?forceedit=1';
-        } else {
-            unless (&Apache::lonnet::get_locks()) {
-                $dest = '/adm/switchserver?otherserver='.
-                        $home.'&role='.$env{'request.role'}.
-                        '&url='.$url.'&forceedit=1';
+sub prepare_functions {
+    my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs) = @_;
+    unless ($env{'request.registered'}) {
+        undef(@inlineremote);
+    }
+    my ($cdom,$cnum,%perms,$cfile,$switchserver,$home,$forceedit,
+        $forceview);
+
+    if ($env{'request.course.id'}) {
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $perms{'mdc'} = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+    }
+
+    my $editbutton = '';
+#
+# Determine whether or not to display 'Edit' icon/button
+#
+    if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
+        my $file=&Apache::lonnet::declutter($env{'request.filename'});
+        ($cfile,$home,$switchserver,$forceedit,$forceview) =
+            &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
+                &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
+        if (($cfile) && ($home ne '') && ($home ne 'no_host')) {
+            $editbutton = &get_editbutton($cfile,$home,$switchserver,
+                                          $forceedit,$forceview,$forcereg);
+        }
+    } elsif ((!$env{'request.course.id'}) &&
+             ($env{'user.author'}) && ($env{'request.filename'}) &&
+             ($env{'request.role'} !~/^(aa|ca|au)/)) {
+#
+# Currently do not have the role of author or co-author.
+# Do we have authoring privileges for the resource?
+#
+        my $file=&Apache::lonnet::declutter($env{'request.filename'});
+        ($cfile,$home,$switchserver,$forceedit,$forceview) =
+            &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
+                &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
+        if (($cfile) && ($home ne '') && ($home ne 'no_host')) {
+            $editbutton = &get_editbutton($cfile,$home,$switchserver,
+                                          $forceedit,$forceview,$forcereg);
+        }
+    } elsif ($env{'request.course.id'}) {
+#
+# This applies in course context
+#
+        if (($perms{'mdc'}) &&
+            (($resurl eq "/public/$cdom/$cnum/syllabus") ||
+            ($resurl =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/}))) {
+            $cfile = $resurl;
+            $home = &Apache::lonnet::homeserver($cnum,$cdom);
+            if ($env{'form.forceedit'}) {
+                $forceview = 1;
+            } else {
+                $forceedit = 1;
+            }
+            $editbutton = &get_editbutton($cfile,$home,$switchserver,
+                                          $forceedit,$forceview,$forcereg);
+        } elsif (($resurl eq '/adm/extresedit') &&
+                 (($env{'form.symb'}) || ($env{'form.folderpath'}))) {
+            ($cfile,$home,$switchserver,$forceedit,$forceview) =
+            &Apache::lonnet::can_edit_resource($resurl,$cnum,$cdom,$resurl,
+                                               $env{'form.symb'});
+            if ($cfile ne '') {
+                $editbutton = &get_editbutton($cfile,$home,$switchserver,
+                                              $forceedit,$forceview,$forcereg,
+                                              $env{'form.title'},$env{'form.suppurl'});
+            }
+        } elsif (($resurl =~ m{^/?adm/viewclasslist$}) &&
+                 (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) {
+            ($cfile,$home,$switchserver,$forceedit,$forceview) =
+            &Apache::lonnet::can_edit_resource($resurl,$cnum,$cdom,$resurl,
+                                               $env{'form.symb'});
+            $editbutton = &get_editbutton($cfile,$home,$switchserver,
+                                          $forceedit,$forceview,$forcereg);
+        } elsif (($resurl !~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) &&
+                 ($resurl ne '/cgi-bin/printout.pl')) {
+            if ($env{'request.filename'}) {
+                my $file=&Apache::lonnet::declutter($env{'request.filename'});
+                ($cfile,$home,$switchserver,$forceedit,$forceview) =
+                    &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
+                        &Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
+                if ($cfile ne '') {
+                    $editbutton = &get_editbutton($cfile,$home,$switchserver,
+                                                  $forceedit,$forceview,$forcereg);
+                }
             }
-        }
-        if ($dest) {
-            $cfile = &HTML::Entities::encode($dest,'"<>&');
         }
     }
-    return $cfile;
-}
+# End determination of 'Edit' icon/button display
 
-sub startupremote {
-    my ($lowerurl)=@_;
-    if ($env{'environment.remote'} eq 'off') {
-     return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />');
+    if ($env{'request.course.id'}) {
+# This applies to about me page for users in a course
+        if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
+            my ($sdom,$sname) = ($1,$2);
+            unless (&Apache::lonnet::is_course($sdom,$sname)) {
+                &switch('','',6,4,'mail-message-new-22x22.png','Message to user',
+                        '',
+                        "go('/adm/email?compose=individual&amp;recname=$sname&amp;recdom=$sdom')",
+                            'Send message to specific user');
+            }
+            my $hideprivileged = 1;
+            if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef,
+                                           $hideprivileged)) {
+                foreach my $priv ('vsa','vgr','srm') {
+                    $perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'});
+                    if (!$perms{$priv} && $env{'request.course.sec'} ne '') {
+                        $perms{$priv} =
+                            &Apache::lonnet::allowed($priv,"$env{'request.course.id'}/$env{'request.course.sec'}");
+                    }
+                }
+                if ($perms{'vsa'}) {
+                    &switch('','',6,5,'trck-22x22.png','Activity',
+                            '',
+                            "go('/adm/trackstudent?selected_student=$sname:$sdom')",
+                            'View recent activity by this person');
+                }
+                if ($perms{'vgr'}) {
+                    &switch('','',6,6,'rsrv-22x22.png','Reservations',
+                            '',
+                            "go('/adm/slotrequest?command=showresv&amp;origin=aboutme&amp;uname=$sname&amp;udom=$sdom')",
+                            'Slot reservation history');
+                }
+                if ($perms{'srm'}) {
+                    &switch('','',6,7,'contact-new-22x22.png','Records',
+                            '',
+                            "go('/adm/email?recordftf=retrieve&amp;recname=$sname&amp;recdom=$sdom')",
+                            'Add records');
+                }
+            }
+        }
+        if (($env{'form.folderpath'} =~ /^supplemental/) &&
+            (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
+            (($resurl =~ m{^/adm/wrapper/ext/}) ||
+             ($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) ||
+             ($resurl eq '/adm/supplemental') ||
+             ($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) ||
+             ($resurl =~ m{^/adm/$match_domain/$match_username/aboutme$}))) {
+            my @folders=split('&',$env{'form.folderpath'});
+            if ((@folders > 2) || ($resurl ne '/adm/supplemental')) {
+                my $esc_path=&escape(&HTML::Entities::encode(&escape($env{'form.folderpath'}),'<>&"'));
+                &switch('','',7,4,'docs-22x22.png','Edit Folder','parms[_2]',
+                        "location.href='/adm/coursedocs?command=direct&amp;forcesupplement=1&amp;supppath=$esc_path'",
+                        'Folder/Page Content');
+            }
+        }
     }
-#
-# The Remote actually gets launched!
-#
-    my $configmenu=&rawconfig();
-    my $esclowerurl=&escape($lowerurl);
-    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') {
-        if (typeof(document.wheel.spin) != 'undefined') {
-            var date=new Date();
-            var waited=Math.round(30-((date.getTime()-timestart)/1000));
-            document.wheel.spin.value=$message;
-        }
-    }
-   if (window.status=='|') {
-      window.status='/';
-   } else {
-      if (window.status=='/') {
-         window.status='-';
-      } else {
-         if (window.status=='-') {
-            window.status='\\\\';
-         } else {
-            if (window.status=='\\\\') { window.status='|'; }
-         }
-      }
-   }
-}
-
-// ---------------------------------------------------------- The wait function
-var canceltim;
-function wait() {
-   if ((menuloaded==1) || (tim==1)) {
-      window.status='Done.';
-      if (tim==0) {
-         clearTimeout(canceltim);
-         $configmenu
-         window.location='$lowerurl';
-      } else {
-          window.location='/adm/remote?action=collapse&url=$esclowerurl';
-      }
-   } else {
-      wheelswitch();
-      setTimeout('wait();',200);
-   }
-}
-
-function main() {
-   canceltim=setTimeout('tim=1;',30000);
-   window.status='-';
-   var date=new Date();
-   timestart=date.getTime();
-   wait();
-}
-
-// ]]>
-</script>
-ENDREMOTESTARTUP
-}
-
-sub setflags() {
-    return(<<ENDSETFLAGS);
-<script type="text/javascript">
-// <![CDATA[
-    menuloaded=0;
-    tim=0;
-// ]]>
-</script>
-ENDSETFLAGS
-}
-
-sub maincall() {
-    if ($env{'environment.remote'} eq 'off') { return ''; }
-    return(<<ENDMAINCALL);
-<script type="text/javascript">
-// <![CDATA[
-    main();
-// ]]>
-</script>
-ENDMAINCALL
-}
-
-sub load_remote_msg {
-    my ($lowerurl)=@_;
-
-    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>');
-    return(<<ENDREMOTEFORM);
-<p>
-<form name="wheel">
-<input name="spin" type="text" size="60" />
-</form>
-</p>
-<p>$link</p>
-ENDREMOTEFORM
-}
-
-sub get_menu_name {
-    my $hostid = $Apache::lonnet::perlvar{'lonHostID'};
-    $hostid =~ s/\W//g;
-    return 'LCmenu'.$hostid;
-}
-
 
-sub reopenmenu {
-   if ($env{'environment.remote'} eq 'off') { return ''; }
-   my $menuname = &get_menu_name();
-   my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
-   return('window.open('.$nothing.',"'.$menuname.'","",false);');
+# End checking for items for about me page for users in a course
+    if ($docscrumbs) {
+        &Apache::lonhtmlcommon::clear_breadcrumb_tools();
+        &advtools_crumbs(@inlineremote);
+        return $editbutton;
+    } elsif ($env{'request.registered'}) {
+        return $editbutton;
+    } else {
+        if (ref($bread_crumbs) eq 'ARRAY') {
+            if (@inlineremote > 0) {
+                if (ref($advtools) eq 'ARRAY') {
+                    @{$advtools} = @inlineremote;
+                }
+            }
+            return;
+        } elsif (@inlineremote > 0) {
+            &Apache::lonhtmlcommon::clear_breadcrumb_tools();
+            &advtools_crumbs(@inlineremote);
+            return   &Apache::lonhtmlcommon::scripttag('', 'start')
+                   . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
+                   . &Apache::lonhtmlcommon::scripttag('', 'end');
+        }
+    }
 }
 
-
-sub open {
-    my $returnval='';
-    if ($env{'environment.remote'} eq 'off') {
-        return
-        '<script type="text/javascript">'."\n"
-       .'// <![CDATA['."\n"
-       .'self.name="loncapaclient";'."\n"
-       .'// ]]>'."\n"
-       .'</script>';
-    }
-    my $menuname = &get_menu_name();
-
-#    unless (shift eq 'unix') {
-# resizing does not work on linux because of virtual desktop sizes
-#       $returnval.=(<<ENDRESIZE);
-#if (window.screen) {
-#    self.resizeTo(screen.availWidth-215,screen.availHeight-55);
-#    self.moveTo(190,15);
-#}
-#ENDRESIZE
-#    }
-    $returnval=(<<ENDOPEN);
-// <![CDATA[
-window.status='Opening LON-CAPA Remote Control';
-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>';
+sub advtools_crumbs {
+    my @funcs = @_;
+    if ($env{'request.noversionuri'} =~ m{^/adm/$match_domain/$match_username/aboutme$}) {
+        &Apache::lonhtmlcommon::add_breadcrumb_tool(
+            'advtools', @funcs[61,64,65,66,67,74]);
+    } elsif ($env{'request.noversionuri'} !~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) {
+        &Apache::lonhtmlcommon::add_breadcrumb_tool(
+            'advtools', @funcs[61,71,72,73,74,92]);
+    } elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') {
+        &Apache::lonhtmlcommon::add_breadcrumb_tool(
+            'advtools', $funcs[61]);
+    }
+    return;
 }
 
-
 # ================================================================== Raw Config
 
 sub clear {
@@ -1096,7 +1113,7 @@ sub switch {
         unless ($env{'request.state'} eq 'construct') {
             push(@tools,63);
         }
-        if (($env{'environment.icons'} eq 'iconsonly') &&
+        if (($env{'environment.icons'} eq 'iconsonly') && 
             (grep(/^$idx$/,@tools))) {
             $inlineremote[$idx] =
         '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.'</a>';
@@ -1365,28 +1382,6 @@ sub check_for_rcrs {
     return $showreqcrs;
 }
 
-# ======================================================================= Close
-
-sub close {
-    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");
-window.status='Disabling Remote Control';
-menu.active=0;
-menu.autologout=0;
-window.status='Closing Remote Control';
-menu.close();
-window.status='Done.';
-// ]]>
-</script>
-ENDCLOSE
-}
-
 sub dc_popup_js {
     my %lt = &Apache::lonlocal::texthash(
                                           more => '(More ...)',
@@ -1461,8 +1456,7 @@ sub utilityfunctions {
     my $end_page_annotate = 
         &Apache::loncommon::end_page({'js_ready' => 1});
 
-    my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.
-                         &mt('Switch server?');
+    my $jumptores = &Apache::lonhtmlcommon::javascript_jumpto_resource();
 
     my $esc_url=&escape($currenturl);
     my $esc_symb=&escape($currentsymb);
@@ -1477,22 +1471,7 @@ return (<<ENDUTILITY)
 
 $dc_popup_cid
 
-function go(url) {
-   if (url!='' && url!= null) {
-       currentURL = null;
-       currentSymb= null;
-       window.location.href=url;
-   }
-}
-
-function need_switchserver(url) {
-    if (url!='' && url!= null) {
-        if (confirm("$confirm_switch")) {
-            go(url); 
-        }
-    }
-    return;
-}
+$jumptores
 
 function gopost(url,postdata) {
    if (url!='') {
@@ -1669,15 +1648,29 @@ sub roles_selector {
     my $now = time;
     my (%courseroles,%seccount,%courseprivs);
     my $is_cc;
-    my $role_selector;
+    my ($js,$form,$switcher,$switchtext);
     my $ccrole;
     if ($crstype eq 'Community') {
         $ccrole = 'co';
     } else {
         $ccrole = 'cc';
     }
-    my $priv;
+    my ($priv,$gotsymb,$destsymb);
     my $destinationurl = $ENV{'REQUEST_URI'};
+    if ($destinationurl =~ /\?symb=/) {
+        $gotsymb = 1;
+    } elsif ($destinationurl =~ m{^/enc/}) {
+        my $plainurl = &Apache::lonenc::unencrypted($destinationurl);
+        if ($plainurl =~ /\?symb=/) {
+            $gotsymb = 1;
+        }
+    }
+    unless ($gotsymb) {
+        $destsymb = &Apache::lonnet::symbread();
+        if ($destsymb ne '') {
+            $destsymb = &Apache::lonenc::check_encrypt($destsymb);
+        }
+    }
     my $reqprivs = &required_privs();
     if (ref($reqprivs) eq 'HASH') {
         my $destination = $destinationurl;
@@ -1743,37 +1736,66 @@ sub roles_selector {
             }
         }
     }
-    my $switchtext;
-    if ($crstype eq 'Community') {
-        $switchtext = &mt('Switch community role to...')
-    } else {
-        $switchtext = &mt('Switch course role to...')
-    }
+    $switchtext = &mt('Switch role');
     my @roles_order = ($ccrole,'in','ta','ep','ad','st');
-    if (keys(%courseroles) > 1) {
-        $role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv);
-        $role_selector .= '<form name="rolechooser" method="post" action="/adm/roles">
-                          <select name="switchrole" onchange="javascript:adhocRole('."'switchrole'".')">';
-        $role_selector .= '<option value="">'.$switchtext.'</option>';
+    my $numdiffsec;
+    if (keys(%seccount) == 1) {
+        foreach my $key (keys(%seccount)) {
+            $numdiffsec = $seccount{$key};
+        }
+    }
+    if ((keys(%seccount) > 1) || ($numdiffsec > 1)) {
+        my @submenu;
+        $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv);
+        $form = 
+            '<form name="rolechooser" method="post" action="/adm/roles">'."\n".
+            '  <input type="hidden" name="destinationurl" value="'.
+            &HTML::Entities::encode($destinationurl).'" />'."\n".
+            '  <input type="hidden" name="gotorole" value="1" />'."\n".
+            '  <input type="hidden" name="selectrole" value="" />'."\n".
+            '  <input type="hidden" name="switchrole" value="" />'."\n";
+        if ($destsymb ne '') {
+            $form .= '  <input type="hidden" name="destsymb" value="'.
+                        &HTML::Entities::encode($destsymb).'" />'."\n";
+        }
+        $form .= '</form>'."\n";
         foreach my $role (@roles_order) {
+            my $include;
             if (defined($courseroles{$role})) {
-                $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role,$crstype).'</option>'; 
+                if ($env{'request.role'} =~ m{^\Q$role\E}) {
+                    if ($seccount{$role} > 1) {
+                        $include = 1;
+                    }
+                } else {
+                    $include = 1;
+                }
+            }
+            if ($include) {
+                push(@submenu,['javascript:adhocRole('."'$role'".')',
+                               &Apache::lonnet::plaintext($role,$crstype)]);
             }
         }
         foreach my $role (sort(keys(%courseroles))) {
             if ($role =~ /^cr/) {
-                $role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>'; 
+                my $include;
+                if ($env{'request.role'} =~ m{^\Q$role\E}) {
+                    if ($seccount{$role} > 1) {
+                        $include = 1;
+                    }
+                } else {
+                    $include = 1; 
+                }
+                if ($include) {
+                    push(@submenu,['javascript:adhocRole('."'$role'".')',
+                                   &Apache::lonnet::plaintext($role)]);
+                }
             }
         }
-        $role_selector .= '</select>'."\n".
-               '<input type="hidden" name="destinationurl" value="'.
-               &HTML::Entities::encode($destinationurl).'" />'."\n".
-               '<input type="hidden" name="gotorole" value="1" />'."\n".
-               '<input type="hidden" name="selectrole" value="" />'."\n".
-               '<input type="hidden" name="switch" value="1" />'."\n".
-               '</form>';
+        if (@submenu > 0) {
+            $switcher = &create_submenu('','',$switchtext,\@submenu);
+        }
     }
-    return $role_selector;
+    return ($js,$form,$switcher);
 }
 
 sub get_all_courseroles {
@@ -1836,6 +1858,7 @@ sub get_all_courseroles {
         push(@{$courseroles->{'st'}},keys(%sections_count));
         $seccount->{'st'} = scalar(keys(%sections_count));
     }
+    $seccount->{'st'} ++; # Increment for a section-less student role.  
     my $rolehash = {
                      'roles'    => $courseroles,
                      'seccount' => $seccount,
@@ -1912,9 +1935,8 @@ sub jump_to_role {
     return <<"END";
 <script type="text/javascript">
 //<![CDATA[
-function adhocRole(roleitem) {
+function adhocRole(newrole) {
     $js
-    var newrole =  document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value;
     if (newrole == '') {
         return;
     } 
@@ -1931,7 +1953,6 @@ function adhocRole(roleitem) {
                 if (confirm("$lt{'role'}\\n$lt{'swit'}")) {
                     document.rolechooser.destinationurl.value = '/adm/menu';
                 } else {
-                    document.rolechooser.elements[roleitem].selectedIndex = 0;
                     return;
                 }
             }
@@ -1967,21 +1988,19 @@ function adhocRole(roleitem) {
             fullrole += '/'+secchoice;
         }
     } else {
-        document.rolechooser.elements[roleitem].selectedIndex = 0;
         if (secchoice != null) {
             alert("$lt{'youe'} \\""+secchoice+"\\".\\n $lt{'plst'}");
         }
         return;
     }
     if (fullrole == "$env{'request.role'}") {
-        document.rolechooser.elements[roleitem].selectedIndex = 0;
         return;
     }
     itemid = retrieveIndex('gotorole');
     if (itemid != -1) {
         document.rolechooser.elements[itemid].name = fullrole;
     }
-    document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value = fullrole;
+    document.rolechooser.switchrole.value = fullrole;
     document.rolechooser.selectrole.value = '1';
     document.rolechooser.submit();
     return;
@@ -2021,13 +2040,43 @@ sub required_privs {
 
 sub countdown_timer {
     if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') &&
-        ($env{'request.filename'}=~/$LONCAPA::assess_re/) &&
-        ($Apache::inputtags::status[-1] eq 'CAN_ANSWER')) {
+        ($env{'request.filename'}=~/$LONCAPA::assess_re/)) {
+        my ($type,$hastimeleft,$slothastime);
+        my $now = time;
+        if ($env{'request.filename'} =~ /\.task$/) {
+            $type = 'Task';
+        } else {
+            $type = 'problem';
+        }
+        my ($status,$accessmsg,$slot_name,$slot) =
+            &Apache::lonhomework::check_slot_access('0',$type);
+        if ($slot_name ne '') {
+            if (ref($slot) eq 'HASH') {
+                if (($slot->{'starttime'} < $now) &&
+                    ($slot->{'endtime'} > $now)) {
+                    $slothastime = 1;
+                }
+            }
+        }
+        if ($status ne 'CAN_ANSWER') {
+            return;
+        }
         my $duedate = &Apache::lonnet::EXT("resource.0.duedate");
-        if ($duedate && $duedate > time) {
+        my @interval=&Apache::lonnet::EXT("resource.0.interval");
+        if (@interval > 1) {
+            my $first_access=&Apache::lonnet::get_first_access($interval[1]);
+            if ($first_access > 0) {
+                if ($first_access+$interval[0] > time) {
+                    $hastimeleft = 1;
+                }
+            }
+        }
+        if (($duedate && $duedate > time) ||
+            (!$duedate && $hastimeleft) ||
+            ($slot_name ne '' && $slothastime)) {
             my ($collapse,$expand,$alttxt,$title,$currdisp);
-            my @interval=&Apache::lonnet::EXT("resource.0.interval");
-            if (@interval > 1) {
+            if ((@interval > 1 && $hastimeleft) ||
+                ($type eq 'Task' && $slothastime)) {
                 $currdisp = 'inline';
                 $collapse = '&#9658;&nbsp;';
             } else {
@@ -2071,17 +2120,14 @@ BEGIN {
                         $category_positions{$entries[2]}=$entries[1];
                         $category_names{$entries[2]}=$entries[3];
                     } elsif ($configline=~/^prim\:/) {
-                        my @entries = (split(/\:/, $configline))[1..5];
-                        push @primary_menu, \@entries;
+                        my @entries = (split(/\:/, $configline))[1..6];
+                        push(@primary_menu,\@entries);
                     } elsif ($configline=~/^primsub\:/) {
                         my ($parent,@entries) = (split(/\:/, $configline))[1..4];
-                        push (@{$primary_submenu{$parent}},\@entries);
+                        push(@{$primary_submenu{$parent}},\@entries);
                     } elsif ($configline=~/^scnd\:/) {
                         my @entries = (split(/\:/, $configline))[1..5];
-                        push @secondary_menu, \@entries; 
-                    } elsif ($configline=~/^scndsub\:/) {
-                        my ($parent,@entries) = (split(/\:/, $configline))[1..4];
-                        push (@{$secondary_submenu{$parent}},\@entries);
+                        push(@secondary_menu,\@entries);
                     } elsif ($configline) {
                         push(@desklines,$configline);
                     }