--- loncom/interface/lonmenu.pm	2010/11/08 22:51:23	1.309.2.18
+++ loncom/interface/lonmenu.pm	2013/01/03 20:19:10	1.369.2.33
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.309.2.18 2010/11/08 22:51:23 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.33 2013/01/03 20:19:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,10 +26,6 @@
 # http://www.lon-capa.org/
 #
 #
-# 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; 
 
 =head1 NAME
 
@@ -37,33 +33,103 @@ Apache::lonmenu
 
 =head1 SYNOPSIS
 
-Coordinates the response to clicking an image.
+Loads contents of /home/httpd/lonTabs/mydesk.tab, 
+used to generate inline menu, and Main Menu page. 
 
 This is part of the LearningOnline Network with CAPA project
 described at http://www.lon-capa.org.
 
+=head1 GLOBAL VARIABLES
+
+=over
+
+=item @desklines
+
+Each element of this array contains a line of mydesk.tab that doesn't start with
+cat, prim or scnd. 
+It gets filled in the BEGIN block of this module.
+
+=item %category_names
+
+The keys of this hash are the abbreviations used in mydesk.tab in those lines that 
+start with cat, the values are strings representing titles. 
+It gets filled in the BEGIN block of this module.
+
+=item %category_members
+
+TODO 
+
+=item %category_positions
+
+The keys of this hash are the abbreviations used in mydesk.tab in those lines that
+start with cat, its values are position vectors (column, row). 
+It gets filled in the BEGIN block of this module.
+
+=item $readdesk
+
+Indicates that mydesk.tab has been read. 
+It is set to 'done' in the BEGIN block of this module.
+
+=item @primary_menu
+
+The elements of this array reference arrays that are made up of the components
+of those lines of mydesk.tab that start with prim:.
+It is used by primary_menu() to generate the corresponding menu.
+It gets filled in the BEGIN block of this module.
+
+=item %primary_sub_menu
+
+The keys of this hash reference are the names of items in the primary_menu array 
+which have sub-menus.  For each key, the corresponding value is a reference to
+an array containing components extracted from lines in mydesk.tab which begin
+with primsub:.
+This hash, which is used by primary_menu to generate sub-menus, is populated in
+the BEGIN block.
+
+=item @secondary_menu
+
+The elements of this array reference arrays that are made up of the components
+of those lines of mydesk.tab that start with scnd.
+It is used by secondary_menu() to generate the corresponding menu.
+It gets filled in the BEGIN block of this module.
+
+=back
+
 =head1 SUBROUTINES
 
 =over
 
-Little texts
+=item prep_menuitems(\@menuitem)
+
+This routine wraps a menuitem in proper HTML. It is used by primary_menu() and 
+secondary_menu().
+
+=item primary_menu()
 
-=item initlittle()
+This routine evaluates @primary_menu and returns XHTML for the menu
+that contains following links: About, Message, Roles, Help, Logout
+@primary_menu is filled within the BEGIN block of this module with 
+entries from mydesk.tab 
 
-=item menubuttons()
+=item secondary_menu()
 
-This gets called at the top of the body section
+Same as primary_menu() but operates on @secondary_menu.
 
-=item show_return_link()
+=item create_submenu()
 
-=item registerurl()
+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
+(no hover psuedo class) via LC_hoverable class for <li> tag for top-
+level item, which employs jQuery to handle behavior on mouseover.
 
-This gets called in the header section
+Inputs: 4 - (a) link and (b) target for anchor href in top level item,
+            (c) title for text wrapped by anchor tag in top level item.
+            (d) reference to array of arrays of sub-menu items.
 
 =item innerregister()
 
-This gets called in order to register a URL, both with the Remote
-and in the body of the document
+This gets called in order to register a URL in the body of the document
 
 =item loadevents()
 
@@ -101,12 +167,11 @@ The javascript is usually similar to "go
 
 =item rawconfig()
 
-=item close()
-
-=item footer()
-
 =item utilityfunctions()
 
+Output from this routine is a number of javascript functions called by
+items in the inline menu, and in some cases items in the Main Menu page. 
+
 =item serverform()
 
 =item constspaceform()
@@ -131,12 +196,13 @@ use Apache::lonhtmlcommon();
 use Apache::loncommon();
 use Apache::lonenc();
 use Apache::lonlocal;
-use Apache::loncoursequeueadmin;
+use Apache::lonmsg();
 use LONCAPA qw(:DEFAULT :match);
 use HTML::Entities();
+use Apache::lonwishlist();
 
 use vars qw(@desklines %category_names %category_members %category_positions 
-            $readdesk @primary_menu @secondary_menu);
+            $readdesk @primary_menu %primary_submenu @secondary_menu %secondary_submenu);
 
 my @inlineremote;
 
@@ -151,23 +217,26 @@ sub prep_menuitem {
     } else {             # textual Link
         $link = &mt($$menuitem[3]);
     }
-    if($$menuitem[4] eq 'newmsg'){   #special style for New Messages
-        return '<li><a href="'.$$menuitem[0].'"><span class="LC_new_message">'.$link.'</span></a></li>';
-    }
-    return '<li><a href="'.$$menuitem[0].'">'.$link.'</a></li>';
+    return '<li><a' 
+           # highlighting for new messages
+           . ( $$menuitem[4] eq 'newmsg' ? ' class="LC_new_message"' : '') 
+           . 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, Roles, Help, Logout
+# About, Message, Personal, 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 $custommenu = &Apache::loncommon::needs_gci_custom();
-    my $numdc = &Apache::loncommon::check_for_gci_dc();
     # each element of @primary contains following array:
     # (link url, icon path, alt text, link text, condition)
+    my $public;
+    if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
+        || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {
+        $public = 1;
+    }
     foreach my $menuitem (@primary_menu) {
         # evaluate conditions 
         next if    ref($menuitem)       ne 'ARRAY';    #
@@ -175,105 +244,193 @@ sub primary_menu {
                 && &Apache::lonmsg::mynewmail();       # whether a new msg 
         next if    $$menuitem[4]        eq 'newmsg'    # arrived or not
                 && !&Apache::lonmsg::mynewmail();      # 
-        next if    $$menuitem[4]        !~ /public/    ##we've a public user, 
-                && $env{'user.name'}    eq 'public'    ##who should not see all 
-                && $env{'user.domain'}  eq 'public';   ##links
+        next if    $$menuitem[4]        !~ /public/    ##we've a public user,
+                && $public;                            ##who should not see all
+                                                       ##links
         next if    $$menuitem[4]        eq 'onlypublic'# hide links which are 
-                && $env{'user.name'}    ne 'public'    # only visible to public
-                && $env{'user.domain'}  ne 'public';   # users
-        next if    $$menuitem[4]        eq 'gci'
-                && (!$custommenu || $env{'request.role'} =~ m{^st\./gcitest/});
-        next if    $$menuitem[4]        eq 'home'
-                && (($custommenu) || ($env{'user.domain'} eq 'gcitest') || 
-                    (($env{'user.domain'} eq 'gci') && !$numdc));
-        next if    $$menuitem[4]        eq 'gcitest'
-                && (($env{'user.domain'} eq 'gci') || ($env{'request.role'} eq 'cm'));
-        next if    $$menuitem[4]        eq 'roles'     # hide links which are
-                && $custommenu;                        # not visible when GCI
-        next if    $$menuitem[4]        eq 'courses'   # tabbed interface in use
-                && $custommenu;                        # 
+                && !$public;                           # only visible to public
+                                                       # users
         next if    $$menuitem[4]        eq 'roles'     ##show links depending on
                 && &Apache::loncommon::show_course();  ##term 'Courses' or 
         next if    $$menuitem[4]        eq 'courses'   ##'Roles' wanted
                 && !&Apache::loncommon::show_course(); ##
         
-            
-        if ($$menuitem[3] eq 'Help') { # special treatment for helplink
-            $menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
+        my $title = $menuitem->[3];
+        if (defined($primary_submenu{$title})) {
+            my ($link,$target);
+            if ($menuitem->[0] ne '') {
+                $link = $menuitem->[0];
+                $target = '_top';
+            } else {
+                $link = '#';
+            }
+            my @primsub;
+            if (ref($primary_submenu{$title}) eq 'ARRAY') {
+                foreach my $item (@{$primary_submenu{$title}}) {
+                    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);
+                } elsif ($link) {
+                    $menu .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
+                }
+            }
+        } elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink
+            if ($public) {
+                my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
+                my $defdom = &Apache::lonnet::default_login_domain();
+                my $to = &Apache::loncommon::build_recipient_list(undef,
+                                                                  'helpdeskmail',
+                                                                  $defdom,$origmail);
+                if ($to ne '') {
+                    $menu .= &prep_menuitem($menuitem); 
+                }
+            } else {
+                $menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
+            }
         } else {
-            my @items = @{$menuitem};
-            $items[0] = 'javascript:'.$menuitem->[0].';';
-            $menu .= &prep_menuitem(\@items);
+            $menu .= 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>";
 }
 
+#returns hashref {user=>'',dom=>''} containing:
+#   own name, domain if user is au
+#   name, domain of parent author if user is ca or aa
+#empty return if user is not an author or not on homeserver
+#
+#TODO this should probably be moved somewhere more central
+#since it can be used by different parts of the system
+sub getauthor{
+    return unless $env{'request.role'}=~/^(ca|aa|au)/; #nothing to do if user isn't some kind of author
+
+                        #co- or assistent author?
+    my ($dom, $user) = ($env{'request.role'} =~ /^(?:ca|aa)\.\/($match_domain)\/($match_username)$/)
+                       ? ($1, $2) #domain, username of the parent author
+                       : @env{ ('request.role.domain', 'user.name') }; #own domain, username
+
+    # current server == home server?
+    my $home =  &Apache::lonnet::homeserver($user,$dom);
+    foreach (&Apache::lonnet::current_machine_ids()){
+        return {user => $user, dom => $dom} if $_ eq $home;
+    }
+
+    # if wrong server
+    return;
+}
 
 sub secondary_menu {
     my $menu;
 
     my $crstype = &Apache::loncommon::course_type();
-    my $canedit = &Apache::lonnet::allowed('mdc', $env{'request.course.id'});
-    my $canviewgrps = &Apache::lonnet::allowed('vcg', $env{'request.course.id'}
-                   . ($env{'request.course.sec'} ? "/$env{'request.course.sec'}"
-                                                 : '')); 
-    my $showlink = &show_return_link();
+    my $crs_sec = $env{'request.course.id'} . ($env{'request.course.sec'} 
+                                               ? "/$env{'request.course.sec'}"
+                                               : '');
+    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 $canmodpara    = &Apache::lonnet::allowed('opa', $crs_sec);
+    my $canvgr        = &Apache::lonnet::allowed('vgr', $crs_sec);
+    my $canmgr        = &Apache::lonnet::allowed('mgr', $crs_sec);
+    my $author        = &getauthor();
+
+    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 $custommenu = &Apache::loncommon::needs_gci_custom();
-    my $numdc = &Apache::loncommon::check_for_gci_dc();
-    my $role = $env{'request.role'};
+
+    my ($roleswitcher_js,$roleswitcher_form);
+
     foreach my $menuitem (@secondary_menu) {
         # evaluate conditions 
         next if    ref($menuitem)  ne 'ARRAY';
-        next if    $$menuitem[4]   eq 'showmenu'
-                && ($custommenu || (!$numdc && $role eq 'cm'));
-        next if    $$menuitem[4]   ne 'showmenu'
-                && $$menuitem[4]   ne 'author'
+        next if    $$menuitem[4]   ne 'always'
+                && ($$menuitem[4]  ne 'author' && $$menuitem[4] ne 'cca')
                 && !$env{'request.course.id'};
-        next if    $$menuitem[4]   eq 'showreturn'
-                && !$showlink
-                && !($env{'request.state'} eq 'construct');
         next if    $$menuitem[4]   =~ /^mdc/
                 && !$canedit;
         next if    $$menuitem[4]  eq 'mdcCourse'
-                && $crstype eq 'Community';
+                && ($crstype eq 'Community');
         next if    $$menuitem[4]  eq 'mdcCommunity'
-                && $crstype ne 'Community';
-        next if    $$menuitem[4]  =~ /^remotenav/
-                && $env{'environment.remotenavmap'} ne 'on';
-        next if    $$menuitem[4]  =~ /noremotenav/
-                && $env{'environment.remotenavmap'} eq 'on';
-        next if $$menuitem[4] =~ /^(no|)remotenav$/ 
-                && $crstype eq 'Community';
-        next if $$menuitem[4] =~ /^(no|)remotenavCommunity$/ 
-                && $crstype ne 'Community';
-        next if    $$menuitem[4]   =~ /showgroups$/
-                && !$canviewgrps
-                && !%groups;
-        next if   $$menuitem[4]  eq 'showroles'
-                && ($custommenu || !$numdc || ($numdc && $env{'request.noversionuri'} eq '/adm/roles'));
-        if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'} && !$custommenu) {
-            # special treatment for role selector
-            my $roles_selector = &roles_selector(
-                        $env{'course.' . $env{'request.course.id'} . '.domain'},
-                        $env{'course.' . $env{'request.course.id'} . '.num'}  );
-
-            $menu .= $roles_selector ? "<li>$roles_selector</li>"
-                                     : '';
-        } elsif ($env{'environment.remotenavmap'} eq 'on') {
-            # open link using javascript when remote navmap is activated
-            my @items = @{$menuitem}; 
-            if ($menuitem->[4] eq 'remotenav') {
-                $items[0] = "javascript:gonav('$menuitem->[0]');";
+                && ($crstype eq 'Course');
+        next if    $$menuitem[4]  eq 'nvgr'
+                && $canvgr;
+        next if    $$menuitem[4]  eq 'vgr'
+                && !$canvgr;
+        next if    $$menuitem[4]   eq 'cst'
+                && !$canmodifyuser;
+        next if    $$menuitem[4]   eq 'ncst'
+                && ($canmodifyuser || !$canviewroster);
+        next if    $$menuitem[4]   eq 'mgr'
+                && !$canmgr;
+        next if    $$menuitem[4]   eq 'nmgr'
+                && $canmgr;
+        next if    $$menuitem[4]   eq 'whn'
+                && !$canviewwnew;
+        next if    $$menuitem[4]   eq 'opa'
+                && !$canmodpara;
+        next if    $$menuitem[4]   eq 'nvcg'
+                && ($canviewgrps || !%groups);
+        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 {
-                $items[0] = "javascript:go('$menuitem->[0]');";
+                $link = '#';
             }
-            $menu .= &prep_menuitem(\@items);
+            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'}) {
+            # special treatment for role selector
+            ($roleswitcher_js,$roleswitcher_form,my $switcher) =
+                &roles_selector(
+                        $env{'course.' . $env{'request.course.id'} . '.domain'},
+                        $env{'course.' . $env{'request.course.id'} . '.num'}
+                );
+            $menu .= $switcher;
         } else {
             $menu .= &prep_menuitem(\@$menuitem);
         }
@@ -289,288 +446,69 @@ sub secondary_menu {
             and (   $env{'request.noversionuri'} eq '' 
                  || !defined($env{'request.noversionuri'}))) 
         {
-            ($escurl = $env{'request.filename'}) =~ 
-                s{^/home/([^/]+)/public_html/(.*)$}{/priv/$1/$2};
-
+            my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+            ($escurl = $env{'request.filename'}) =~ s{^\Q$londocroot\E}{};
             $escurl  = &escape($escurl);
         }    
         $menu =~ s/\[url\]/$escurl/g;
         $menu =~ s/\[symb\]/$escsymb/g;
     }
-
-    return "<ul id=\"LC_secondary_menu\">$menu</ul>";
-}
-
-sub gci_secondary_menu {
-    my %courses = (
-        'review' => 'gci_9615072b469884921gcil1',
-        'submit' => 'gci_1H96711d710194bfegcil1',
-        'tutorial' => 'gci_5422913620b814c90gcil1',
-    );
-    my %linktext = (
-        'review'      => 'Review Questions',
-        'submit'      => 'Submit Questions',
-        'managetest'  => 'Manage Tests',
-        'tutorial'    => 'Tutorials',
-    );
-    my %links = (
-                  'managetest' => '/adm/menu',
-                );
-    my $current = 'managetest';
-    if ($env{'form.destinationurl'} eq '/adm/gci_info') {
-        undef($current);
-    }
-    foreach my $key (keys(%courses)) {
-        $links{$key} = "javascript:switchpage('$key');";
-        if ($env{'request.course.id'} eq $courses{$key}) {
-            if ($env{'environment.remotenavmap'} eq 'on') {
-                $links{$key} = "javascript:gonav('/adm/navmaps')";
-            } else {
-                $links{$key} = '/adm/navmaps';
-            }
-            $current = $key;
-            $links{'managetest'} = '/adm/roles?selectrole=1&cm=1&orgurl=%2fadm%2fmenu';
-        }
-    }
-    my @menutabs = ('review','submit','managetest','tutorial');
-    my $tabs;
-    foreach my $item (@menutabs) {
-        if ($item eq $current) {
-            $tabs .= '<li id="current"><a href="'.$links{$item}.'">'.
-                     $linktext{$item}.'</a></li>';
-        } else {
-            $tabs .= '<li><a href="'.$links{$item}.'">'.
-                     $linktext{$item}.'</a></li>';
-        }
-    }
-    return '<div id="gciheader">'.
-           '<ul>'.$tabs.'</ul></div><br />';
-}
-
-#
-# This routine returns a translated hash for the menu items in the top inline menu row
-# Probably should be in mydesk.tab
-
-#SD this sub is deprecated - don't use it
-sub initlittle {
-    return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
-				       'nav' => 'Course Contents',
-				       'main' => 'Main Menu',
-                                       'roles' => (&Apache::loncommon::show_course()?
-                                                    'Courses':'Roles'),
-                                       'other' => 'Other Roles',
-                                       'docs' => 'Edit Course',
-                                       'exit' => 'Logout',
-                                       'login' => 'Log In',
-				       'launch' => 'Launch Remote Control',
-                                       'groups' => 'Groups',
-                                       'gdoc' => 'Community Documents',
-                                       );
-}
-
-#SD this sub is deprecated - don't use it
-#SD functionality is covered by new loncommon::bodytag and primary_menu(), secondary_menu()
-sub menubuttons {
-    my $forcereg=shift;
-    my $titletable=shift;
-#
-# Early-out for pages that should not have a menu, triggered by query string "inhibitmenu=yes"
-#
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-					    ['inhibitmenu']);
-    if (($env{'form.inhibitmenu'} eq 'yes') ||
-        ($ENV{'REQUEST_URI'} eq '/adm/logout')) { return ''; }
-
-    if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
-
-    my %lt=&initlittle();
-    my $navmaps='';
-    my $reloadlink='';
-    my $docs='';
-    my $groups='';
-    my $roles='<a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a>';
-    my $role_selector;
-    my $showgroups=0;
-    my ($cnum,$cdom);
-#
-# if the URL is hidden, symbs and the non-versioned version of the URL would be encrypted
-#
-    my $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
-    my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
-
-    my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
-    $logo = '<a href="/adm/about.html"><img src="'.
-	$logo.'" alt="LON-CAPA Logo" class="LC_noBorder" /></a>';
-
-    if ($env{'request.state'} eq 'construct') {
-#
-# We are in construction space
-#
-        if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
-            my $returnurl = $env{'request.filename'};
-            $returnurl =~ s:^/home/([^/]+)/public_html/(.*)$:/priv/$1/$2:;
-            $escurl = &escape($returnurl);
-        }
-    }
-    if ($env{'request.course.id'}) {
-#
-# We are in a course
-#
-        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        my %coursegroups;
-        my $viewgrps_permission =
-	    &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
-        if (!$viewgrps_permission) {
-            %coursegroups = &Apache::lonnet::get_active_groups($env{'user.domain'},$env{'user.name'},$cdom,$cnum);
-	}
-        if ((keys(%coursegroups) > 0) || ($viewgrps_permission)) {
-            $showgroups = 1;
-        }
-        $role_selector = &roles_selector($cdom,$cnum);
-        if ($role_selector) {
-            $roles = '<span class="LC_nobreak">'.$role_selector.'&nbsp;&nbsp;<a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></span>';
-        }
-    }
-
-    if ($env{'environment.remote'} eq 'off') {
-# Remote Control is switched off
-# figure out colors
-        my %lt=&initlittle();
-
-        my $domain=&Apache::loncommon::determinedomain();
-        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);
-            <ol class="LC_primary_menu LC_right">
-                <li>$logo</li>
-                <li><a href="/adm/roles" target="_top">$lt{'login'}</a></li>
-            </ol>
-            <hr />
-ENDINLINEMENU
+    $menu =~ s/\[uname\]/$$author{user}/g;
+    $menu =~ s/\[udom\]/$$author{dom}/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 {
+    my ($link,$target,$title,$submenu) = @_;
+    return unless (ref($submenu) eq 'ARRAY');
+    my $disptarget;
+    if ($target ne '') {
+        $disptarget = ' target="'.$target.'"';
+    }
+    my $menu = '<li class="LC_hoverable">'.
+               '<a href="'.$link.'"'.$disptarget.'>'. 
+               '<span class="LC_nobreak">'.&mt($title).
+               '<span class="LC_fontsize_small" style="font-weight:normal;">'.
+               ' &#9660;</span></span></a>'.
+               '<ul>';
+    my $count = 0;
+    my $numsub = scalar(@{$submenu});
+    foreach my $item (@{$submenu}) {
+        $count ++;
+        if (ref($item) eq 'ARRAY') {
+            my $borderbot;
+            if ($count == $numsub) {
+                $borderbot = 'border-bottom:1px solid black;';
+            }
+            $menu .= '<li style="margin:0;padding:0;'.
+                     $borderbot.'"><a href="'.$item->[0].'">'.
+                     &mt($item->[1]).'</a></li>';
         }
-        $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='.
-		$escsymb;
-	    if ($env{'environment.remotenavmap'} eq 'on') {
-		$link="javascript:gonav('".$link."')";
-	    }
-	    $navmaps=(<<ENDNAV);
-<li><a href="$link" target="_top">$lt{'nav'}</a></li>
-ENDNAV
-            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);
-<li><a href="/adm/coursedocs" target="_top">$text</a></li>
-ENDDOCS
-            }
-            if ($showgroups) {
-                $groups =(<<ENDGROUPS);
-<li><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></li>
-ENDGROUPS
-            }
-	    if (&show_return_link()) {
-                my $escreload=&escape('return:');
-                $reloadlink=(<<ENDRELOAD);
-<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>';
-				$role_selector = '<li>'.$role_selector.'</li>';
-            }
-        }
-	if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
-	    my $escreload=&escape('return:');
-	    $reloadlink=(<<ENDCRELOAD);
-<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li>
-ENDCRELOAD
-        }
-    my $reg     = $forcereg ? &innerregister($forcereg,$titletable) : '';
-    my $form    = &serverform();
-    my $utility = &utilityfunctions();
-
-    #Prepare the message link that indicates the arrival of new mail
-    my $messagelink = &Apache::lonmsg::mynewmail() ? "Message (new)" : "Message";
-       $messagelink = '<a href="javascript:go(\'/adm/communicate\');">'
-                      . mt($messagelink) .'</a>';
-
-    my $helplink = &Apache::loncommon::top_nav_help('Help');
-	return (<<ENDINLINEMENU);
-<script type="text/javascript">
-// <![CDATA[
-// BEGIN LON-CAPA Internal
-$utility
-// ]]>
-</script>
-<ol class="LC_primary_menu 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_secondary_menu">
-<li><a href="/adm/menu" target="_top">$lt{'main'}</a></li>
-$reloadlink
-$navmaps
-$docs
-$groups
-$role_selector
-</ul>
-$form
-<script type="text/javascript">
-// END LON-CAPA Internal
-</script>
-$reg
-ENDINLINEMENU
-    } else {
-	return '';
     }
+    $menu .= '</ul></li>';
+    return $menu;
 }
 
-sub show_return_link {
-    return unless ($env{'request.course.id'});
-    if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
-        || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
-        return if ($env{'form.register'});
-    }
-    return (($env{'request.noversionuri'}=~m{^/(res|public)/} &&
-	     $env{'request.symb'} eq '')
-	    ||
-	    ($env{'request.noversionuri'}=~ m{^/cgi-bin/printout.pl})
-	    ||
-	    (($env{'request.noversionuri'}=~/^\/adm\//) &&
-	     ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
-	     ($env{'request.noversionuri'}!~
-	      m[^/adm/.*/(smppg|bulletinboard)($|\?)])
-	     ));
-}
-
-
 sub registerurl {
     my ($forcereg) = @_;
     my $result = '';
     if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
     my $force_title='';
     if ($env{'request.state'} eq 'construct') {
-	$force_title=&Apache::lonxml::display_title();
+        $force_title=&Apache::lonxml::display_title();
     }
-    if (($env{'environment.remote'} eq 'off') ||
-        ((($env{'request.publicaccess'}) || 
+    if (($env{'environment.remote'} ne 'on') ||
+        ((($env{'request.publicaccess'}) ||
          (!&Apache::lonnet::is_on_map(
-	   &unescape($env{'request.noversionuri'})))) &&
+           &unescape($env{'request.noversionuri'})))) &&
         (!$forcereg))) {
- 	return
+        return
         $result
        .'<script type="text/javascript">'."\n"
        .'// <![CDATA['."\n"
@@ -586,9 +524,7 @@ sub registerurl {
 }
 
 sub innerregister {
-    my ($forcereg,$titletable,$bread_crumbs) = @_;
-    my $result = '';
-    my ($uname,$thisdisfn);
+    my ($forcereg,$bread_crumbs,$group) = @_;
     my $const_space = ($env{'request.state'} eq 'construct');
     my $is_const_dir = 0;
 
@@ -596,228 +532,190 @@ sub innerregister {
 
     $env{'request.registered'} = 1;
 
-    my $noremote = ($env{'environment.remote'} eq 'off');
-    
+    my $noremote = ($env{'environment.remote'} ne 'on');
+
     undef(@inlineremote);
 
     my $reopen=&Apache::lonmenu::reopenmenu();
 
     my $newmail='';
 
-    if (&Apache::lonmsg::newmail() && !$noremote) { 
+    if (&Apache::lonmsg::newmail() && !$noremote) {
         # We have new mail and remote is up
         $newmail= 'swmenu.setstatus("you have","messages");';
-    } 
+    }
 
-    my ($breadcrumb,$separator);
-    if ($noremote
-	     && ($env{'request.symb'}) 
-	     && ($env{'request.course.id'})) {
-
-        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 $contentstext;
-        if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
-            $contentstext = &mt('Community Contents');
-        } else {
-            $contentstext = &mt('Course Contents');
-        }
-        my @crumbs;
-        unless (($forcereg) && ($env{'request.noversionuri'} eq '/adm/navmaps')
-                && ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
-            my $link = "javascript:gopost('/adm/navmaps','')";
-            if ($env{'environment.remotenavmap'} eq 'on') {
-                $link = "javascript:gonav('/adm/navmaps','')"
-            }
-            @crumbs = ({text  => Apache::loncommon::course_type()
-                                . ' Contents',
-                        href  => $link});
-        }
-        if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
-            push(@crumbs, {text  => '...',
-                           no_mt => 1});
-        }
+    my ($mapurl,$resurl);
+
+    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'};
 
-        push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle 
-                                                   && $maptitle ne 'default.sequence' 
-                                                   && $maptitle ne $coursetitle);
+            my $maptitle = &Apache::lonnet::gettitle($mapurl);
+            my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());
 
-        push @crumbs, {text => $restitle, no_mt => 1} if $restitle; 
 
+#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);
+        } 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;
+            }
+            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(@crumbs);
-        #$breadcrumb .= &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0);
-	unless (($env{'request.state'} eq 'edit') || ($newmail) ||
-		($env{'request.state'} eq 'construct') ||
-		($env{'form.register'})) {
-            $separator = &Apache::loncommon::head_subbox();
+        unless ($env{'request.noversionuri'} =~ m{^/adm/$match_domain/$match_username/aboutme$}) {
+            &Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'});
         }
-        #
     }
-    if ($env{'request.state'} eq 'construct') {
-        $newmail = $titletable;
-    } 
     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)) {
-# -- 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;
+    if ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/})
+                       || ($forcereg)) {
 
+        my %swtext;
+        if ($noremote) {
+            %swtext = &get_inline_text();
+        } else {
+            %swtext = &get_rc_text();
+        }
         my $hwkadd='';
-        if ($env{'request.symb'} ne '' &&
-	    $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
-	    if (&Apache::lonnet::allowed('mgr',$crs)) {
-		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_4]',
-                       "gocmd('/adm/grades','gradingmenu')",
-                       'Modify user grades for this assessment resource');
-            } elsif (&Apache::lonnet::allowed('vgr',$crs)) {
-		$hwkadd.=&switch('','',7,2,'subm.gif','view sub-[_1]','missions[_1]',
-                       "gocmd('/adm/grades','submission')",
-		       'View user submissions for this assessment resource');
-            }
-	}
-	if ($env{'request.symb'} ne '' &&
-	    &Apache::lonnet::allowed('opa',$crs)) {
-	    $hwkadd.=&switch('','',7,3,'pparm.gif','problem[_2]','parms[_2]',
-			     "gocmd('/adm/parmset','set')",
-			     'Modify parameter settings for this resource');
-	}
-# -- 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'};
+
+        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 ($env{'user.author'}) {
-            if ($env{'request.role'}=~/^(aa|ca|au)/) {
+        if ($editbutton eq '') {
+            $editbutton = &clear(6,1);
+        }
+
 #
-# We have the role of an author
+# This applies in course context
 #
-                # Set defaults for authors
-                my ($top,$bottom) = ('con-','struct');
-                my $action = "go('/priv/".$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/".$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/".$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;
+        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');
             }
-#
-# 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;
-            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) {
-                    $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;
-                        }
-                    }
+            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'}");
                 }
             }
-            # Finally, turn the button on or off
-            if ($cfile && !$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 {
-                    $editbutton=&switch
-                       ('','',6,1,'pcstr.gif','edit[_1]','resource[_2]',
-                     "go('".$cfile."');","Edit this resource");
-                    $noeditbutton = 0;
+#
+# Determine whether or not to show Grades and Submissions buttons
+#
+            if ($env{'request.symb'} ne '' &&
+                $env{'request.filename'}=~/$LONCAPA::assess_re/) {
+                if ($perms{'mgr'}) {
+                    $hwkadd.= &switch('','',7,2,'pgrd.png','Content Grades',
+                                      'grades[_4]',
+                                      "gocmd('/adm/grades','gradingmenu')",
+                                      'Content Grades');
+                } elsif ($perms{'vgr'}) {
+                    $hwkadd .= &switch('','',7,2,'subm.png','Content Submissions',
+                                       'missions[_1]',
+                                       "gocmd('/adm/grades','submission')",
+                                       'Content Submissions');
                 }
-            } 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.gif','edit[_1]',
-                                         'resource[_2]',"go('".$cfile."');",
-                                         'Edit this resource');
-                        }
-                    }
+            if (($env{'request.symb'} ne '') && ($perms{'opa'})) {
+                $hwkadd .= &switch('','',7,3,'pparm.png','Content Settings',
+                                   'parms[_2]',"gocmd('/adm/parmset','set')",
+                                   'Content Settings');
+            }
+# End grades/submissions check
+
+#
+# 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';
                 }
+                $hwkadd .= &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,$cstritems);
         if ($const_space) {
 #
 # We are in construction space
 #
-	    my ($uname,$thisdisfn) =
-		($env{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|);
-            my $currdir = '/priv/'.$uname.'/'.$thisdisfn;
+
+            my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+	    my ($udom,$uname,$thisdisfn) =
+		($env{'request.filename'}=~m{^\Q$londocroot/priv/\E([^/]+)/([^/]+)/(.*)$});
+            my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn;
             if ($currdir =~ m-/$-) {
                 $is_const_dir = 1;
             } else {
@@ -828,74 +726,105 @@ sub innerregister {
 # Probably should be in mydesk.tab
 #
                 $menuitems=(<<ENDMENUITEMS);
-s&6&1&list.gif&list[_1]&dir[_1]&golist('$esc_currdir')&List current directory
-s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$cleandisfn')&Retrieve old version
-s&6&3&pub.gif&publish[_1]&resource[_3]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
-s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$cleandisfn')&Delete this resource
-s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document
+s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory
+s&6&2&rtrv.png&Retrieve&version[_1]&gocstr('/adm/retrieve','/priv/$udom/$uname/$cleandisfn')&Retrieve old version
+s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource
+s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource
+s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document
 ENDMENUITEMS
+                unless ($noremote) {
+                    $cstritems = $menuitems;
+                    undef($menuitems);
+                }
             }
-            if ($noremote) {
-                if (ref($bread_crumbs) eq 'ARRAY') {
-                    &Apache::lonhtmlcommon::clear_breadcrumbs();
-                    foreach my $crumb (@{$bread_crumbs}){
-                        &Apache::lonhtmlcommon::add_breadcrumb($crumb);
-                    }
+            if (ref($bread_crumbs) eq 'ARRAY') {
+                &Apache::lonhtmlcommon::clear_breadcrumbs();
+                foreach my $crumb (@{$bread_crumbs}){
+                     &Apache::lonhtmlcommon::add_breadcrumb($crumb);
                 }
             }
         } 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);
 c&3&1
-s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&&1
-s&2&3&forw.gif&forward[_1]&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&&3
+s&2&1&back.png&$swtext{'back'}&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
+s&2&3&forw.png&$swtext{'forw'}&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3
 c&6&3
 c&8&1
 c&8&2
-s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
-s&9&1&sbkm.gif&set[_1]&bookmark[_2]&set_bookmark()&Set a bookmark for this resource&&1
+s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
+            $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&alnk.png&$swtext{'alnk'}&linkstor[_1]&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();
 my ($symb_old,$symb_old_enc) = &Apache::loncommon::clean_symb($currentURL);
 my $annotation = &Apache::loncommon::get_annotation($symb_old,$symb_old_enc);
 $menuitems.="s&9&3&";
 if(length($annotation) > 0){
-	$menuitems.="anot2.gif";
+	$menuitems.="anot2.png";
 }else{
-	$menuitems.="anot.gif";
+	$menuitems.="anot.png";
 }
-$menuitems.="&anno-[_1]&tations[_1]&annotate()&";
+$menuitems.="&$swtext{'anot'}&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|portfolio)(\?|$)/) {
-		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) {
+            unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
+		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.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata
+s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info()&Show Metadata
+ENDREALRES
+                }
+                unless ($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) {
+	            $menuitems.=(<<ENDREALRES);
+s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
 ENDREALRES
                 }
-	        $menuitems.=(<<ENDREALRES);
-s&8&1&eval.gif&evaluate[_1]&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
-s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
+                $menuitems.=(<<ENDREALRES);
+s&8&2&fdbk.png&$swtext{'fdbk'}&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);
-s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+            unless ($got_prt) {
+	        $menuitems .= (<<ENDMENUITEMS);
+s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 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&alnk.png&$swtext{'alnk'}&linkstor[_1]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
+ENDMENUITEMS
+                    $got_wishlist = 1;
+                }
+            }
 	}
+        unless ($got_prt) {
+            $menuitems .= (<<ENDMENUITEMS);
+c&8&3
+ENDMENUITEMS
+        }
+        unless ($got_wishlist) {
+            $menuitems .= (<<ENDMENUITEMS);
+c&9&1
+ENDMENUITEMS
+        }
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);
@@ -914,151 +843,115 @@ ENDMENUITEMS
                 }
             }
         }
-
         if ($noremote) {
 	    my $addremote=0;
 	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
-	    my $inlinebuttons='';
+            if ($addremote) {
 
-    if ($addremote) {
+                &Apache::lonhtmlcommon::clear_breadcrumb_tools();
 
-        Apache::lonhtmlcommon::clear_breadcrumb_tools();
+                &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                    'navigation', @inlineremote[21,23]);
 
-            Apache::lonhtmlcommon::add_breadcrumb_tool(
-                'navigation', @inlineremote[21,23]);
-        if(hidden_button_check() ne 'yes') {
-            Apache::lonhtmlcommon::add_breadcrumb_tool(
-                'tools', @inlineremote[93,91,81,82,83]);
-
-            #publish button in construction space
-            if ($env{'request.state'} eq 'construct'){
-                Apache::lonhtmlcommon::add_breadcrumb_tool(
-                     'advtools', @inlineremote[63]);
-            }else{
-                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,92]);
-            }
-        }
-
-#       # Registered, textual output
-#        if ( $env{'environment.icons'} eq 'iconsonly' ) {
-#            $inlinebuttons = (<<ENDARROWSINLINE);
-#<tr><td>
-#$inlineremote[21] $inlineremote[23]
-#ENDARROWSINLINE
-#            if ( &hidden_button_check() ne 'yes' ) {
-#                $inlinebuttons .= (<<ENDINLINEICONS);
-#$inlineremote[61] $inlineremote[63]
-#$inlineremote[71] $inlineremote[72] $inlineremote[73]
-#$inlineremote[81] $inlineremote[82] $inlineremote[83]
-#$inlineremote[91] $inlineremote[92] $inlineremote[93]</td></tr>
-#ENDINLINEICONS
-#            }
-#        } else { # not iconsonly
-#            if ( $inlineremote[21] ne '' || $inlineremote[23] ne '' ) {
-#                $inlinebuttons = (<<ENDFIRSTLINE);
-#<tr><td>$inlineremote[21]</td><td>&nbsp;</td><td>$inlineremote[23]</td></tr>
-#ENDFIRSTLINE
-#            }
-#            if ( &hidden_button_check() ne 'yes' ) {
-#                foreach my $row ( 6 .. 9 ) {
-#                    if (   $inlineremote[ ${row} . '1' ] ne ''
-#                        || $inlineremote[ $row . '2' ] ne ''
-#                        || $inlineremote[ $row . '3' ] ne '' )
-#                    {
-#                        $inlinebuttons .= <<"ENDLINE";
-#<tr><td>$inlineremote["${row}1"]</td><td>$inlineremote["${row}2"]</td><td>$inlineremote["${row}3"]</td></tr>
-#ENDLINE
-#                    }
-#                }
-#            }
-#        }
-    }
-        #SD see below
-        $breadcrumb = &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0);
-	    $result =(<<ENDREGTEXT);
-<script type="text/javascript">
-// BEGIN LON-CAPA Internal
-</script>
-$timesync
-$breadcrumb
-<!-- $tablestart -->
-<!-- $inlinebuttons -->
-<!-- $tableend -->
-$newmail
-<!-- $separator -->
-<script type="text/javascript">
-// END LON-CAPA Internal
-</script>
+                my $countdown = &countdown_timer();
+                if (&hidden_button_check() eq 'yes') {
+                    if ($countdown) {
+                        &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);
+                    }
+                } else {
+                    my @tools = @inlineremote[93,91,81,82,83];
+                    if ($countdown) {
+                        unshift(@tools,$countdown);
+                    }
+                    &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                        'tools',@tools);
+
+                    #publish button in construction space
+                    if ($env{'request.state'} eq 'construct'){
+                        &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                            'advtools', $inlineremote[63]);
+                    } else {
+                        &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                            'tools', $inlineremote[63]);
+                    }
+                    &advtools_crumbs(@inlineremote);
+                }
+            }
+            return   &Apache::lonhtmlcommon::scripttag('', 'start')
+                   . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
+                   . &Apache::lonhtmlcommon::scripttag('', 'end');
 
-ENDREGTEXT
-# Registered, graphical output
         } else {
-	    my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
-	    $requri=&Apache::lonenc::check_encrypt(&unescape($requri));
-	    my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
-	    my $navstatus=&get_nav_status();
-	    my $clearcstr;
-
-	    if ($env{'user.adv'}) { $clearcstr='clearbut(6,1)'; }
-	    $result = (<<ENDREGTHIS);
-     
+            my $cstrcrumbs;
+            if ($const_space) {
+                foreach (split(/\n/,$cstritems)) {
+                    my ($command,@rest)=split(/\&/,$_);
+                    my $idx=10*$rest[0]+$rest[1];
+                    &switch('','',@rest);
+                }
+                &Apache::lonhtmlcommon::add_breadcrumb_tool('advtools',
+                                                            @inlineremote[63,61,71,72]);
+
+                $cstrcrumbs = &Apache::lonhtmlcommon::scripttag('', 'start')
+                             .&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
+                             .&Apache::lonhtmlcommon::scripttag('', 'end');
+            }
+            my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
+            $requri=&Apache::lonenc::check_encrypt(&unescape($requri));
+            my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
+            my $navstatus=&get_nav_status();
+            my $clearcstr;
+
+            if ($env{'user.adv'}) { $clearcstr='clearbut(6,1)'; }
+            return <<ENDREGTHIS;
+
 <script type="text/javascript">
 // <![CDATA[
 // BEGIN LON-CAPA Internal
 var swmenu=null;
 
     function LONCAPAreg() {
-	  swmenu=$reopen;
+          swmenu=$reopen;
           swmenu.clearTimeout(swmenu.menucltim);
           $timesync
           $newmail
           $buttons
-	  swmenu.currentURL="$requri";
+          swmenu.currentURL="$requri";
           swmenu.reloadURL=swmenu.currentURL+window.location.search;
           swmenu.currentSymb="$cursymb";
           swmenu.reloadSymb="$cursymb";
           swmenu.currentStale=0;
-	  $navstatus
+          $navstatus
           $hwkadd
           $editbutton
     }
 
     function LONCAPAstale() {
-	  swmenu=$reopen
+          swmenu=$reopen
           swmenu.currentStale=1;
-          if (swmenu.reloadURL!='' && swmenu.reloadURL!= null) { 
+          if (swmenu.reloadURL!='' && swmenu.reloadURL!= null) {
              swmenu.switchbutton
              (3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence');
-	  }
+          }
           swmenu.clearbut(7,2);
           swmenu.clearbut(7,3);
           swmenu.menucltim=swmenu.setTimeout(
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
  'clearbut(9,1);clearbut(9,3);clearbut(6,3);$clearcstr',
-			  2000);
+                          2000);
       }
 
-// END LON-CAPA Internal 
+// END LON-CAPA Internal
 // ]]>
 </script>
+
+$cstrcrumbs
 ENDREGTHIS
         }
-# =============================================================================
     } else {
-# ========================================== This can or will not be registered
-        if ($noremote) {
-# Not registered
-            $result= (<<ENDDONOTREGTEXT);
-ENDDONOTREGTEXT
-        } else {
+       unless ($noremote) {
 # Not registered, graphical
-           $result = (<<ENDDONOTREGTHIS);
+           return (<<ENDDONOTREGTHIS);
 
 <script type="text/javascript">
 // <![CDATA[
@@ -1066,7 +959,7 @@ ENDDONOTREGTEXT
 var swmenu=null;
 
     function LONCAPAreg() {
-	  swmenu=$reopen
+          swmenu=$reopen
           $timesync
           swmenu.currentStale=1;
           swmenu.clearbut(2,1);
@@ -1074,11 +967,12 @@ var swmenu=null;
           swmenu.clearbut(8,1);
           swmenu.clearbut(8,2);
           swmenu.clearbut(8,3);
+          swmenu.clearbut(9,1);
           if (swmenu.currentURL) {
              swmenu.switchbutton
               (3,1,'reload.gif','return','location','go(currentURL)');
- 	  } else {
-	      swmenu.clearbut(3,1);
+          } else {
+              swmenu.clearbut(3,1);
           }
     }
 
@@ -1089,65 +983,63 @@ var swmenu=null;
 // ]]>
 </script>
 ENDDONOTREGTHIS
-       }
-# =============================================================================
+
+        }
+        return '';
     }
-    return $result;
 }
 
-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/})) {
-        return 1;
-    }
-    return;
+sub get_inline_text {
+    my %text = (
+                 pgrd     => 'Content Grades',
+                 subm     => 'Content Submissions',
+                 pparm    => 'Content Settings',
+                 docs     => 'Folder/Page Content',
+                 pcstr    => 'Edit',
+                 prt      => 'Print',
+                 alnk     => 'Stored Links',
+                 anot     => 'Notes',
+                 catalog  => 'Info',
+                 eval     => 'Evaluate',
+                 fdbk     => 'Feedback',
+    );
+    return %text;
 }
 
-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';
-            }
-        }
-        if ($dest) {
-            $cfile = &HTML::Entities::encode($dest,'"<>&');
-        }
-    }
-    return $cfile;
+sub get_rc_text {
+    my %text = (
+                   pgrd    => 'problem[_1]',
+                   subm    => 'view sub-[_1]',
+                   pparm   => 'problem[_2]',
+                   pcstr   => 'edit[_1]',
+                   prt     => 'prepare[_1]',
+                   back    => 'backward[_1]',
+                   forw    => 'forward[_1]',
+                   alnk    => 'add to[_1]',
+                   anot    => 'anno-[_1]',
+                   catalog => 'catalog[_2]',
+                   eval    => 'evaluate[_1]',
+                   fdbk    => 'feedback[_1]',
+    );
+    return %text;
 }
 
 sub loadevents() {
     if ($env{'request.state'} eq 'construct' ||
-	$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
+        $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
     return 'LONCAPAreg();';
 }
 
 sub unloadevents() {
     if ($env{'request.state'} eq 'construct' ||
-	$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
+        $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
     return 'LONCAPAstale();';
 }
 
-
 sub startupremote {
     my ($lowerurl)=@_;
-    if ($env{'environment.remote'} eq 'off') {
-     return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />');
+    unless ($env{'environment.remote'} eq 'on') {
+        return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />');
     }
 #
 # The Remote actually gets launched!
@@ -1161,25 +1053,25 @@ sub startupremote {
 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 (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='/'; 
+   if (window.status=='|') {
+      window.status='/';
    } else {
       if (window.status=='/') {
          window.status='-';
       } else {
-         if (window.status=='-') { 
-            window.status='\\\\'; 
+         if (window.status=='-') {
+            window.status='\\\\';
          } else {
             if (window.status=='\\\\') { window.status='|'; }
          }
       }
-   } 
+   }
 }
 
 // ---------------------------------------------------------- The wait function
@@ -1190,9 +1082,9 @@ function wait() {
       if (tim==0) {
          clearTimeout(canceltim);
          $configmenu
-         window.location='$lowerurl';  
+         window.location='$lowerurl';
       } else {
-	  window.location='/adm/remote?action=collapse&url=$esclowerurl';
+          window.location='/adm/remote?action=collapse&url=$esclowerurl';
       }
    } else {
       wheelswitch();
@@ -1225,7 +1117,7 @@ ENDSETFLAGS
 }
 
 sub maincall() {
-    if ($env{'environment.remote'} eq 'off') { return ''; }
+    unless ($env{'environment.remote'} eq 'on') { return ''; }
     return(<<ENDMAINCALL);
 <script type="text/javascript">
 // <![CDATA[
@@ -1238,7 +1130,7 @@ ENDMAINCALL
 sub load_remote_msg {
     my ($lowerurl)=@_;
 
-    if ($env{'environment.remote'} eq 'off') { return ''; }
+    unless ($env{'environment.remote'} eq 'on') { return ''; }
 
     my $esclowerurl=&escape($lowerurl);
     my $link=&mt('[_1]Continue[_2] on in Inline Menu mode'
@@ -1262,17 +1154,17 @@ sub get_menu_name {
 
 
 sub reopenmenu {
-   if ($env{'environment.remote'} eq 'off') { return ''; }
+   unless ($env{'environment.remote'} eq 'on') { return ''; }
    my $menuname = &get_menu_name();
    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
    return('window.open('.$nothing.',"'.$menuname.'","",false);');
-} 
+}
 
 
 sub open {
     my $returnval='';
-    if ($env{'environment.remote'} eq 'off') { 
-	return
+    unless ($env{'environment.remote'} eq 'on') {
+        return
         '<script type="text/javascript">'."\n"
        .'// <![CDATA['."\n"
        .'self.name="loncapaclient";'."\n"
@@ -1280,7 +1172,7 @@ sub open {
        .'</script>';
     }
     my $menuname = &get_menu_name();
-    
+
 #    unless (shift eq 'unix') {
 # resizing does not work on linux because of virtual desktop sizes
 #       $returnval.=(<<ENDRESIZE);
@@ -1301,18 +1193,244 @@ ENDOPEN
     return '<script type="text/javascript">'.$returnval.'</script>';
 }
 
+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 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 (($resurl eq "/public/$cdom/$cnum/syllabus") && ($perms{'mdc'})) {
+            if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) {
+                &switch('','',6,1,'pcstr.png','Edit',
+                        'resource[_2]',
+                        "go('/adm/courseprefs?phase=display&actions=courseinfo')",
+                        'Edit this resource');
+                $editbutton = 1;
+            } else {
+                $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);
+                }
+            }
+        }
+    }
+# End determination of 'Edit' icon/button display
+
+    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&recname=$sname&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&origin=aboutme&uname=$sname&udom=$sdom')",
+                            'Slot reservation history');
+                }
+                if ($perms{'srm'}) {
+                    &switch('','',6,7,'contact-new-22x22.png','Records',
+                            '',
+                            "go('/adm/email?recordftf=retrieve&recname=$sname&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&forcesupplement=1&supppath=$esc_path'",
+                        'Folder/Page Content');
+            }
+        }
+    }
+
+# 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 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]);
+    }
+}
 
 # ================================================================== Raw Config
 
 sub clear {
     my ($row,$col)=@_;
-    unless ($env{'environment.remote'} eq 'off') {
+    if ($env{'environment.remote'} eq 'on') {
        if (($row<1) || ($row>13)) { return ''; }
        return "\n".qq(window.status+='.';swmenu.clearbut($row,$col););
-   } else { 
-       $inlineremote[10*$row+$col]='';
-       return ''; 
-   }
+    } else {
+        $inlineremote[10*$row+$col]='';
+        return '';
+    }
 }
 
 # ============================================ Switch a button or create a link
@@ -1326,31 +1444,37 @@ sub switch {
     $top=&mt($top);
     $bot=&mt($bot);
     $desc=&mt($desc);
-    if (($env{'environment.remote'} ne 'off') || ($env{'environment.icons'} eq 'classic')) {
-       $img=&mt($img);
-    }
     my $idx=10*$row+$col;
     $category_members{$cat}.=':'.$idx;
 
-    unless ($env{'environment.remote'} eq 'off') {
-       if (($row<1) || ($row>13)) { return ''; }
+    if ($env{'environment.remote'} eq 'on') {
+        if (($row<1) || ($row>13)) { return ''; }
+        if ($env{'request.state'} eq 'construct') {
+            my $text = $top.' '.$bot;
+            $text=~s/\s*\-\s*//gs;
+            my $pic = '<img alt="'.$text.'" src="'.
+                      &Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img).
+                      '" align="'.($nobreak==3?'right':'left').'" class="LC_icon" />';
+           $inlineremote[$idx] =
+               '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.
+               $pic.'<span class="LC_menubuttons_inline_text">'.$top.'&nbsp;</span></a>';
+        }
 # Remote
-       return "\n".
+        $img=~s/\.png$/\.gif/;
+        return "\n".
  qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
-   } else {
-# Inline Remote
-       if ($env{'environment.icons'} ne 'classic') {
-          $img=~s/\.gif$/\.png/;
-       }
-       if ($nobreak==2) { return ''; }
-       my $text=$top.' '.$bot;
-       $text=~s/\s*\-\s*//gs;
+    }
 
-       my $pic=
+# Inline Menu
+    if ($nobreak==2) { return ''; }
+    my $text=$top.' '.$bot;
+    $text=~s/\s*\-\s*//gs;
+
+    my $pic=
 	   '<img alt="'.$text.'" src="'.
 	   &Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img).
 	   '" align="'.($nobreak==3?'right':'left').'" class="LC_icon" />';
-       if ($env{'browser.interface'} eq 'faketextual') {
+    if ($env{'browser.interface'} eq 'faketextual') {
 # Main Menu
 	   if ($nobreak==3) {
 	       $inlineremote[$idx]="\n".
@@ -1369,17 +1493,22 @@ sub switch {
 		   '</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>';
 	   }
-       } else {
+    } else {
 # Inline Menu
-           if ($env{'environment.icons'} eq 'iconsonly') {
-              $inlineremote[$idx]='<a title="'.$desc.'" href="javascript:'.$act.';">'.$pic.'</a>';
-           } else {
-	      $inlineremote[$idx]=
-		   '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.
-		   '<span class="LC_menubuttons_inline_text">'.$desc.'</span></a>';
-           }
-       }
-   }
+        my @tools = (93,91,81,82,83);
+        unless ($env{'request.state'} eq 'construct') {
+            push(@tools,63);
+        }
+        if (($env{'environment.icons'} eq 'iconsonly') &&
+            (grep(/^$idx$/,@tools))) {
+            $inlineremote[$idx] =
+        '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.'</a>';
+        } else {
+            $inlineremote[$idx] =
+       '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.
+       '<span class="LC_menubuttons_inline_text">'.$top.'&nbsp;</span></a>';
+        }
+    }
     return '';
 }
 
@@ -1399,178 +1528,42 @@ sub secondlevel {
 
 sub openmenu {
     my $menuname = &get_menu_name();
-    if ($env{'environment.remote'} eq 'off') { return ''; }
+    unless ($env{'environment.remote'} eq 'on') { return ''; }
     my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
     return "window.open(".$nothing.",'".$menuname."');";
 }
 
 sub inlinemenu {
-    my ($context) = @_;
     undef(@inlineremote);
     undef(%category_members);
-    my $output;
-    if ($context eq 'gcicustom') {
-        my (%can_request,%request_domains,$canreq,$createtext);
-        my $role = 'st';
-        my $custommenu = &Apache::loncommon::needs_gci_custom();
-        if ($custommenu) {
-            $role = 'cc';
-        }
-        my %courses = &Apache::loncommon::existing_gcitest_courses($role);
-        my $numcourses = keys(%courses);
-        my ($switcher_js,$switcher);
-        my $formname = 'testpicker';
-        if ($numcourses > 0) {
-            $switcher = &Apache::loncommon::gcitest_switcher($role,$formname,%courses);
-            my $current;
-            my $cid = $env{'request.course.id'};
-            if ($cid) {
-                $current = $role.'./'.$env{'course.'.$cid.'.domain'}.
-                           '/'.$env{'course.'.$cid.'.num'};
-            }
-            $switcher_js = &Apache::loncommon::gcitest_switcher_js($current,$numcourses,$formname);
-            if ($switcher_js) {
-                $switcher_js= <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-
-$switcher_js
-
-// ]]>
-</script>
-
-ENDSCRIPT
-            }
-            $switcher = $switcher_js.$switcher;
-        }
-        if ($env{'user.domain'} eq 'gci') {
-            $canreq =
-                &Apache::lonnet::check_can_request('gcitest',\%can_request,\%request_domains);
-            $createtext = &mt('Create Concept Test');
-            if ($numcourses) {
-                $createtext = &mt('Create New Test');
-            }
-        }
-        if ($env{'request.course.id'}) {
-            if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-                my $navlink;
-                if ($env{'environment.remotenavmap'} eq 'on') {
-                    $navlink = "javascript:gonav('/adm/navmaps')";
-                } else {
-                    $navlink = '/adm/navmaps';
-                }
-                $output .= 
-                  '<br /><br clear="all" /><div class="LC_Box LC_GCI_Menu">'.
-                  '<h3 class="LC_hcell">'.&mt('Management').'</h3>'.
-                  '<div class="LC_GCI_Menu_left">'.
-                  '<dl class="LC_GCI_Menu">'.
-                  '<dt><a href="'.$navlink.'">'.&mt('Concept Test Contents').'</a></dt>'.
-                  '<dd style="background-image:url(\'/res/adm/pages/nav.png\');"><a class="LC_menubuttons_link" href="'.$navlink.'">'.&mt('Display the table of contents for your Concept Test.').'</a></dd>'.
-                  '<dt><a href="/adm/coursedocs">'.&mt('Assemble Concept Test').'</a></dt>'.
-                  '<dd style="background-image:url(\'/res/adm/pages/docs.png\');"><a class="LC_menubuttons_link" href="/adm/coursedocs">'.&mt('If no students have attempted the Concept Test you will be able to modify it. You can also change the start and end date of the test itself.').'</a></dd>'.
-                  '<dt><a href="/adm/createuser">'.&mt('Enrollment and Student Activity').'</a></dt>'.
-                  '<dd style="background-image:url(\'/res/adm/pages/cprv.png\');"><a class="LC_menubuttons_link" href="/adm/createuser">'.&mt('Display or download a course roster, and view information about completion status and last login. You can also add new students, or change access dates for existing students.').'</a></dd></dl></div>'.
-                  '<div class="LC_GCI_Menu_right"><dl class="LC_GCI_Menu">'.
-                  '<dt><a href="/adm/whatsnew">'.&mt("What's New?").'</a></dt>'.
-                  '<dd style="background-image:url(\'/res/adm/pages/new.png\');"><a class="LC_menubuttons_link" href="/adm/whatsnew">'.&mt('View information about changes in your Concept Test course.').'</a></dd>'.
-                  '<dt><a href="/adm/printout">'.&mt('Prepare Printable Concept Test').'</a></dt>'.
-                  '<dd style="background-image:url(\'/res/adm/pages/prnt.png\');"><a class="LC_menubuttons_link" href="/adm/printout">'.&mt('Create a PDF which you can send to a printer to create a hardcopy of the Concept Test.').'</a></dd>'.
-                  '<dt><a href="/adm/statistics">'.&mt('Concept Test Statistics').'</a></dt>'.
-                  '<dd style="background-image:url(\'/res/adm/pages/chrt.png\');"><a class="LC_menubuttons_link" href="/adm/statistics">'.&mt('After the closing date of the Concept Test you can view and download statistics for the test, as well as anonymized submission data.').'</a></dd>';
-                if ($canreq) {
-                    $output .= '<dt><a href="javascript:switchpage('."'createtest'".');">'.&mt('Create New Test').'</a></dt>'.
-                               '<dd style="background-image:url(\'/res/adm/pages/rcrs.png\');"><a class="LC_menubuttons_link" href="javascript:switchpage('."'createtest'".');">'.
-                               &mt('Create a new Concept Test Course Container. Choose GCI questions  to include in the test and upload a student roster.').'</a></dd>';
-                }
-                $output .= '</dl></div></div><br clear="all"/>';
-            } else {
-                my $navtext = &mt('Table of Contents');
-                my $navdesc = &mt('Display Table of Contents for Geoscience Concept Inventory');
-                if ($env{'request.role.domain'} eq 'gcitest') {
-                    $navtext = &mt('Display Test Contents');
-                    $navdesc = &mt('Display the table of contents for this Concept Test');
-                }
-                my $navlink;
-                if ($env{'environment.remotenavmap'} eq 'on') {
-                    $navlink = "javascript:gonav('/adm/navmaps');"
-                } else {
-                    $navlink = '/adm/navmaps';
-                }
-                $output .= 
-                           '<div class="LC_Box LC_GCI_Menu">'.
-                           '<h3 class="LC_hcell">'.&mt('Utilities').'</h3>'.
-                           '<div class="LC_GCI_Menu_left">'.
-                           '<dl class="LC_GCI_Menu">'.
-                           '<dt><a href="'.$navlink.'">'.$navtext.'</dt>'.
-                           '<dd style="background-image:url(\'/res/adm/pages/nav.png\');">'.
-                           '<a class="LC_menubuttons_link" href="'.$navlink.'">'.$navdesc.'</a></dd></dl></div>';
-                if ($canreq) {
-                    $output .= '<div class="LC_GCI_Menu_right">'.
-                               '<dl class="LC_GCI_Menu">'.
-                               '<dt><a href="javascript:switchpage('."'createtest'".');">'.$createtext.'</a></dt>'.
-                               '<dd style="background-image:url(\'/res/adm/pages/rcrs.png\');"><a class="LC_menubuttons_link" href="javascript:switchpage('."'createtest'".');">'.&mt('Create a new Concept Test Course Container').'</a>. '.&mt('Choose GCI questions to include in the test and upload a student roster.').'</dd></dl></div>';
-                }
-                $output .= '</div><br clear="all"/>';
-            }
-        } elsif ($switcher || $canreq) {
-            $output .= '<br /><br />'.
-                       '<div class="LC_Box LC_GCI_Menu">'.
-                       '<h3 class="LC_hcell">'.&mt('Utilities').'</h3>'.
-                       '<div class="LC_GCI_Menu_left">'.
-                       '<dl class="LC_GCI_Menu">';
-            if ($canreq) {
-                $output .= '<dt><a href="javascript:switchpage('."'createtest'".');">'.$createtext.'</a></dt>'.
-                           '<dd style="background-image:url(\'/res/adm/pages/rcrs.png\');"><a class="LC_menubuttons_link" href="javascript:switchpage('."'createtest'".');">'.&mt('Create a new Concept Test Course Container. Choose GCI questions to include in the test and upload a student roster.').'</a></dd></dl></div>';
-                if ($switcher) {
-                    $output .= '<div class="LC_GCI_Menu_right">'.
-                               '<dl class="LC_GCI_Menu">';
-                }
-            }
-            if ($switcher) {
-                $output .= '<dt>'.&mt('Select Concept Test').'</dt>'.
-                           '<dd style="background-image:url(\'/res/adm/pages/roles.png\');">'.$switcher.'<br /><br /></dd></dl></div>';
-            }
-            $output .= '</div><br clear="all"/>';
-        }
-    } elsif ($context eq 'gcinorole') {
-        my $queued =  &Apache::loncoursequeueadmin::queued_selfenrollment('notitle');
-        if ($queued) {
-            $output .= 
-                       '<div class="LC_Box">'.
-                       '<h3 class="LC_hcell">'.&mt('Pending Enrollment Requests').'</h3>'.
-                       $queued.
-                       '</div>';
-        }
-    } else {
-        # calling rawconfig with "1" will evaluate mydesk.tab, 
-        # even if there is no active remote control
-        &rawconfig(1);
-        $output='<table><tr>';
-        for (my $col=1; $col<=2; $col++) {
-            $output.='<td class="LC_mainmenu_col_fieldset">';
-            for (my $row=1; $row<=8; $row++) {
-                foreach my $cat (keys(%category_members)) {
-                    if ($category_positions{$cat} ne "$col,$row") { next; }
-                    $output.='<div class="LC_Box LC_400Box">';
-	            $output.='<h3 class="LC_hcell">'.&mt($category_names{$cat}).'</h3>';
-                    $output.='<table>';
-                    my %active=();
-                    foreach my $menu_item (split(/\:/,$category_members{$cat})) {
-                        if ($inlineremote[$menu_item]) {
-                            $active{$menu_item}=1;
-                        }
-                    }
-                    foreach my $item (sort(keys(%active))) {
-                        $output.=$inlineremote[$item];
-                    }
-                    $output.='</table>';
-                    $output.='</div>';
-                }
+# calling rawconfig with "1" will evaluate mydesk.tab, even if there is no active remote control
+    &rawconfig(1);
+    my $output='<table><tr>';
+    for (my $col=1; $col<=2; $col++) {
+        $output.='<td class="LC_mainmenu_col_fieldset">';
+        for (my $row=1; $row<=8; $row++) {
+            foreach my $cat (keys(%category_members)) {
+               if ($category_positions{$cat} ne "$col,$row") { next; }
+               #$output.='<table><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
+               $output.='<div class="LC_Box LC_400Box">';
+	       $output.='<h3 class="LC_hcell">'.&mt($category_names{$cat}).'</h3>';
+               $output.='<table>';
+               my %active=();
+               foreach my $menu_item (split(/\:/,$category_members{$cat})) {
+                  if ($inlineremote[$menu_item]) {
+                     $active{$menu_item}=1;
+                  }
+               }  
+               foreach my $item (sort(keys(%active))) {
+                  $output.=$inlineremote[$item];
+               }
+               $output.='</table>';
+               $output.='</div>';
             }
-            $output.="</td>";
-        }
-        $output.="</tr></table>";
+         }
+         $output.="</td>";
     }
+    $output.="</tr></table>";
     return $output;
 }
 
@@ -1582,12 +1575,12 @@ sub rawconfig {
 #
     my $textualoverride=shift;
     my $output='';
-    unless ($env{'environment.remote'} eq 'off') {
+    if ($env{'environment.remote'} eq 'on') {
        $output.=
  "window.status='Opening Remote Control';var swmenu=".&openmenu().
 "\nwindow.status='Configuring Remote Control ';";
     } else {
-       unless ($textualoverride) { return ''; }
+        unless ($textualoverride) { return ''; }
     }
     my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};
@@ -1725,6 +1718,7 @@ sub rawconfig {
                                ($env{'request.role'}=~/($match_domain)\/($match_username)$/);
                     }                       
                     $act =~ s/\$caname/$caname/g;
+                    $act =~ s/\$cadom/$cadom/g;
                     my $home = &Apache::lonnet::homeserver($caname,$cadom);
 		    my $allowed=0;
 		    my @ids=&Apache::lonnet::current_machine_ids();
@@ -1762,13 +1756,12 @@ sub rawconfig {
           $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
         }
     }
-    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");';
-       }
+    if ($env{'environment.remote'} eq 'on') {
+        $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';";
+        if (&Apache::lonmsg::newmail()) {
+            $output.='swmenu.setstatus("you have","messages");';
+        }
     }
-
     return $output;
 }
 
@@ -1797,7 +1790,7 @@ sub check_for_rcrs {
 # ======================================================================= Close
 
 sub close {
-    if ($env{'environment.remote'} eq 'off') { return ''; }
+    unless ($env{'environment.remote'} eq 'on') { return ''; }
     my $menuname = &get_menu_name();
     return(<<ENDCLOSE);
 <script type="text/javascript">
@@ -1816,29 +1809,6 @@ window.status='Done.';
 ENDCLOSE
 }
 
-# ====================================================================== Footer
-
-sub footer {
-
-}
-
-sub nav_control_js {
-    my $nav=($env{'environment.remotenavmap'} eq 'on');
-    return (<<NAVCONTROL);
-    var w_loncapanav_flag="$nav";
-
-
-function gonav(url) {
-   if (w_loncapanav_flag != 1) {
-      gopost(url,'');
-   }  else {
-      navwindow=window.open(url,
-                  "loncapanav","height=600,width=400,scrollbars=1"); 
-   }
-}
-NAVCONTROL
-}
-
 sub dc_popup_js {
     my %lt = &Apache::lonlocal::texthash(
                                           more => '(More ...)',
@@ -1850,13 +1820,13 @@ function showCourseID() {
     document.getElementById('dccid').style.display='block';
     document.getElementById('dccid').style.textAlign='left';
     document.getElementById('dccid').style.textFace='normal';
-    document.getElementById('dccidtext').innerHTML ='<a href="javascript:hideCourseID();">$lt{'less'}</a>';
+    document.getElementById('dccidtext').innerHTML ='<a href="javascript:hideCourseID();" class="LC_menubuttons_link">$lt{'less'}</a>';
     return;
 }
 
 function hideCourseID() {
     document.getElementById('dccid').style.display='none';
-    document.getElementById('dccidtext').innerHTML ='<a href="javascript:showCourseID()">$lt{'more'}</a>';
+    document.getElementById('dccidtext').innerHTML ='<a href="javascript:showCourseID()" class="LC_menubuttons_link">$lt{'more'}</a>';
     return;
 }
 
@@ -1864,65 +1834,36 @@ END
 
 }
 
-sub utilityfunctions {
-    my ($caller,$custommenu) = @_;
-    unless ($env{'environment.remote'} eq 'off' || 
-            $caller eq '/adm/menu') { 
-            return ''; }
-     
-    my $gcimenujs;
-    if ($custommenu) {
-        my %concepttests = &Apache::loncommon::existing_gcitest_courses('cc');
-        my $managetesturl = '/adm/menu';
-        my $createtesturl = '/adm/requestcourse';
-        if (($env{'request.course.id'}) &&
-            ($env{'course.'.$env{'request.course.id'}.'.domain'} eq 'gci')) {
-            my @items = keys(%concepttests);
-            if (@items== 1) {
-                my $newrole = $items[0];
-                $newrole =~ s{_}{/};
-                $managetesturl = '/adm/roles?selectrole=1&cc./'.$newrole.'=1';
-            } else {
-                $managetesturl = '/adm/roles?selectrole=1&cm=1&orgurl=%2fadm%2fmenu';
-            }
-        }
-        if ($env{'request.course.id'}) {
-            $createtesturl = '/adm/roles?selectrole=1&cm=1&orgurl=%2fadm%2frequestcourse';
-        }
-        $gcimenujs = <<"ENDCUSTOM";
+sub countdown_toggle_js {
+    return <<"END";
 
-function switchpage(caller) {
-    if (caller == 'review') {
-        document.location.href = '/adm/roles?selectrole=1&st./gci/9615072b469884921gcil1=1';
-    }
-    if (caller == 'submit') {
-        document.location.href = '/adm/roles?selectrole=1&st./gci/1H96711d710194bfegcil1=1';
-    }
-    if (caller == 'createtest') {
-        document.location.href = '$createtesturl';
-    }
-    if (caller == 'managetest') {
-        document.location.href = '$managetesturl';
-    }
-    if (caller == 'tutorial') {
-        document.location.href = '/adm/roles?selectrole=1&st./gci/5422913620b814c90gcil1=1';
+function toggleCountdown() {
+    var countdownid = document.getElementById('duedatecountdown');
+    var currstyle = countdownid.style.display;
+    if (currstyle == 'inline') {
+        countdownid.style.display = 'none';
+        document.getElementById('ddcountcollapse').innerHTML='';
+        document.getElementById('ddcountexpand').innerHTML='&#9668;&nbsp;';
+    } else {
+        countdownid.style.display = 'inline';
+        document.getElementById('ddcountcollapse').innerHTML='&#9658;&nbsp;';
+        document.getElementById('ddcountexpand').innerHTML='';
     }
     return;
 }
 
-ENDCUSTOM
-    }
-       
+END
+}
+
+sub utilityfunctions {
     my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
-    if ($currenturl =~ m{^/adm/wrapper/ext/}) {
-        if ($env{'request.external.querystring'}) {
+    if ($currenturl =~ m{^/adm/wrapper/ext/}
+        && $env{'request.external.querystring'} ) {
             $currenturl .= ($currenturl=~/\?/)?'&':'?'.$env{'request.external.querystring'};
-        }
     }
     $currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
     
     my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
-    my $nav_control=&nav_control_js();
 
     my $dc_popup_cid;
     if ($env{'user.adv'} && exists($env{'user.role.dc./'.
@@ -1942,26 +1883,21 @@ ENDCUSTOM
     my $end_page_annotate = 
         &Apache::loncommon::end_page({'js_ready' => 1});
 
-    my $start_page_bookmark = 
-        &Apache::loncommon::start_page('Bookmarks',undef,
-				       {'only_body' => 1,
-					'js_ready'  => 1,
-					'bgcolor'   => '#BBBBBB',});
+    my $jumptores = &Apache::lonhtmlcommon::javascript_jumpto_resource();
 
-    my $end_page_bookmark = 
-        &Apache::loncommon::end_page({'js_ready' => 1});
+    my $esc_url=&escape($currenturl);
+    my $esc_symb=&escape($currentsymb);
+
+    my $countdown = &countdown_toggle_js();
 
 return (<<ENDUTILITY)
 
-    var currentURL="$currenturl";
-    var reloadURL="$currenturl";
-    var currentSymb="$currentsymb";
+    var currentURL=unescape("$esc_url");
+    var reloadURL=unescape("$esc_url");
+    var currentSymb=unescape("$esc_symb");
 
-$nav_control
 $dc_popup_cid
 
-$gcimenujs
-
 function go(url) {
    if (url!='' && url!= null) {
        currentURL = null;
@@ -1970,11 +1906,7 @@ function go(url) {
    }
 }
 
-function gotop(url) {
-    if (url!='' && url!= null) {
-        top.location.href = url;
-    }
-}
+$jumptores
 
 function gopost(url,postdata) {
    if (url!='') {
@@ -2048,7 +1980,7 @@ function golist(url) {
 
 
 function catalog_info() {
-   loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+   openMyModal(window.location.pathname+'.meta',500,400,'yes');
 }
 
 function chat_win() {
@@ -2061,13 +1993,6 @@ function group_chat(group) {
    grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
 }
 
-function edit_bookmarks() {
-   go('');
-   w_BookmarkPal_flag=1;
-   bookmarkpal=window.open("/adm/bookmarks",
-               "BookmarkPal", "width=400,height=505,scrollbars=0");
-}
-
 function annotate() {
    w_Annotator_flag=1;
    annotator=window.open('','Annotator','width=365,height=265,scrollbars=0');
@@ -2081,28 +2006,35 @@ function annotate() {
    annotator.document.close();
 }
 
-function set_bookmark() {
-   go('');
-   clienttitle=document.title;
-   clienthref=location.pathname;
-   w_bmquery_flag=1;
-   bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0');
-   bmquery.document.write(
-   '$start_page_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 '
-   +'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" '
-   +'value="Save" /> <input type="button" value="Close" '
-   +'onclick="javascript:window.close();" /></center></td>'
-   +'</tr></table></form></center>'
-   +'$end_page_bookmark' );
-   bmquery.document.close();
+function open_StoredLinks_Import(rat) {
+   var newWin;
+   if (rat) {
+       newWin = window.open('/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat,
+                            'wishlistImport','scrollbars=1,resizable=1,menubar=0');
+   }
+   else {
+       newWin = window.open('/adm/wishlist?inhibitmenu=yes&mode=import',
+                            'wishlistImport','scrollbars=1,resizable=1,menubar=0');
+   }
+   newWin.focus();
 }
 
+(function (\$) {
+  \$(document).ready(function () {
+    \$.single=function(a){return function(b){a[0]=b;return a}}(\$([1]));
+    /*\@cc_on
+      if (!window.XMLHttpRequest) {
+        \$('.LC_hoverable').each(function () {
+          this.attachEvent('onmouseenter', function (evt) { \$.single(evt.srcElement).addClass('hover'); });
+          this.attachEvent('onmouseleave', function (evt) { \$.single(evt.srcElement).removeClass('hover'); });
+        });
+      }
+    \@*/
+  });
+}(jQuery));
+
+$countdown
+
 ENDUTILITY
 }
 
@@ -2135,27 +2067,22 @@ sub constspaceform {
 ENDCONSTSPACEFORM
 }
 
-
 sub get_nav_status {
     my $navstatus="swmenu.w_loncapanav_flag=";
     if ($env{'environment.remotenavmap'} eq 'on') {
-	$navstatus.="1";
+        $navstatus.="1";
     } else {
-	$navstatus.="-1";
+        $navstatus.="-1";
     }
     return $navstatus;
 }
 
 sub hidden_button_check {
-    my $hidden;
-    if ($env{'request.course.id'} eq '') {
+    if ( $env{'request.course.id'} eq ''
+         || $env{'request.role.adv'} ) {
+
         return;
     }
-    if ($env{'request.role.adv'}) {
-        unless (&Apache::loncommon::needs_gci_custom()) {
-            return;
-        }
-    }
     my $buttonshide = &Apache::lonnet::EXT('resource.0.buttonshide');
     return $buttonshide; 
 }
@@ -2164,15 +2091,39 @@ sub roles_selector {
     my ($cdom,$cnum) = @_;
     my $crstype = &Apache::loncommon::course_type();
     my $now = time;
-    my (%courseroles,%seccount);
+    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,$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;
+        $destination =~ s/(\?.*)$//;
+        if (exists($reqprivs->{$destination})) {
+            $priv = $reqprivs->{$destination};
+        }
+    }
     if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) {
         my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum});
         
@@ -2185,7 +2136,7 @@ sub roles_selector {
         }
     }
     if ($is_cc) {
-        &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount);
+        &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs,$priv);
     } else {
         my %gotnosection;
         foreach my $item (keys(%env)) {
@@ -2201,6 +2152,18 @@ sub roles_selector {
                         $gotnosection{$role} = 1;
                     }
                 }
+                if ($priv ne '') {
+                    my $cnumsec = $cnum;
+                    if ($sec ne '') {
+                        $cnumsec .= "/$sec";
+                    }
+                    $courseprivs{"$role./$cdom/$cnumsec./"} =
+                        $env{"user.priv.$role./$cdom/$cnumsec./"};
+                    $courseprivs{"$role./$cdom/$cnumsec./$cdom/"} =
+                        $env{"user.priv.$role./$cdom/$cnumsec./$cdom/"};
+                    $courseprivs{"$role./$cdom/$cnumsec./$cdom/$cnumsec"} =
+                        $env{"user.priv.$role./$cdom/$cnumsec./$cdom/$cnumsec"};
+                }
                 if (ref($courseroles{$role}) eq 'ARRAY') {
                     if ($sec ne '') {
                         if (!grep(/^\Q$sec\E$/,@{$courseroles{$role}})) {
@@ -2220,40 +2183,75 @@ sub roles_selector {
     }
     my $switchtext;
     if ($crstype eq 'Community') {
-        $switchtext = &mt('Switch community role to...')
+        $switchtext = &mt('Switch community role')
     } else {
-        $switchtext = &mt('Switch course role to...')
+        $switchtext = &mt('Switch course role')
     }
     my @roles_order = ($ccrole,'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>';
+    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($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".
-               '</form>';
+        if (@submenu > 0) {
+            $switcher = &create_submenu('','',$switchtext,\@submenu);
+        }
     }
-    return $role_selector;
+    return ($js,$form,$switcher);
 }
 
 sub get_all_courseroles {
-    my ($cdom,$cnum,$courseroles,$seccount) = @_;
-    unless ((ref($courseroles) eq 'HASH') && (ref($seccount) eq 'HASH')) {
+    my ($cdom,$cnum,$courseroles,$seccount,$courseprivs) = @_;
+    unless ((ref($courseroles) eq 'HASH') && (ref($seccount) eq 'HASH') &&
+            (ref($courseprivs) eq 'HASH')) {
         return;
     }
     my ($result,$cached) = 
@@ -2261,9 +2259,11 @@ sub get_all_courseroles {
     if (defined($cached)) {
         if (ref($result) eq 'HASH') {
             if ((ref($result->{'roles'}) eq 'HASH') && 
-                (ref($result->{'seccount'}) eq 'HASH')) {
+                (ref($result->{'seccount'}) eq 'HASH') && 
+                (ref($result->{'privs'}) eq 'HASH')) {
                 %{$courseroles} = %{$result->{'roles'}};
                 %{$seccount} = %{$result->{'seccount'}};
+                %{$courseprivs} = %{$result->{'privs'}};
                 return;
             }
         }
@@ -2291,30 +2291,43 @@ sub get_all_courseroles {
                 push(@{$courseroles->{$urole}},$usec);
             }
         }
+        my $area = '/'.$cdom.'/'.$cnum;
+        if ($usec ne '') {
+            $area .= '/'.$usec;
+        }
+        if ($role =~ /^cr\//) {
+            &Apache::lonnet::custom_roleprivs($courseprivs,$urole,$cdom,$cnum,$urole.'.'.$area,$area);
+        } else {
+            &Apache::lonnet::standard_roleprivs($courseprivs,$urole,$cdom,$urole.'.'.$area,$cnum,$area);
+        }
     }
     my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum,['st']);
     @{$courseroles->{'st'}} = ();
+    &Apache::lonnet::standard_roleprivs($courseprivs,'st',$cdom,"st./$cdom/$cnum",$cnum,"/$cdom/$cnum");
     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,
                      'seccount' => $seccount,
+                     'privs'    => $courseprivs,
                    };
     &Apache::lonnet::do_cache_new('getcourseroles',$cdom.'_'.$cnum,$rolehash);
     return;
 }
 
 sub jump_to_role {
-    my ($cdom,$cnum,$seccount,$courseroles) = @_;
+    my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$priv) = @_;
     my %lt = &Apache::lonlocal::texthash(
                 this => 'This role has section(s) associated with it.',
                 ente => 'Enter a specific section.',
                 orlb => 'Enter a specific section, or leave blank for no section.',
                 avai => 'Available sections are:',
                 youe => 'You entered an invalid section choice:',
-                plst => 'Please try again',
+                plst => 'Please try again.',
+                role => 'The role you selected is not permitted to view the current page.',
+                swit => 'Switch role, but display Main Menu page instead?',
     );
     my $js;
     if (ref($courseroles) eq 'HASH') {
@@ -2337,14 +2350,44 @@ sub jump_to_role {
                    '    numsec['.$i.'] = "'.$seccount->{$items[$i]}.'";'."\n";
         }
     }
+    my $checkroles = 0;
+    if ($priv && ref($courseprivs) eq 'HASH') {
+        my (%disallowed,%allowed,@disallow);
+        foreach my $role (sort(keys(%{$courseprivs}))) {
+            my $trole;
+            if ($role =~ m{^(.+?)\Q./$cdom/$cnum\E}) {
+                $trole = $1;
+            }
+            if (($trole ne '') && ($trole ne 'cm')) {
+                if ($courseprivs->{$role} =~ /\Q:$priv\E($|:|\&\w+)/) {
+                    $allowed{$trole} = 1;
+                } else {
+                    $disallowed{$trole} = 1;
+                }
+            }
+        }
+        foreach my $trole (keys(%disallowed)) {
+            unless ($allowed{$trole}) {
+                push(@disallow,$trole);
+            }
+        }
+        if (@disallow > 0) {
+            $checkroles = 1;
+            $js .= "    var disallow = new Array('".join("','",@disallow)."');\n".
+                   "    var rolecheck = 1;\n";
+        }
+    }
+    if (!$checkroles) {
+        $js .=  "    var disallow = new Array();\n".
+                "    rolecheck = 0;\n";
+    }
     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; 
+        return;
     } 
     var fullrole = newrole+'./$cdom/$cnum';
     var selidx = '';
@@ -2353,6 +2396,17 @@ function adhocRole(roleitem) {
             selidx = i;
         }
     }
+    if (rolecheck > 0) {
+        for (var i=0; i<disallow.length; i++) {
+            if (disallow[i] == newrole) {
+                if (confirm("$lt{'role'}\\n$lt{'swit'}")) {
+                    document.rolechooser.destinationurl.value = '/adm/menu';
+                } else {
+                    return;
+                }
+            }
+        }
+    }
     var secok = 1;
     var secchoice = '';
     if (selidx >= 0) {
@@ -2360,7 +2414,7 @@ function adhocRole(roleitem) {
             secok = 0;
             var numrolesec = rolesections[selidx].length;
             var msgidx = numsec[selidx] - numrolesec;
-            secchoice = prompt("$lt{'this'}\\n"+secpick[msgidx]+"\\n$lt{'avai'} "+roleseclist[selidx],"");
+            secchoice = prompt("$lt{'this'} "+secpick[msgidx]+"\\n$lt{'avai'} "+roleseclist[selidx],"");
             if (secchoice == '') {
                 if (msgidx > 0) {
                     secok = 1;
@@ -2396,7 +2450,7 @@ function adhocRole(roleitem) {
     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;
@@ -2415,6 +2469,91 @@ function retrieveIndex(item) {
 END
 }
 
+sub required_privs {
+    my $privs =  {
+             '/adm/parmset'      => 'opa',
+             '/adm/courseprefs'  => 'opa',
+             '/adm/whatsnew'     => 'whn',
+             '/adm/populate'     => 'cst',
+             '/adm/trackstudent' => 'vsa',
+             '/adm/statistics'   => 'vgr',
+             '/adm/setblock'     => 'dcm',
+             '/adm/coursedocs'   => 'mdc',
+           };
+    unless ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet') {
+        $privs->{'/adm/classcalc'}   = 'vgr',
+        $privs->{'/adm/assesscalc'}  = 'vgr',
+        $privs->{'/adm/studentcalc'} = 'vgr';
+    }
+    return $privs;
+}
+
+sub countdown_timer {
+    if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') &&
+        ($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");
+        my @interval=&Apache::lonnet::EXT("resource.0.interval");
+        my $hastimeleft;
+        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);
+            if ((@interval > 1 && $hastimeleft) ||
+                ($type eq 'Task' && $slothastime)) {
+                $currdisp = 'inline';
+                $collapse = '&#9658;&nbsp;';
+            } else {
+                $currdisp = 'none';
+                $expand = '&#9668;&nbsp;';
+            }
+            unless ($env{'environment.icons'} eq 'iconsonly') {
+                $alttxt = &mt('Timer');
+                $title = $alttxt.'&nbsp;';
+            }
+            my $desc = &mt('Countdown to due date/time');
+            return <<END;
+
+<a href="javascript:toggleCountdown();" class="LC_menubuttons_link">
+<span id="ddcountcollapse" class="LC_menubuttons_inline_text">
+$collapse
+</span></a>
+<span id="duedatecountdown" class="LC_menubuttons_inline_text" style="display: $currdisp;"></span>
+<a href="javascript:toggleCountdown();" class="LC_menubuttons_link">
+<span id="ddcountexpand" class="LC_menubuttons_inline_text" >$expand</span>
+<img src="/res/adm/pages/timer.png" title="$desc" class="LC_icon" alt="$alttxt" /><span class="LC_menubuttons_inline_text">$title</span></a>
+END
+        }
+    }
+    return;
+}
 
 # ================================================================ Main Program
 
@@ -2433,10 +2572,16 @@ BEGIN {
                         $category_names{$entries[2]}=$entries[3];
                     } elsif ($configline=~/^prim\:/) {
                         my @entries = (split(/\:/, $configline))[1..5];
-                        push @primary_menu, \@entries;
+                        push(@primary_menu,\@entries);
+                    } elsif ($configline=~/^primsub\:/) {
+                        my ($parent,@entries) = (split(/\:/, $configline))[1..4];
+                        push(@{$primary_submenu{$parent}},\@entries);
                     } elsif ($configline=~/^scnd\:/) {
                         my @entries = (split(/\:/, $configline))[1..5];
-                        push @secondary_menu, \@entries; 
+                        push(@secondary_menu,\@entries);
+                    } elsif ($configline=~/^scndsub\:/) {
+                        my ($parent,@entries) = (split(/\:/, $configline))[1..4];
+                        push(@{$secondary_submenu{$parent}},\@entries);
                     } elsif ($configline) {
                         push(@desklines,$configline);
                     }