--- loncom/interface/lonmenu.pm	2023/07/06 19:16:16	1.369.2.83.2.8
+++ loncom/interface/lonmenu.pm	2025/03/25 01:02:59	1.562
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.83.2.8 2023/07/06 19:16:16 raeburn Exp $
+# $Id: lonmenu.pm,v 1.562 2025/03/25 01:02:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,72 +118,51 @@ Same as primary_menu() but operates on @
 
 =item create_submenu()
 
-Creates XHTML for unordered list of sub-menu items which belong to a
+Creates XHTML for unordered list of sub-menu items which belong to a 
 particular top-level menu item. Uses hover pseudo class in css to display
-dropdown list when mouse hovers over top-level item. Support for IE6
+dropdown list when mouse hovers over top-level item. Support for IE6 
 (no hover psuedo class) via LC_hoverable class for <li> tag for top-
 level item, which employs jQuery to handle behavior on mouseover.
 
 Inputs: 6 - (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.
-            (e) boolean to indicate whether to call &mt() to translate
+            (c) title for text wrapped by anchor tag in top level item,
+            (d) reference to array of arrays of sub-menu items,
+            (e) boolean to indicate whether to call &mt() to translate 
                 name of menu item,
             (f) optional class for <li> element in primary menu, for which
                 sub menu is being generated.
 
-The underlying datastructure used in (d) contains data from mydesk.tab.
-It consists of an array which has an array for each item appearing in
-the menu (e.g. [["link", "title", "condition"]] for a single-item menu).
-create_submenu() supports also the creation of XHTML for nested dropdown
-menus represented by unordered lists. This is done by replacing the
-scalar used for the link with an arrayreference containing the menuitems
-for the nested menu. This can be done recursively so that the next menu
-may also contain nested submenus.
+ The underlying datastructure used in (d) contains data from mydesk.tab.
+ It consists of an array which has an array for each item appearing in
+ the menu (e.g. [["link", "title", "condition"]] for a single-item menu).
+ create_submenu() supports also the creation of XHTML for nested dropdown
+ menus represented by unordered lists. This is done by replacing the
+ scalar used for the link with an arrayreference containing the menuitems
+ for the nested menu. This can be done recursively so that the next menu
+ may also contain nested submenus.
 
  Example:
- [                                                                                      # begin of datastructure
-        ["/home/", "Home", "condition1"],               # 1st item of the 1st layer menu
-        [                                                                               # 2nd item of the 1st layer menu
-                [                                                                       # anon. array for nested menu
-                        ["/path1", "Path1", undef],     # 1st item of the 2nd layer menu
-                        ["/path2", "Path2", undef],     # 2nd item of the 2nd layer menu
-                        [                                                               # 3rd item of the 2nd layer menu
-                                [[...], [...], ..., [...]],     # containing another menu layer
-                                "Sub-Sub-Menu",                         # title for this container
-                                undef
-                        ]
-                ],                                                                      # end of array/nested menu
-                "Sub-Menu",                                                     # title for the container item
-                undef
-        ]                                                                               # end of 2nd item of the 1st layer menu
+ [											# begin of datastructure
+	["/home/", "Home", "condition1"], 		# 1st item of the 1st layer menu
+	[										# 2nd item of the 1st layer menu
+		[									# anon. array for nested menu
+			["/path1", "Path1", undef], 	# 1st item of the 2nd layer menu
+			["/path2", "Path2", undef], 	# 2nd item of the 2nd layer menu
+			[								# 3rd item of the 2nd layer menu
+				[[...], [...], ..., [...]],	# containing another menu layer
+				"Sub-Sub-Menu",				# title for this container
+				undef
+			]
+		],									# end of array/nested menu
+		"Sub-Menu",							# title for the container item
+		undef
+	]										# end of 2nd item of the 1st layer menu
 ]
 
-
 =item innerregister()
 
 This gets called in order to register a URL in the body of the document
 
-=item loadevents()
-
-=item unloadevents()
-
-=item startupremote()
-
-=item setflags()
-
-=item maincall()
-
-=item load_remote_msg()
-
-=item get_menu_name()
-
-=item reopenmenu()
-
-=item open()
-
-Open the menu
-
 =item clear()
 
 =item switch()
@@ -266,7 +245,7 @@ sub prep_menuitem {
 # @primary_menu is filled within the BEGIN block of this module with 
 # entries from mydesk.tab
 sub primary_menu {
-    my ($crstype,$ltimenu,$menucoll,$menuref,$links_disabled,$links_target) = @_;
+    my ($crstype,$ltimenu,$menucoll,$menuref,$links_disabled,$links_target,$collapsible) = @_;
     my (%menu,%ltiexc,%menuopts);
     # each element of @primary contains following array:
     # (link url, icon path, alt text, link text, condition, position)
@@ -275,6 +254,15 @@ sub primary_menu {
         || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {
         $public = 1;
     }
+    my $rolecount;
+    if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) {
+        my $update=$env{'user.update.time'};
+        if (!$update) {
+            $update = $env{'user.login.time'};
+        }
+        my %roles_in_env;
+        $rolecount = &Apache::lonroles::roles_from_env(\%roles_in_env,$update);
+    }
     my $lti;
     if ($env{'request.lti.login'}) {
         $lti = 1;
@@ -293,7 +281,7 @@ sub primary_menu {
     }
     if ($links_target ne '') {
         $target = $links_target;
-    } else {    
+    } else {
         my ($ltitarget,$deeplinktarget);
         if ($env{'request.lti.login'}) {
              $ltitarget = $env{'request.lti.target'};
@@ -324,7 +312,7 @@ sub primary_menu {
                 && !$public;                           # only visible to public
                                                        # users
         next if    $$menuitem[4]        eq 'roles'     ##show links depending on
-                && (&Apache::loncommon::show_course()  ##term 'Courses' or 
+                && (&Apache::loncommon::show_course()  ##term 'Courses' or
                 || $lti);                              ##'Roles' wanted
         next if    $$menuitem[4]        eq 'courses'   ##and not LTI access
                 && (!&Apache::loncommon::show_course()
@@ -334,6 +322,13 @@ sub primary_menu {
         next if    $$menuitem[4]        eq 'ltiexc'
                 && exists($ltiexc{lc($menuitem->[3])});
         my $title = $menuitem->[3];
+        if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) {
+            if ($menuitem->[4] eq 'courses') {
+                next unless ($rolecount>1);
+            } else {
+                next unless (($title eq 'Personal') || ($title eq 'Logout'));
+            }
+        }
         my $position = $menuitem->[5];
         if ($position eq '') {
             $position = 'right';
@@ -365,11 +360,25 @@ sub primary_menu {
             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')) && 
+                    next if (($crstype eq 'Placement') && (!$env{'request.role.adv'}));
+                    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')));
+                    if (($item->[2] eq 'browsepub') && ($item->[0] eq '/res/')) {
+                        if ($env{'request.role'} =~ /^au\./) {
+                            $item->[0] .= $env{'request.role.domain'}.'/?launch=1';
+                        } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
+                            $item->[0] .= $1.'/'.$2.'/?launch=1';
+                        } elsif (&Apache::lonnet::allowed('bre',$env{'user.domain'})) {
+                            $item->[0] .= $env{'user.domain'}.'/?launch=1';
+                        } elsif (&Apache::lonnet::allowed('bro','/res/')) {
+                            $item->[0] .= '?launch=1';
+                        } else {
+                            next;
+                        }
+                    }
                     if ($env{'request.course.id'} && $menucoll) {
                         next if ($item->[3]) && (!$menuopts{$item->[3]});
                     }
@@ -397,6 +406,7 @@ sub primary_menu {
                 }
             }
         } elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink
+            next if ($crstype eq 'Placement'); 
             if ($public) {
                 my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
                 my $defdom = &Apache::lonnet::default_login_domain();
@@ -424,6 +434,10 @@ sub primary_menu {
     }
     my @output = ('','');
     if ($menu{'left'} ne '') {
+        if ($collapsible) {
+            $menu{'left'} = ($listclass?'<li class="'.$listclass.'">':'<li>').
+                            '&nbsp;</li>'.$menu{'left'};
+        }
         $output[0] = "<ol class=\"LC_primary_menu LC_floatleft\">$menu{'left'}</ol>";
     }
     if ($menu{'right'} ne '') {
@@ -439,10 +453,10 @@ sub primary_menu {
 #
 #TODO this should probably be moved somewhere more central
 #since it can be used by different parts of the system
-sub getauthor{
+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?
+                        #co- or assistant 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
@@ -467,29 +481,38 @@ sub secondary_menu {
                                                ? "/$env{'request.course.sec'}"
                                                : '');
     my $canedit       = &Apache::lonnet::allowed('mdc', $env{'request.course.id'});
-    my $canvieweditor = &Apache::lonnet::allowed('cev', $env{'request.course.id'}); 
+    my $canvieweditor = &Apache::lonnet::allowed('cev', $env{'request.course.id'});
     my $canviewroster = $env{'course.'.$env{'request.course.id'}.'.student_classlist_view'};
     if ($canviewroster eq 'disabled') {
         undef($canviewroster);
     }
-    my $canviewgrps   = &Apache::lonnet::allowed('vcg', $crs_sec);
+    my $canviewgrps   = &Apache::lonnet::allowed('vcg', $crs_sec); 
     my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec);
-    my $canviewusers  = &Apache::lonnet::allowed('vcl', $crs_sec);
-    my $canviewwnew   = &Apache::lonnet::allowed('whn', $crs_sec);
+    my $canviewusers  = &Apache::lonnet::allowed('vcl', $crs_sec); 
+    my $canviewwnew   = &Apache::lonnet::allowed('whn', $crs_sec); 
     my $canviewpara   = &Apache::lonnet::allowed('vpa', $crs_sec);
     my $canmodpara    = &Apache::lonnet::allowed('opa', $crs_sec);
     my $canvgr        = &Apache::lonnet::allowed('vgr', $crs_sec);
-    my $canmgr        = &Apache::lonnet::allowed('mgr', $crs_sec);
+    my $canmgr        = &Apache::lonnet::allowed('mgr', $crs_sec); 
     my $canplc        = &Apache::lonnet::allowed('plc', $crs_sec);
     my $author        = &getauthor();
 
+    my ($is_author,$is_coauthor);
+    if ($author) {
+        if ($env{'request.role'} =~ /^au\./) {
+            $is_author = 1;
+        } elsif ($env{'request.role'} =~ /^ca\./) {
+            $is_coauthor = 1;
+        }
+    }
+
     my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools,
         $lti,$ltimapres,%ltiexc,%menuopts);
-    $grouptools = 0; 
+    $grouptools = 0;
     if ($env{'request.course.id'}) {
         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        unless ($canedit || $canvieweditor) {
+        unless ($canedit || $canvieweditor)  {
             unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) {
                 if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) ||
                     ($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) ||
@@ -542,15 +565,25 @@ sub secondary_menu {
         $linkattr = 'aria-disabled="true"';
     }
 
-    my ($canmodifycoauthor);
+    my ($canlistcoauthors,$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;
         }
+    } elsif ($env{'request.role'} =~ m{^(aa|ca)\./($match_domain/$match_username)$}) {
+        my ($role,$extent) = ($1,$2);
+        if (&Apache::lonnet::allowed('vca',$extent)) {
+            if ($env{"environment.internal.manager./$extent"}) {
+                $canmodifycoauthor = 1;
+            } else {
+                $canlistcoauthors = 1;
+            }
+        } elsif (&Apache::lonnet::allowed('vaa',$extent)) {
+            $canlistcoauthors = 1;
+        }
     }
-
     my ($roleswitcher_js,$roleswitcher_form);
     if ($links_target ne '') {
         $target = $links_target;
@@ -572,15 +605,20 @@ sub secondary_menu {
     foreach my $menuitem (@secondary_menu) {
         # evaluate conditions 
         next if    ref($menuitem)  ne 'ARRAY';
-        next if    $$menuitem[4]   ne 'always'
-                && ($$menuitem[4]  ne 'author' && $$menuitem[4] ne 'cca')
+        next if (($crstype eq 'Placement') && ($$menuitem[3] ne 'Roles') && (!$env{'request.role.adv'}));
+        next if    $$menuitem[4]  ne 'always'
+                && $$menuitem[4]  ne 'coauthor'
+                && $$menuitem[4]  ne 'author'
+                && $$menuitem[4]  ne 'authorspace'
+                && $$menuitem[4]  ne 'vca'
+                && $$menuitem[4]  ne 'mca'
                 && !$env{'request.course.id'};
         next if    $$menuitem[4]   =~ /^crsedit/
                 && (!$canedit && !$canvieweditor);
         next if    $$menuitem[4]  eq 'crseditCourse'
                 && ($crstype eq 'Community');
         next if    $$menuitem[4]  eq 'crseditCommunity'
-                && ($crstype eq 'Course');
+                && ($crstype ne 'Community');
         next if    $$menuitem[4]  eq 'nvgr'
                 && ($canvgr || $ltiexc{'grades'});
         next if    $$menuitem[4]  eq 'vgr'
@@ -597,7 +635,7 @@ sub secondary_menu {
                 && !$canviewwnew;
         next if    $$menuitem[4]   eq 'params'
                 && (!$canmodpara && !$canviewpara);
-        next if    $$menuitem[4]   eq 'nvcg'
+        next if    $$menuitem[4]   eq 'showgroups'
                 && ($canviewgrps || !$grouptools);
         next if    $$menuitem[4]   eq 'showsyllabus'
                 && !$showsyllabus;
@@ -605,9 +643,17 @@ sub secondary_menu {
                 && !$showfeeds;
         next if     $$menuitem[4]  eq 'plc'
                 && !$canplc;
-        next if    $$menuitem[4]    eq 'author'
+        next if    $$menuitem[4]   eq 'authorspace'
                 && !$author;
-        next if    $$menuitem[4]    eq 'cca'
+        next if    $$menuitem[4]   eq 'author'
+                && !$is_author;
+        next if    $$menuitem[4]   eq 'coauthor'
+                && !$is_coauthor;
+        next if    $$menuitem[4]    eq 'vca'
+                && (!$canlistcoauthors || $canmodifycoauthor);
+        next if    $$menuitem[4]    eq 'vaa'
+                && (!$canlistcoauthors || $canmodifycoauthor);
+        next if    $$menuitem[4]    eq 'mca'
                 && !$canmodifycoauthor;
         next if    $$menuitem[4]    eq 'notltimapres'
                 && $ltimapres;
@@ -620,9 +666,7 @@ sub secondary_menu {
 
         my $title = $menuitem->[3];
         if ($env{'request.course.id'} && $menucoll) {
-            if ($$menuitem[5] eq 'main') {
-                next if ($menuopts{$$menuitem[5]} eq 'n');
-            } elsif ($$menuitem[5] ne 'roles') {
+            unless ($$menuitem[5] eq 'roles') {
                 next if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]}));
             }
         }
@@ -645,8 +689,8 @@ sub secondary_menu {
                         next if ($item->[2] eq 'vcg' && !$canviewgrps);
                         next if ($item->[2] eq 'crsedit' && !$canedit && !$canvieweditor);
                         next if ($item->[2] eq 'params' && !$canmodpara && !$canviewpara);
-                        next if ($item->[2] eq 'author' && !$author);
-                        next if ($item->[2] eq 'cca' && !$canmodifycoauthor);
+                        next if ($item->[2] eq 'author' && !$is_author);
+                        next if ($item->[2] eq 'vca' && !$canlistcoauthors);
                         next if ($item->[2] eq 'lti' && !$lti);
                         if ($item->[2] =~ /^lti(portfolio|wishlist|blog)$/) {
                             my $tool = $1;
@@ -654,7 +698,7 @@ sub secondary_menu {
                             next if (!&Apache::lonnet::usertools_access('','',$tool,
                                                                         undef,'tools'));
                         }
-                        push(@scndsub,$item); 
+                        push(@scndsub,$item);
                     }
                 }
                 if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'}) {
@@ -676,14 +720,17 @@ sub secondary_menu {
             my ($switcher,$has_opa_priv);
             ($roleswitcher_js,$roleswitcher_form,$switcher,$has_opa_priv) =
                 &roles_selector(
-                        $env{'course.' . $env{'request.course.id'} . '.domain'},
-                        $env{'course.' . $env{'request.course.id'} . '.num'},
-                        $httphost,$target,$menucoll,$menuref
+                    $env{'course.' . $env{'request.course.id'} . '.domain'},
+                    $env{'course.' . $env{'request.course.id'} . '.num'},
+                    $httphost,$target,$menucoll,$menuref
                 );
             if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]})) {
                 next unless ($has_opa_priv);
             }
             $menu .= $switcher;
+        } elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink
+            next if ($crstype eq 'Placement');
+            $menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
         } else {
             if ($$menuitem[3] eq 'Syllabus' && $env{'request.course.id'}) {
                 my $url = $$menuitem[0];
@@ -729,11 +776,25 @@ sub secondary_menu {
         }
         $menu =~ s/\[url\]/$escurl/g;
         $menu =~ s/\[symb\]/$escsymb/g;
+    } elsif (($menu =~ m{/adm/preferences\?}) && ($menu =~ /\[returnurl\]/)) {
+        my $returnurl = $ENV{'REQUEST_URI'};
+        if ($ENV{'REQUEST_URI'} =~ m{/adm/preferences\?action=authorsettings\&returnurl=([^\&]+)$}) {
+            $returnurl = $1;
+        }
+        if (($returnurl =~ m{^/adm/createuser($|\?action=)}) ||
+            ($returnurl =~ m{^/priv/$match_domain/$match_username}) ||
+            ($returnurl =~ m{^/res(/?$|/$match_domain/$match_username)})) {
+            $returnurl =~ s{\?.*$}{};
+            $returnurl = '&amp;returnurl='.&HTML::Entities::encode($returnurl,'"<>&\'');
+        } else {
+            undef($returnurl);
+        }
+        $menu =~ s/\[returnurl\]/$returnurl/;
     }
     $menu =~ s/\[uname\]/$$author{user}/g;
     $menu =~ s/\[udom\]/$$author{dom}/g;
     $menu =~ s/\[javascript\]/javascript:/g;
-    if ($env{'request.course.id'}) {  
+    if ($env{'request.course.id'}) {
         $menu =~ s/\[cnum\]/$cnum/g;
         $menu =~ s/\[cdom\]/$cdom/g;
     }
@@ -756,7 +817,7 @@ sub create_submenu {
     my $menu = '<li class="LC_hoverable '.$addclass.'">'.
                '<a href="'.$link.'"'.$targetattr.'>'.
                '<span class="LC_nobreak">'.$title.
-               '<span class="LC_fontsize_small" style="font-weight:normal;">'.
+               '<span class="LC_fontsize_medium" style="font-weight:normal;">'.
                ' &#9660;</span></span></a>'.
                '<ul>';
 
@@ -772,7 +833,7 @@ sub create_submenu {
 # build the dropdown (and nested submenus) recursively
 # see perldoc create_submenu documentation for further information
 sub build_submenu {
-    my ($target, $submenu, $translate, $first_level, $listclass, $linkattr) = @_;
+    my ($target, $submenu, $translate, $first_level, $listclass, $linkattr) = @_; 
     unless (@{$submenu}) {
         return '';
     }
@@ -805,11 +866,11 @@ sub build_submenu {
             if (ref($href) eq 'ARRAY') {
                 $menu .= '<li style="margin:0;padding:0;'.$bordertop . $borderbot . '">';
                 $menu .= '<p><span class="LC_primary_menu_innertitle">'
-                                        . $title . '</span><span class="LC_primary_menu_innerarrow">&#9654;</span></p>';
+					. $title . '</span><span class="LC_primary_menu_innerarrow">&#9654;</span></p>';
                 $menu .= '<ul>';
                 $menu .= &build_submenu($target, $href, $translate);
                 $menu .= '</ul>';
-                $menu .= '</li>';
+                $menu .= '</li>';    
             } else {    # href is the actual hyperlink and does not represent another submenu
                         # for the current menu title
                 if ($href =~ /(aboutme|rss\.html)$/) {
@@ -849,62 +910,23 @@ sub build_submenu {
     return $menu;
 }
 
-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();
-    }
-    if (($env{'environment.remote'} ne 'on') ||
-        ((($env{'request.publicaccess'}) ||
-         (!&Apache::lonnet::is_on_map(
-           &unescape($env{'request.noversionuri'})))) &&
-        (!$forcereg))) {
-        return
-        $result
-       .'<script type="text/javascript">'."\n"
-       .'// <![CDATA['."\n"
-       .'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n"
-       .'// ]]>'."\n"
-       .'</script>'
-       .$force_title;
-    }
-# Graphical display after login only
-    if ($env{'request.registered'} && !$forcereg) { return ''; }
-    $result.=&innerregister($forcereg);
-    return $result.$force_title;
-}
-
 sub innerregister {
     my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname,
         $ltiscope,$ltiuri,$showncrumbsref) = @_;
     my $const_space = ($env{'request.state'} eq 'construct');
-    my $is_const_dir = 0;
+    my $in_daxe = 0;
 
     if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
 
     $env{'request.registered'} = 1;
 
-    my $noremote = ($env{'environment.remote'} ne 'on');
-
     undef(@inlineremote);
 
-    my $reopen=&Apache::lonmenu::reopenmenu();
-
-    my $newmail='';
-
-    if (&Apache::lonmsg::newmail() && !$noremote) {
-        # We have new mail and remote is up
-        $newmail= 'swmenu.setstatus("you have","messages");';
-    }
-
     my ($mapurl,$resurl,$crstype,$navmap);
 
     if ($env{'request.course.id'}) {
 #
-#course_type:  Course or Community
+#course_type:  Course, Community, or Placement
 #
         $crstype = &Apache::loncommon::course_type();
         if ($env{'request.symb'}) {
@@ -918,9 +940,9 @@ sub innerregister {
 
             my $maptitle = &Apache::lonnet::gettitle($mapurl);
             my $restitle = &Apache::lonnet::gettitle($symb);
-
             my (@crumbs,@mapcrumbs);
-            if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '')) { 
+            if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '') &&
+                (!(($crstype eq 'Placement') && !$env{'request.role.adv'}))) {
                 unless ($ltiscope eq 'resource') {
                     if (($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) &&
                         !(($ltiscope eq 'map') && (&Apache::lonnet::clutter($resurl) eq $ltiuri))) {
@@ -931,23 +953,26 @@ sub innerregister {
                     }
                 }
             }
-            unless (($ltiscope eq 'map') || ($ltiscope eq 'resource')) {
+            unless ((($crstype eq 'Placement') && (!$env{'request.role.adv'})) ||
+                    ($ltiscope eq 'map') || ($ltiscope eq 'resource')) {
                 @crumbs = ({text  => $crstype.' Contents', 
                             href  => "Javascript:gopost('/adm/navmaps','')"});
             }
             if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { 
                 if (@mapcrumbs) {
                     push(@crumbs,@mapcrumbs);
-                } elsif (($ltiscope ne 'map') && ($ltiscope ne 'resource')) {
+                } elsif (!(($crstype eq 'Placement') && (!$env{'request.role.adv'})) &&
+                         ($ltiscope ne 'map') && ($ltiscope ne 'resource')) {
                     push(@crumbs, {text  => '...',
                                    no_mt => 1});
                 }
             }
 
-            unless ((@mapcrumbs) || (!$maptitle) || ($maptitle eq 'default.sequence') ||
+            unless ((($crstype eq 'Placement') && (!$env{'request.role.adv'})) || (@mapcrumbs) ||
+                    (!$maptitle) || ($maptitle eq 'default.sequence') ||
                     ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) ||
-                    ($ltiscope eq 'resource')) { 
-                push @crumbs, {text => $maptitle, no_mt => 1,
+                    ($ltiscope eq 'resource')) {
+                push @crumbs, {text => $maptitle, no_mt => 1, 
                                href => &Apache::lonnet::clutter($mapurl).'?navmap=1'};
             }
             if ($restitle && !@mapcrumbs) {
@@ -991,7 +1016,7 @@ sub innerregister {
                     {text  => "Supplemental $crstype Content",
                      href  => "javascript:gopost('/adm/supplemental','')"});
                     $title = &HTML::Entities::encode(&mt('View Resource'),'\'"<>&');
-                    ($trail) =
+                    ($trail) = 
                         &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1);
                 }
                 if (ref($showncrumbsref)) {
@@ -1002,13 +1027,25 @@ sub innerregister {
                 &Apache::lonhtmlcommon::clear_breadcrumbs();
                 &prepare_functions('/public'.$courseurl."/syllabus",
                                    $forcereg,$group,undef,undef,1,$hostname);
-                $title = &HTML::Entities::encode(&mt('Syllabus File'),'\'"<>&');  
+                $title = &HTML::Entities::encode(&mt('Syllabus File'),'\'"<>&');
                 my ($trail) =
                     &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1);
                 if (ref($showncrumbsref)) {
                     $$showncrumbsref = 1;
                 }
                 return $trail;
+            } elsif (($resurl eq '/public'.$courseurl.'/syllabus') &&
+                     ($env{'form.folderpath'})) {
+                if ($env{'form.title'}) {
+                    $title = $env{'form.title'};
+                } else {
+                    $title = 'Syllabus';
+                }
+                &prepare_functions($resurl,$forcereg,$group,undef,undef,1,$hostname);
+                $title = &HTML::Entities::encode($title,'\'"<>&');
+                my ($trail) =
+                    &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1);
+                return $trail;
             }
             unless ($env{'request.state'} eq 'construct') {
                 &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -1023,106 +1060,198 @@ sub innerregister {
             &Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'});
         }
     }
-    my $timesync   = ( $noremote ? '' : 'swmenu.syncclock(1000*'.time.');' );
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
-    if ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/})
-                       || ($forcereg)) {
-
-        my %swtext;
-        if ($noremote) {
-            %swtext = &get_inline_text();
-        } else {
-            %swtext = &get_rc_text();
-        }
-        my $hwkadd='';
-
-        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)/)) {
-            if (($env{'environment.remote'} eq 'on') && ($env{'request.symb'})) {
-                &Apache::lonhtmlcommon::clear_breadcrumbs();
-            }
-            $editbutton = &prepare_functions($resurl,$forcereg,$group,'','','',$hostname);
-        }
-        if ($editbutton eq '') {
-            $editbutton = &clear(6,1);
-        }
+    return '' unless ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/}) 
+                       || $forcereg );
+    my ($cdom,$cnum,%perms,$cfile,$switchserver,$home,$forceedit,
+        $forceview,$editbutton);
+    if (($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) ||
+        ($env{'request.role'} !~/^(aa|ca|au)/)) {
+        $editbutton = &prepare_functions($resurl,$forcereg,$group,'','','',$hostname);
+    }
+    if ($editbutton eq '') {
+        $editbutton = &clear(6,1);
+    }
 
 #
 # This applies in course context
 #
-        if ($env{'request.course.id'}) {
-            $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-            $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-            $perms{'mdc'} = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
-            $perms{'cev'} = &Apache::lonnet::allowed('cev',$env{'request.course.id'});
-            my @privs;
-            my $gradable_exttool;
-            if ($env{'request.symb'} ne '') {
-                if ($env{'request.noversionuri'} =~ m{^/adm/$cdom/$cnum/(\d+)/ext\.tool$}) {
-                    if (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i) {
-                        $gradable_exttool = 1;
-                         push(@privs,('mgr','vgr'));
-                    }
-                } elsif ($env{'request.filename'}=~/$LONCAPA::assess_re/) {
-                    push(@privs,('mgr','vgr'));
-                }
-                push(@privs,('opa','vpa'));
-            }
-            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'}");
-                }
+    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'});
+        $perms{'cev'} = &Apache::lonnet::allowed('cev',$env{'request.course.id'});
+        my @privs;
+        my $gradable_exttool;
+        if ($env{'request.symb'} ne '') {
+             if ($env{'request.noversionuri'} =~ m{^/adm/$cdom/$cnum/(\d+)/ext\.tool$}) {
+                 if (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i) {
+                     $gradable_exttool = 1;
+                     push(@privs,('mgr','vgr'));
+                 }
+             } elsif ($env{'request.filename'}=~/$LONCAPA::assess_re/) {
+                 push(@privs,('mgr','vgr'));
+             }
+             push(@privs,('opa','vpa'));
+        }
+        foreach my $priv (@privs) {
+            $perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'});
+            if (!$perms{$priv} && $env{'request.course.sec'} ne '') {
+                $perms{$priv} = 
+                    &Apache::lonnet::allowed($priv,"$env{'request.course.id'}/$env{'request.course.sec'}");
             }
+        }
 #
 # Determine whether or not to show Grades and Submissions buttons
 #
-            if ($env{'request.symb'} ne '' &&
-                $env{'request.filename'}=~/$LONCAPA::assess_re/) {
-                if ($perms{'mgr'}) {
-                    $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');
-                }
-            }
-            if (($env{'request.symb'} ne '') && (($perms{'opa'}) || ($perms{'vpa'}))) {
-                $hwkadd .= &switch('','',7,3,'pparm.png','Content Settings',
-                                   'parms[_2]',"gocmd('/adm/parmset','set')",
-                                   'Content Settings');
-            }
+        if (($env{'request.symb'} ne '') &&
+            (($env{'request.filename'}=~/$LONCAPA::assess_re/) || ($gradable_exttool))) {
+            if ($perms{'mgr'}) {
+                &switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',
+                        "gocmd('/adm/grades','gradingmenu')",
+                        'Grading for Resource/Folder');
+            } elsif ($perms{'vgr'}) {
+                &switch('','',7,2,'subm.png','Content Submissions','missions[_1]',
+                        "gocmd('/adm/grades','submission')",
+                        'Submissions for Resource/Folder');
+             }
+        }
+        if (($env{'request.symb'} ne '') && (($perms{'opa'}) || ($perms{'vpa'}))) {
+            &switch('','',7,3,'pparm.png','Content Settings','parms[_2]',
+                    "gocmd('/adm/parmset','set')",
+                    'Content Settings for Resource/Folder');
+	}
 # End grades/submissions check
 
 #
 # This applies to items inside a folder/page modifiable in the course.
 #
-            if (($env{'request.symb'}=~/^uploaded/) && (($perms{'mdc'}) || ($perms{'cev'}))) {
-                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');
-            }
+        if (($env{'request.symb'}=~/^uploaded/) && (($perms{'mdc'}) || ($perms{'cev'}))) {
+            my $text = 'Edit Folder';
+            if (($mapurl =~ /\.page$/) ||
+                ($env{'request.symb'}=~
+                     m{uploaded/$cdom/$cnum/default_\d+\.page$}))  {
+                $text = 'Edit Page';
+            }
+            &switch('','',7,4,'docs-22x22.png',$text,'parms[_2]',
+                    "gocmd('/adm/coursedocs','direct')",
+                    'Folder/Page Content');
+        }
 # End modifiable folder/page container check
+
+#
+# Determine whether to show View As button for shortcut to display problem, answer, and submissions
+#
+
+        if (($env{'request.symb'} ne '') &&
+            ($env{'request.filename'}=~/$LONCAPA::assess_re/) &&
+            (($perms{'mgr'}) || ($perms{'vgr'}))) {
+            my ($viewas,$text,$change,$visibility,$vuname,$vudom,$vid,$leftvis,$rightvis,
+                $defdom,$domselector,$righticon);
+            my %lt = &Apache::lonlocal::texthash(
+                                                 view => 'View',
+                                                 upda => 'Update',
+                                                 user => 'View as user',
+                                                 choo => 'Choose user',
+            );
+            my $possdomstr = $env{'course.'.$env{'request.course.id'}.'.internal.userdomains'};
+            if ($possdomstr =~ /,/) {
+                my @possdoms = split(/,/,$possdomstr);
+                if ($env{'request.user_in_effect'} =~ /^$match_username:($match_domain)$/) {
+                    $defdom = $1;
+                } elsif (grep(/^\Q$cdom\E$/,@possdoms)) {
+                    $defdom = $cdom;
+                } elsif (&Apache::lonnet::domain($possdoms[0]) ne '') {
+                    $defdom = $possdoms[0];
+                }
+                $domselector = &Apache::loncommon::select_dom_form($defdom,'vudom','','','',
+                                                                   \@possdoms,'','','vudom').
+                               '<span class="LC_visually_hidden"><label for="vudom">'.
+                               &mt("user's domain").'</label></span>';
+            } elsif (($possdomstr ne '') && (&Apache::lonnet::domain($possdomstr) ne '')) {
+                if ($env{'request.user_in_effect'} =~ /^$match_username:($match_domain)$/) {
+                    $defdom = $1;
+                } else {
+                    $defdom = $possdomstr;
+                }
+            }
+            if ($env{'request.user_in_effect'} =~ /^($match_username):($match_domain)$/) {
+                ($vuname,$vudom) = ($1,$2);
+                unless (&Apache::lonnet::is_advanced_user($vudom,$vuname)) {
+                    $vid = (&Apache::lonnet::idrget($vudom,$vuname))[1];
+                }
+                $viewas = $env{'request.user_in_effect'};
+                $text = $lt{'upda'};
+                $change = 'off';
+                $visibility = 'inline';
+                $leftvis = 'none';
+                $rightvis = 'inline';
+                $defdom = $vudom;
+                $righticon = '&#10006;';
+            } else {
+                $text = $lt{'view'};
+                $change = 'on';
+                $visibility = 'none';
+                $leftvis = 'inline';
+                $rightvis = 'none';
+                $righticon = '&#9668;';
+                if ($defdom eq '') {
+                    $defdom = $cdom;
+                }
+            }
+            my $sellink = &Apache::loncommon::selectstudent_link('userview','vuname','vudom','','','vuidentifier');
+            my $selscript=&Apache::loncommon::studentbrowser_javascript();
+            my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($env{'request.symb'}),'<>&"');
+            my $input;
+            my @items = (
+                         '<label><input type="radio" name="vuidentifier" value="uname" checked="checked" onclick="javascript:toggleIdentifier(this.form);" />',
+                         '</label><input name="vuname" type="text" size="6" value="'.$vuname.'" id="LC_vuname" />',
+                         '<label><input type="radio" name="vuidentifier" value="uid" onclick="javascript:toggleIdentifier(this.form);" />',
+                         '</label><input name="vid" type="hidden" size="6" value="'.$vid.'" id="LC_vid" />'
+                        );
+            if ($domselector) {
+                push(@items,$domselector);
+                $input = &mt('[_1]User:[_2] or [_3]ID:[_4] at [_5] | ',@items);
+            } else {
+                $input = &mt('[_1]Username:[_2] or [_3]ID:[_4] | ',@items).
+                         '<input name="vudom" type="hidden" value="'.$defdom.'" />';
+            }
+            $input .= '<input name="LC_viewas" type="hidden" value="'.$viewas.'" />',
+                      '<input name="symb" type="hidden" value="'.$shownsymb.'" />';
+            my $chooser = <<END;
+<span class="LC_visually_hidden">
+<label for="LC_vuname" id="LC_vuidentifier">$lt{'user'}</label>
+</span>
+$selscript
+<a href="javascript:toggleViewAsUser('$change');" class="LC_menubuttons_link" id="usexpand" style="display:$leftvis;">
+<span class="LC_menubuttons_inline_text">&#9658;&nbsp;</span>
+</a>
+<fieldset id="LC_selectuser" style="display:$visibility;"><legend class="LC_visually_hidden">$lt{'choo'}</legend>
+<form name="userview" action="" method="post" onsubmit="event.preventDefault(); return validCourseUser(this,'$change');">
+<span class="LC_menubuttons_inline_text LC_nobreak">
+$input
+$sellink
+</span>
+&nbsp;<input type="submit" value="$text" />
+</form>
+</fieldset>
+<a href="javascript:toggleViewAsUser('$change');" class="LC_menubuttons_link" id="uscollapse" style="display:$rightvis">
+<span class="LC_menubuttons_inline_text">$righticon</span>
+</a>
+END
+            &switch('','',7,5,'viewuser.png','View As','user[_1]',
+                    'toggleViewAsUser('."'$change'".')',
+                    'View resource as user','','',$chooser);
         }
+# End view as user check
+
+    }
 # End course context
 
 # Prepare the rest of the buttons
-        my ($menuitems,$got_prt,$got_wishlist,$cstritems);
-        if ($const_space) {
+    my ($menuitems,$got_prt,$got_wishlist,$crsauthor,$toplevel_cstr,$crsauthor_cstr);
+    if ($const_space) {
 #
 # We are in construction space
 #
@@ -1130,37 +1259,110 @@ sub innerregister {
             my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
 	    my ($udom,$uname,$thisdisfn) =
 		($env{'request.filename'}=~m{^\Q$londocroot/priv/\E([^/]+)/([^/]+)/(.*)$});
+            if (($env{'request.course.id'}) &&
+                ($env{'course.'.$env{'request.course.id'}.'.num'} eq $uname) &&
+                ($env{'course.'.$env{'request.course.id'}.'.domain'} eq $udom)) {
+                $crsauthor_cstr = 1;
+            }
             my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn;
             if ($currdir =~ m-/$-) {
-                $is_const_dir = 1;
                 if ($thisdisfn eq '') {
-                    $is_const_dir = 2;
+                    $toplevel_cstr = 1;
+                }
+                my $esc_currdir = &Apache::loncommon::escape_single($currdir);
+                $menuitems=(<<ENDMENUITEMS);
+s&6&3&pub.png&Publish&dir[_2]&gocstr('/adm/publish','$esc_currdir')&Publish this Directory
+s&7&4&docs-22x22.png&Edit Metadata&defaults[_1]&gopost('${esc_currdir}default.meta','')&Edit metadata for this Directory
+s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','$esc_currdir')&Print contents of directory
+s&7&1&del.png&Delete&dir[_3]&gocstr('/adm/cfile?action=delete','$esc_currdir')&Delete this Directory
+ENDMENUITEMS
+                unless ($crsauthor_cstr) {
+                    if (($env{'environment.canarchive'}) &&
+                        ($uname eq $env{'user.name'}) && ($udom eq $env{'user.domain'})) {
+                        $menuitems .= (<<ENDMENUITEMS);
+s&7&7&archive.png&Export&dir[_1]&gocstr('/adm/cfile?action=archive','$esc_currdir')&Export Authoring Space Archive
+ENDMENUITEMS
+                    }
                 }
             } else {
                 $currdir =~ s|[^/]+$||;
 		my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn);
 		my $esc_currdir = &Apache::loncommon::escape_single($currdir);
+                my $pubfile = "/res/$udom/$uname/$thisdisfn";
+                my $candelete = 1;
+                if (-e $londocroot.$pubfile) {
+                    unless (&Apache::lonnet::metadata($pubfile,'obsolete')) {
+                        undef($candelete);
+                    }
+                }
 #
 # Probably should be in mydesk.tab
 #
-                $menuitems=(<<ENDMENUITEMS);
+                if (($crsauthor_cstr) && ($pubfile eq "/res/$udom/$uname/default.rights")) {
+                    $menuitems=(<<ENDMENUITEMS);
+s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory
+s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource
+ENDMENUITEMS
+                } else {
+                    $menuitems=(<<ENDMENUITEMS);
 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&3&copy.png&Copy&resource[_4]&gocstr('/adm/cfile?action=copy','/priv/$udom/$uname/$cleandisfn')&Copy this resource
+ENDMENUITEMS
+                }
+#
+# Rename and Delete only available if obsolete or unpublished
+#
+                if ($candelete) {
+                    $menuitems .= (<<ENDMENUITEMS);
+s&7&4&rename.png&Rename&resource[_5]&gocstr('/adm/cfile?action=rename','/priv/$udom/$uname/$cleandisfn')&Rename this resource
 s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource
+ENDMENUITEMS
+                }
+#
+# Print only makes sense for certain mime types
+#
+                if ($thisdisfn=~/\.(xml|html|htm|xhtml|xhtm|tex)$/ || $thisdisfn=~/$LONCAPA::assess_re/) {
+                    $menuitems .= (<<ENDMENUITEMS);
 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 (ref($bread_crumbs) eq 'ARRAY') {
-                &Apache::lonhtmlcommon::clear_breadcrumbs();
-                foreach my $crumb (@{$bread_crumbs}){
-                     &Apache::lonhtmlcommon::add_breadcrumb($crumb);
+#
+# "Exit Daxe" in Functions menu when using Daxe
+#
+                if ((($env{'form.editmode'} eq 'daxe') &&
+                     ($thisdisfn=~/\.(xml|html|htm|xhtml|xhtm)$/)) ||
+                    (($env{'form.problemmode'} eq 'daxe') &&
+                     ($thisdisfn=~/$LONCAPA::assess_re/))) {
+                    my %editors = &Apache::loncommon::permitted_editors();
+                    if ($editors{'daxe'}) {
+                        my $privfile = &Apache::loncommon::escape_single("/priv/$udom/$uname/$thisdisfn");
+                        $in_daxe = 1;
+                        $menuitems .= (<<ENDMENUITEMS);
+my $privfile = &Apache::loncommon::escape_single("/priv/$udom/$uname/$thisdisfn");
+s&7&6&tolastloc.png&Exit Daxe&resource[_1]&go('$privfile')&Exit editing this resource
+ENDMENUITEMS
+                    }
                 }
             }
+#
+# Editing options usually accessed via "Settings" in inline menu need to be
+# accessed in a different way, when Authoring Space is accessed in course
+# context
+#
+            if ($env{'request.role'} !~/^(aa|ca|au)/) {
+                my $privfile = &Apache::loncommon::escape_single("/priv/$udom/$uname/$thisdisfn");
+                $menuitems .= (<<ENDMENUITEMS);
+s&7&5&editops.png&Options&edit[_1]&gocstr('/adm/preferences?action=authorsettings','$privfile')&Authoring Space Options
+ENDMENUITEMS
+            }
+                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 '' ) {
 #
@@ -1196,25 +1398,50 @@ s&2&1&back.png&&&gopost('/adm/flip','bac
                     $menuitems.="
 s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3";
                 }
-            } else {
+            } elsif (($crstype ne 'Placement') || ($env{'request.role.adv'})) {
                 $menuitems.="
 s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
 s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3";
+            } else {
+# Suppress display of backward arrow for Placement Tests
+# Suppress display of forward arrow for Placement Tests if this is the last resource.
+                my $showforw = 1;
+                if ($env{'request.symb'}) {
+                    my $navmap = Apache::lonnavmaps::navmap->new();
+                    if (ref($navmap)) {
+                        if (&Apache::lonplacementtest::is_lastres($env{'request.symb'},$navmap)) {
+                            $showforw = 0;
+                        }
+                    }
+                }
+                if ($showforw) {
+                    $menuitems.="
+s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3";
+                }
             }
-            $menuitems .= (<<ENDMENUITEMS);
+	    $menuitems .= (<<ENDMENUITEMS);
+
 c&6&3
+c&8&1
 c&8&2
-s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&8&3&prt.png&Print&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('',currentURL)&Save a link for this resource in my personal Stored Links repository&&1
+                my $privurl = $env{'request.uri'};
+                $privurl =~ s{^/res/}{/priv/};
+                my ($cnum,$cdom) = &Apache::loncommon::crsauthor_url($privurl);
+                if ($cnum) {
+                    $crsauthor = 1;
+                } else {
+                    # wishlist is only available for users with access to resource-pool
+                    # and links can only be set for resources within the resource-pool
+                    $menuitems .= (<<ENDMENUITEMS);
+s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in my personal Stored Links repository&&1
 ENDMENUITEMS
-                $got_wishlist = 1;
+                    $got_wishlist = 1;
+                }
             }
 
 my $currentURL = &Apache::loncommon::get_symb();
@@ -1226,7 +1453,7 @@ if(length($annotation) > 0){
 }else{
 	$menuitems.="anot.png";
 }
-$menuitems.="&$swtext{'anot'}&tations[_1]&annotate()&";
+$menuitems.="&Notes&&annotate()&";
 $menuitems.="Make notes and annotations about this resource&&1\n";
 my $is_mobile;
 if ($env{'browser.mobile'}) {
@@ -1238,19 +1465,19 @@ if ($env{'browser.mobile'}) {
                     ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)}) &&
                     ($env{'request.noversionuri'} !~ m{^/adm/.+/ext\.tool$})) {
 		    $menuitems.=(<<ENDREALRES);
-s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info(currentURL,'$is_mobile')&Show Metadata
+s&6&3&catalog.png&Info&info[_1]&catalog_info(currentURL,'$is_mobile')&Show Metadata
 ENDREALRES
                 }
                 unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/(docs/|default_\d+\.page$)}) ||
                         ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/}) ||
-                        ($env{'request.noversionuri'} =~ m{^/adm/.+/ext\.tool$})) { 
-	            $menuitems.=(<<ENDREALRES);
-s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
+                        ($env{'request.noversionuri'} =~ m{^/adm/.+/ext\.tool$})) {
+                    $menuitems.=(<<ENDREALRES);
+s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
 ENDREALRES
                 }
                 unless ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext|uploaded)/}) {
                     $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
+s&8&2&fdbk.png&Communicate&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
 ENDREALRES
                 }
 	    }
@@ -1258,29 +1485,19 @@ ENDREALRES
 	if ($env{'request.uri'} =~ /^\/res/) {
             unless ($got_prt) {
 	        $menuitems .= (<<ENDMENUITEMS);
-s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
                 $got_prt = 1;
             }
-            unless ($got_wishlist) {
+            unless (($got_wishlist) || ($crsauthor)) {
                 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('',currentURL)&Save a link for this resource in your personal Stored Links repository&&1
+s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS
                     $got_wishlist = 1;
                 }
-            }
-	}
-        unless ($got_prt) {
-            $menuitems .= (<<ENDMENUITEMS);
-c&8&3
-ENDMENUITEMS
-        }
-        unless ($got_wishlist) {
-            $menuitems .= (<<ENDMENUITEMS);
-c&9&1
-ENDMENUITEMS
+	    }
         }
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
@@ -1300,391 +1517,100 @@ ENDMENUITEMS
                 }
             }
         }
-        my $linkprotout;
+        my ($showprogress,$linkprotout);
+        if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) {
+            $showprogress = &placement_progress();
+        }
         if ($env{'request.deeplink.login'}) {
             $linkprotout = &linkprot_exit();
         }
-        if ($noremote) {
-	    my $addremote=0;
-	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
-            if ($addremote) {
-                my ($countdown,$buttonshide);
-                if ($env{'request.filename'} =~ /\.page$/) {
-                    my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools();
-                    if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') {
-                        $countdown = $breadcrumb_tools{'tools'}->[0];
-                    }
-                    $buttonshide = $pagebuttonshide;
-                } else {
-                    $countdown = &countdown_timer();
-                    $buttonshide = &hidden_button_check();
-                }
 
-                &Apache::lonhtmlcommon::clear_breadcrumb_tools();
+	my $addremote=0;
+	foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
 
-                &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                    'navigation', @inlineremote[21,23]);
+    if ($addremote) {
+        my ($countdown,$buttonshide);
+        if ($env{'request.filename'} =~ /\.page$/) {
+            my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools();
+            if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') {
+                $countdown = $breadcrumb_tools{'tools'}->[0];
+            }
+            $buttonshide = $pagebuttonshide;
+        } else {
+            $countdown = &countdown_timer();
+            $buttonshide = &hidden_button_check();
+        }
+        &Apache::lonhtmlcommon::clear_breadcrumb_tools();
 
-                if ($buttonshide eq 'yes') {
-                    if ($countdown) {
-                        &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);
-                    }
-                    if ($linkprotout) {
-                        &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
-                    }
-                } else {
-                    my @tools = @inlineremote[93,91,81,82,83];
-                    if ($countdown) {
-                        unshift(@tools,$countdown);
-                    }
-                    if ($linkprotout) {
-                        unshift(@tools,$linkprotout);
-                    }
-                    &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                        'tools',@tools);
+            &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                'navigation', @inlineremote[21,23]);
 
-                    #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);
-                }
-            } else {
-                if ($linkprotout) {
-                    &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
-                }
+        if ($buttonshide eq 'yes') {
+            if ($countdown) {
+                &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);
             }
-            my ($topic_help,$topic_help_text);
-            if ($is_const_dir == 2) {
-                if ((($ENV{'SERVER_PORT'} == 443) ||
-                     ($Apache::lonnet::protocol{$Apache::lonnet::perlvar{'lonHostID'}} eq 'https')) &&
-                     (&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},'webdav'))) {
-                    $topic_help = 'Authoring_WebDAV,Authoring_WebDAV_Mac_10v6,Authoring_WebDAV_Mac_10v10,'.
-                                 'Authoring_WebDAV_Windows_v7,Authoring_WebDAV_Linux_Centos';
-                    $topic_help_text = 'About WebDAV access';
-                }
+            if ($linkprotout) {
+                &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
             }
-            if (ref($showncrumbsref)) {
-                $$showncrumbsref = 1;
+            if ($showprogress) {
+                &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress);
             }
-            return   &Apache::lonhtmlcommon::scripttag('', 'start')
-                   . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text)
-                   . &Apache::lonhtmlcommon::scripttag('', 'end');
-
         } else {
-            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.clearTimeout(swmenu.menucltim);
-          $timesync
-          $newmail
-          $buttons
-          swmenu.currentURL="$requri";
-          swmenu.reloadURL=swmenu.currentURL+window.location.search;
-          swmenu.currentSymb="$cursymb";
-          swmenu.reloadSymb="$cursymb";
-          swmenu.currentStale=0;
-          $navstatus
-          $hwkadd
-          $editbutton
-    }
-
-    function LONCAPAstale() {
-          swmenu=$reopen
-          swmenu.currentStale=1;
-          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);
-      }
-
-// END LON-CAPA Internal
-// ]]>
-</script>
-
-$cstrcrumbs
-ENDREGTHIS
+            my @tools = @inlineremote[93,91,81,82,83];
+            if ($countdown) {
+                unshift(@tools,$countdown);
+            }
+            if ($linkprotout) {
+                unshift(@tools,$linkprotout);
+            }
+            &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                'tools',@tools);
+
+            #exit editing link/icon when using daxe in construction space 
+            #publish button in construction space
+            if ($env{'request.state'} eq 'construct'){
+                if ($in_daxe) {
+                    &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                         'advtools', $inlineremote[76]);
+                }
+                &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                     'advtools', $inlineremote[63]);
+            } else {
+                &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                     'tools', $inlineremote[63]);
+            }
+            &advtools_crumbs(@inlineremote);
+            #options link/icon in constructions space viewed with course role
+            if (($env{'request.state'} eq 'construct') &&
+                ($env{'request.role'} !~/^(aa|ca|au)/)) {
+                &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                         'advtools', $inlineremote[75]);
+            }
         }
     } else {
-       unless ($noremote) {
-# Not registered, graphical
-           return (<<ENDDONOTREGTHIS);
-
-<script type="text/javascript">
-// <![CDATA[
-// BEGIN LON-CAPA Internal
-var swmenu=null;
-
-    function LONCAPAreg() {
-          swmenu=$reopen
-          $timesync
-          swmenu.currentStale=1;
-          swmenu.clearbut(2,1);
-          swmenu.clearbut(2,3);
-          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);
-          }
-    }
-
-    function LONCAPAstale() {
+        if ($showprogress) {
+            &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress);
+        }
+        if ($linkprotout) {
+            &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
+        }
     }
-
-// END LON-CAPA Internal
-// ]]>
-</script>
-ENDDONOTREGTHIS
-
+    my ($topic_help,$topic_help_text);
+    if ($toplevel_cstr && !$crsauthor_cstr) {
+        if ((($ENV{'SERVER_PORT'} == 443) || 
+             ($Apache::lonnet::protocol{$Apache::lonnet::perlvar{'lonHostID'}} eq 'https')) && 
+            (&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},'webdav'))) {
+            $topic_help = 'Authoring_WebDAV,Authoring_WebDAV_Mac_10v6,Authoring_WebDAV_Mac_10v10,'.
+                          'Authoring_WebDAV_Windows_v7,Authoring_WebDAV_Linux_Centos';
+            $topic_help_text = 'About WebDAV access';
         }
-        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 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 ''; }
-    return 'LONCAPAreg();';
-}
-
-sub unloadevents() {
-    if ($env{'request.state'} eq 'construct' ||
-        $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
-    return 'LONCAPAstale();';
-}
-
-sub startupremote {
-    my ($lowerurl)=@_;
-    unless ($env{'environment.remote'} eq 'on') {
-        return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />');
+    if (ref($showncrumbsref)) {
+        $$showncrumbsref = 1;
     }
-#
-# The Remote actually gets launched!
-#
-    my $configmenu=&rawconfig();
-    my $esclowerurl=&escape($lowerurl);
-    my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited');
-    return(<<ENDREMOTESTARTUP);
-<script type="text/javascript">
-// <![CDATA[
-var timestart;
-function wheelswitch() {
-    if (typeof(document.wheel) != 'undefined') {
-        if (typeof(document.wheel.spin) != 'undefined') {
-            var date=new Date();
-            var waited=Math.round(30-((date.getTime()-timestart)/1000));
-            document.wheel.spin.value=$message;
-        }
-    }
-   if (window.status=='|') {
-      window.status='/';
-   } else {
-      if (window.status=='/') {
-         window.status='-';
-      } else {
-         if (window.status=='-') {
-            window.status='\\\\';
-         } else {
-            if (window.status=='\\\\') { window.status='|'; }
-         }
-      }
-   }
-}
-
-// ---------------------------------------------------------- The wait function
-var canceltim;
-function wait() {
-   if ((menuloaded==1) || (tim==1)) {
-      window.status='Done.';
-      if (tim==0) {
-         clearTimeout(canceltim);
-         $configmenu
-         window.location='$lowerurl';
-      } else {
-          window.location='/adm/remote?action=collapse&url=$esclowerurl';
-      }
-   } else {
-      wheelswitch();
-      setTimeout('wait();',200);
-   }
-}
-
-function main() {
-   canceltim=setTimeout('tim=1;',30000);
-   window.status='-';
-   var date=new Date();
-   timestart=date.getTime();
-   wait();
-}
-
-// ]]>
-</script>
-ENDREMOTESTARTUP
-}
-
-sub setflags() {
-    return(<<ENDSETFLAGS);
-<script type="text/javascript">
-// <![CDATA[
-    menuloaded=0;
-    tim=0;
-// ]]>
-</script>
-ENDSETFLAGS
-}
-
-sub maincall() {
-    unless ($env{'environment.remote'} eq 'on') { return ''; }
-    return(<<ENDMAINCALL);
-<script type="text/javascript">
-// <![CDATA[
-    main();
-// ]]>
-</script>
-ENDMAINCALL
-}
-
-sub load_remote_msg {
-    my ($lowerurl)=@_;
-
-    unless ($env{'environment.remote'} eq 'on') { return ''; }
-
-    my $esclowerurl=&escape($lowerurl);
-    my $link=&mt('[_1]Continue[_2] on in Inline Menu mode'
-                ,'<a href="/adm/remote?action=collapse&amp;url='.$esclowerurl.'">'
-                ,'</a>');
-    return(<<ENDREMOTEFORM);
-<p>
-<form name="wheel">
-<input name="spin" type="text" size="60" />
-</form>
-</p>
-<p>$link</p>
-ENDREMOTEFORM
-}
-
-sub get_menu_name {
-    my $hostid = $Apache::lonnet::perlvar{'lonHostID'};
-    $hostid =~ s/\W//g;
-    return 'LCmenu'.$hostid;
-}
-
-
-sub reopenmenu {
-   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='';
-    unless ($env{'environment.remote'} eq 'on') {
-        return
-        '<script type="text/javascript">'."\n"
-       .'// <![CDATA['."\n"
-       .'self.name="loncapaclient";'."\n"
-       .'// ]]>'."\n"
-       .'</script>';
-    }
-    my $menuname = &get_menu_name();
-
-#    unless (shift eq 'unix') {
-# resizing does not work on linux because of virtual desktop sizes
-#       $returnval.=(<<ENDRESIZE);
-#if (window.screen) {
-#    self.resizeTo(screen.availWidth-215,screen.availHeight-55);
-#    self.moveTo(190,15);
-#}
-#ENDRESIZE
-#    }
-    $returnval=(<<ENDOPEN);
-// <![CDATA[
-window.status='Opening LON-CAPA Remote Control';
-var menu=window.open("/res/adm/pages/menu.html?inhibitmenu=yes","$menuname",
-"height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
-self.name='loncapaclient';
-// ]]>
-ENDOPEN
-    return '<script type="text/javascript">'.$returnval.'</script>';
+    return   &Apache::lonhtmlcommon::scripttag('', 'start')
+           . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text)
+           . &Apache::lonhtmlcommon::scripttag('', 'end');
 }
 
 sub get_editbutton {
@@ -1723,31 +1649,15 @@ sub get_editbutton {
             $icon = 'tolastloc.png';
             $label = 'Exit Editing';
         }
-        my $infunc = 1;
-        my $clearbutton;
-        if ($env{'environment.remote'} eq 'on') {
-            if ($cfile =~ m{^/priv/}) {
-                undef($infunc);
-                $label = 'edit';
-            } else {
-                $clearbutton = 1;
-            }
-        }
-        my $editor = &switch('','',6,1,$icon,$label,'resource[_2]',
-                             $jscall,"Edit this resource",'','',$infunc);
-        if ($infunc) {
-            return 1;
-        } elsif ($clearbutton) {
-            return &clear(6,1);
-        } else {
-            return $editor;
-        }
+        &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,$hostname,$forbodytag) = @_;
+    my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs,$hostname) = @_;
     unless ($env{'request.registered'}) {
         undef(@inlineremote);
     }
@@ -1776,20 +1686,40 @@ sub prepare_functions {
             $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)/)) {
+    } elsif (!$env{'request.course.id'}) {
+        if (($env{'user.author'}) && ($resurl eq '/adm/viewcoauthors')) {
+            if ($env{'request.role'} =~/^(ca|au)/) {
+                my ($audom,$auname);
+                if ($env{'request.role'} eq "au./$env{'user.domain'}/") {
+                    ($audom,$auname) = ($env{'user.domain'},$env{'user.name'});
+                } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)}) {
+                    ($audom,$auname) = ($1,$2);
+                }
+                if (($audom ne '') && ($auname ne '')) {
+                    my $file=&Apache::lonnet::declutter($env{'request.filename'});
+                    ($cfile,$home,$switchserver,$forceedit,$forceview) =
+                    &Apache::lonnet::can_edit_resource($file,$auname,$audom,
+                                                       $resurl);
+                    if ($cfile) {
+                        $editbutton = &get_editbutton($resurl,'','',$forceedit,
+                                                      $forceview);
+                    }
+                }
+            }
+        } elsif (($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);
+            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'}) {
 #
@@ -1797,8 +1727,8 @@ sub prepare_functions {
 #
         if (($perms{'mdc'}) &&
             (($resurl =~ m{^/?public/$cdom/$cnum/syllabus}) ||
-            ($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}) || 
-            (($resurl =~ m{^/?uploaded/$cdom/$cnum/default_\d+\.sequence$}) && ($env{'form.navmap'})))) {
+             ($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}) ||
+             (($resurl =~ m{^/?uploaded/$cdom/$cnum/default_\d+\.sequence$}) && ($env{'form.navmap'})))) {
             if ($resurl =~ m{^/}) {
                 $cfile = $resurl;
             } else {
@@ -1828,8 +1758,7 @@ sub prepare_functions {
                                                $env{'form.symb'});
             if ($cfile ne '') {
                 $editbutton = &get_editbutton($cfile,$home,$switchserver,
-                                              $forceedit,$forceview,$forcereg,
-                                              $env{'form.title'},$env{'form.suppurl'});
+                                              $forceedit,$forceview,$forcereg);
             }
         } elsif (($resurl =~ m{^/?adm/viewclasslist$}) &&
                  (&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) {
@@ -1841,13 +1770,21 @@ sub prepare_functions {
         } 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'});
+                my $file;
+                my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+                if ($env{'request.filename'} =~ m{^\Q$londocroot\E/priv/}) {
+                    $file = $env{'request.filename'};
+                    $file =~ s{^\Q$londocroot\E/}{};
+                } else {
+                    $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);
+                                                  $forceedit,$forceview,$forcereg,
+                                                  $hostname);
                 }
                 if ((($cfile eq '') || (!$editbutton)) &&
                     ($resurl =~ /$LONCAPA::assess_re/)) {
@@ -1890,7 +1827,7 @@ sub prepare_functions {
                     &switch('','',6,4,'mail-message-new-22x22.png','Message to user',
                             '',
                             "go('/adm/email?compose=individual&amp;recname=$sname&amp;recdom=$sdom')",
-                                'Send message to specific user','','',1);
+                                'Send message to specific user');
                 }
             }
             my $hideprivileged = 1;
@@ -1907,19 +1844,19 @@ sub prepare_functions {
                     &switch('','',6,5,'trck-22x22.png','Activity',
                             '',
                             "go('/adm/trackstudent?selected_student=$sname:$sdom')",
-                            'View recent activity by this person','','',1);
+                            'View recent activity by this person');
                 }
                 if ($perms{'vgr'}) {
                     &switch('','',6,6,'rsrv-22x22.png','Reservations',
                             '',
                             "go('/adm/slotrequest?command=showresv&amp;origin=aboutme&amp;uname=$sname&amp;udom=$sdom')",
-                            'Slot reservation history','','',1);
+                            'Slot reservation history');
                 }
                 if ($perms{'srm'}) {
                     &switch('','',6,7,'contact-new-22x22.png','Records',
                             '',
                             "go('/adm/email?recordftf=retrieve&amp;recname=$sname&amp;recdom=$sdom')",
-                            'Add records','','',1);
+                            'Add records');
                 }
             }
         }
@@ -1954,7 +1891,7 @@ sub prepare_functions {
         &Apache::lonhtmlcommon::clear_breadcrumb_tools();
         &advtools_crumbs(@inlineremote);
         return $editbutton;
-    } elsif (($env{'request.registered'}) && (!ref($forbodytag))) {
+    } elsif ($env{'request.registered'}) {
         return $editbutton || $viewsrcbutton;
     } else {
         if (ref($bread_crumbs) eq 'ARRAY') {
@@ -1967,13 +1904,9 @@ sub prepare_functions {
         } elsif (@inlineremote > 0) {
             &Apache::lonhtmlcommon::clear_breadcrumb_tools();
             &advtools_crumbs(@inlineremote);
-            if (ref($forbodytag)) {
-                $$forbodytag =
-                    &Apache::lonhtmlcommon::scripttag('', 'start')
-                   .&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
-                   .&Apache::lonhtmlcommon::scripttag('', 'end');
-            }
-            return;
+            return   &Apache::lonhtmlcommon::scripttag('', 'start')
+                   . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
+                   . &Apache::lonhtmlcommon::scripttag('', 'end');
         }
     }
 }
@@ -1984,25 +1917,26 @@ sub advtools_crumbs {
         &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]);
+        if ($env{'request.state'} eq 'construct') {
+            &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                'advtools', @funcs[61,73,74,71,72,77]);
+        } else {
+            &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                'advtools', @funcs[61,71,72,73,74,75,92]);
+        }
     } elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') {
         &Apache::lonhtmlcommon::add_breadcrumb_tool(
             'advtools', $funcs[61]);
     }
+    return;
 }
 
 # ================================================================== Raw Config
 
 sub clear {
     my ($row,$col)=@_;
-    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 '';
-    }
+    $inlineremote[10*$row+$col]='';
+    return '';
 }
 
 # ============================================ Switch a button or create a link
@@ -2010,61 +1944,53 @@ sub clear {
 # The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)".
 
 sub switch {
-    my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak,$infunc)=@_;
+    my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak,$form)=@_;
     $act=~s/\$uname/$uname/g;
     $act=~s/\$udom/$udom/g;
-    $top=&mt($top);
-    $bot=&mt($bot);
     $desc=&mt($desc);
     my $idx=10*$row+$col;
     $category_members{$cat}.=':'.$idx;
 
-    if (($env{'environment.remote'} eq 'on') && (!$infunc)) {
-        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
-        $img=~s/\.png$/\.gif/;
-        return "\n".
- qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
-    }
-
 # Inline Menu
     if ($nobreak==2) { return ''; }
-    my $text=$top.' '.$bot;
+    my ($text,$alttext);
+    $text=&mt($top).' '.&mt($bot);
     $text=~s/\s*\-\s*//gs;
+    if ($top && $bot) {
+        if ($top =~ /\-\[_\d+\]$/) {
+            $top =~ s/(\-\[_\d+\])//;
+            $alttext = &mt($top.$bot.' icon');
+        } elsif (($top =~ /^\w+\s\w+\[_\d+\]$/) && ($bot =~ /^\w{8}\[_\d+\]$/)) {
+            $alttext = &mt($top.$bot.' icon');
+        } else {
+            $alttext = &mt("$top $bot icon");
+        }
+    } elsif ($top) {
+        $alttext = &mt("$top icon");
+    } elsif ($bot) {
+        $alttext = &mt("$bot icon");
+    } elsif ($nobreak == 3) {
+        $alttext = &mt('Go forward icon');
+    } elsif ($nobreak) {
+        $alttext = &mt('Go back icon');
+    } else {
+        $alttext = &mt('icon');
+    }
 
     my $pic=
-	   '<img alt="'.$text.'" src="'.
+	   '<img alt="'.$alttext.'" src="'.
 	   &Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img).
 	   '" align="'.($nobreak==3?'right':'left').'" class="LC_icon" />';
     if ($env{'browser.interface'} eq 'faketextual') {
 # Main Menu
-	   if ($nobreak==3) {
-	       $inlineremote[$idx]="\n".
-		   '<td class="LC_menubuttons_text" align="right">'.$text.
-		   '</td><td align="left">'.
-		   '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
-	   } elsif ($nobreak) {
-	       $inlineremote[$idx]="\n<tr>".
-		   '<td align="left">'.
-		   '<a href="javascript:'.$act.';">'.$pic.'</a></td>
-                    <td class="LC_menubuttons_text" align="left"><a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$text.'</span></a></td>';
-	   } else {
-	       $inlineremote[$idx]="\n<tr>".
-		   '<td align="left">'.
-		   '<a href="javascript:'.$act.';">'.$pic.
-		   '</a></td><td class="LC_menubuttons_text" colspan="3">'.
-		   '<a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$desc.'</span></a></td></tr>';
-	   }
+        $inlineremote[$idx] = {
+                                linktext => $desc,
+                                url => 'javascript:'.$act,
+                                permission => 'F',
+                                icon => $img,
+                                alttext => $alttext,
+                                linktitle => '',
+                              };
     } else {
 # Inline Menu
         my @tools = (93,91,81,82,83);
@@ -2077,9 +2003,10 @@ sub switch {
             $inlineremote[$idx] =
         '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.'</a>';
         } else {
+            my $linktext = &mt($top);
             $inlineremote[$idx] =
        '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.
-       '<span class="LC_menubuttons_inline_text">'.$top.'&nbsp;</span></a>';
+       '<span class="LC_menubuttons_inline_text">'.$linktext.'&nbsp;</span></a>'.$form;
         }
     }
     return '';
@@ -2099,44 +2026,38 @@ sub secondlevel {
     return $output;
 }
 
-sub openmenu {
-    my $menuname = &get_menu_name();
-    unless ($env{'environment.remote'} eq 'on') { return ''; }
-    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
-    return "window.open(".$nothing.",'".$menuname."');";
-}
-
 sub inlinemenu {
     undef(@inlineremote);
     undef(%category_members);
 # calling rawconfig with "1" will evaluate mydesk.tab, even if there is no active remote control
     &rawconfig(1);
-    my $output='<table><tr>';
+    my $output;
     for (my $col=1; $col<=2; $col++) {
-        $output.='<td class="LC_mainmenu_col_fieldset">';
+        $output .= '<div class="LC_mainmenu">'."\n";
         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>';
+                my @menu =  ({ categorytitle=>&mt($category_names{$cat}),
+                               listclass=>'LC_ListStyleMainMenu',
+                               boxclass=>'LC_MainMenu_Box',
+                               items        =>[],});
+                if ($category_positions{$cat} ne "$col,$row") { next; }
+                my %active=();
+                foreach my $menu_item (split(/\:/,$category_members{$cat})) {
+                    if ($inlineremote[$menu_item]) {
+                        $active{$menu_item}=1;
+                    }
+                }
+                foreach my $item (sort(keys(%active))) {
+                    push(@{ $menu[0]->{items} }, $inlineremote[$item]);
+                }
+                if (@{$menu[0]->{items}} > 0) {
+                    $output .= &Apache::lonhtmlcommon::generate_menu(@menu);
+                }
             }
-         }
-         $output.="</td>";
+        }
+        $output.="</div>";
     }
-    $output.="</tr></table>";
+    $output .= '<div style="clear:both"></div>'."\n";
     return $output;
 }
 
@@ -2148,13 +2069,7 @@ sub rawconfig {
 #
     my $textualoverride=shift;
     my $output='';
-    if ($env{'environment.remote'} eq 'on') {
-       $output.=
- "window.status='Opening Remote Control';var swmenu=".&openmenu().
-"\nwindow.status='Configuring Remote Control ';";
-    } else {
-        unless ($textualoverride) { return ''; }
-    }
+    return '' unless $textualoverride;
     my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};
     my $adv=$env{'user.adv'};
@@ -2231,6 +2146,8 @@ sub rawconfig {
                 } else {
                     next;
                 }
+            } elsif ($priv eq 'cca') {
+                next if ($rol eq 'cm');
             }
             if ((($priv eq 'bre') && (&Apache::lonnet::allowed($priv,$prt) eq 'F')) ||
                 (($priv ne 'bre') && (&Apache::lonnet::allowed($priv,$prt)))) {
@@ -2312,6 +2229,24 @@ sub rawconfig {
                     }
                 }
             }
+        } elsif ($pro eq 'coauthor') {
+            if ($env{'request.role'}=~ m{^(ca|aa)\./($match_domain)/($match_username)$}) {
+                my ($role,$audom,$auname) = ($1,$2,$3);
+                if ((($prt eq 'raa') && ($role eq 'aa')) ||
+                    (($prt eq 'rca') && ($role eq 'ca') &&
+                     (!$env{"environment.internal.manager./$audom/$auname"}))) {
+                    $output.=&switch($auname,$audom,
+                                     $row,$col,$img,$top,$bot,$act,$desc,$cat);
+                }
+            }
+        } elsif ($pro eq 'coauthorenv_manager') {
+            if ($env{'request.role'}=~ m{^ca\./($match_domain)/($match_username)$}) {
+                my ($audom,$auname) = ($1,$2);
+                if ($env{"environment.internal.manager./$audom/$auname"}) {
+                    $output.=&switch($auname,$audom,
+                                     $row,$col,$img,$top,$bot,$act,$desc,$cat);
+                }
+            }
         } elsif ($pro eq 'tools') {
             my @tools = ('aboutme','blog','portfolio');
             if (grep(/^\Q$prt\E$/,@tools)) {
@@ -2339,18 +2274,12 @@ sub rawconfig {
           $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
         }
     }
-    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;
 }
 
 sub check_for_rcrs {
     my $showreqcrs = 0;
-    my @reqtypes = ('official','unofficial','community','textbook');
+    my @reqtypes = ('official','unofficial','community','textbook','placement');
     foreach my $type (@reqtypes) {
         if (&Apache::lonnet::usertools_access($env{'user.name'},
                                               $env{'user.domain'},
@@ -2362,36 +2291,23 @@ sub check_for_rcrs {
     if (!$showreqcrs) {
         foreach my $type (@reqtypes) {
             if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
-                $showreqcrs = 1;
-                last;
+                my @domains = split(',',$env{'environment.reqcrsotherdom.'.$type});
+                foreach my $entry (@domains) {
+                    my ($extdom,$extopt) = split(':',$entry);
+                    if (&Apache::lonnet::will_trust('reqcrs',$env{'user.domain'},$extdom)) {
+                        $showreqcrs = 1;
+                        last;
+                    }
+                }
+                if ($showreqcrs) {
+                    last;
+                }
             }
         }
     }
     return $showreqcrs;
 }
 
-# ======================================================================= Close
-
-sub close {
-    unless ($env{'environment.remote'} eq 'on') { return ''; }
-    my $menuname = &get_menu_name();
-    return(<<ENDCLOSE);
-<script type="text/javascript">
-// <![CDATA[
-window.status='Accessing Remote Control';
-menu=window.open("/adm/rat/empty.html","$menuname",
-                 "height=350,width=150,scrollbars=no,menubar=no");
-window.status='Disabling Remote Control';
-menu.active=0;
-menu.autologout=0;
-window.status='Closing Remote Control';
-menu.close();
-window.status='Done.';
-// ]]>
-</script>
-ENDCLOSE
-}
-
 sub dc_popup_js {
     my %lt = &Apache::lonlocal::texthash(
                                           more => '(More ...)',
@@ -2439,12 +2355,12 @@ END
 }
 
 # This creates a "done button" for timed events.  The confirmation box is a jQuery
-# dialog widget. If the interval parameter requires a proctor key for the timed
-# event to be marked done, there will also be a textbox where that can be entered.
-# Clicking OK will set the value of LC_interval_done to 'true', and, if needed will
-# set the value of LC_interval_done_proctorpass to the text entered in that box,
+# dialog widget. If the interval parameter requires a proctor key for the timed 
+# event to be marked done, there will also be a textbox where that can be entered. 
+# Clicking OK will set the value of LC_interval_done to 'true', and, if needed will 
+# set the value of LC_interval_done_proctorpass to the text entered in that box, 
 # and submit the corresponding form.
-#
+# 
 # The &zero_time() routine in lonhomework.pm is called when a page is rendered if
 # LC_interval_done is true.
 #
@@ -2455,17 +2371,17 @@ sub done_button_js {
                  title    => 'WARNING!',
                  preamble => 'You are trying to end this timed event early.',
                  map      => 'Confirming that you are done will cause the time to expire and prevent you from changing any answers in the current folder.',
-                 resource => 'Confirming that you are done will cause the time to expire for this question, and prevent you from changing your answer(s).',
+                 resource => 'Confirming that you are done will cause the time to expire for this question, and prevent you from changing your answer(s).', 
                  okdone   => 'Click "OK" if you are completely finished.',
                  cancel   => 'Click "Cancel" to continue working.',
                  proctor  => 'Ask a proctor to enter the key, then click "OK" if you are completely finished.',
                  ok       => 'OK',
                  exit     => 'Cancel',
                  key      => 'Key:',
-                 nokey    => 'A proctor key is required',
+                 nokey    => 'A proctor key is required', 
     );
     my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($env{'request.symb'}));
-    my $navmap = Apache::lonnavmaps::navmap->new();
+    my $navmap = Apache::lonnavmaps::navmap->new(); 
     my ($missing,$tried) = (0,0);
     if (ref($navmap)) {
         my @resources=();
@@ -2514,7 +2430,7 @@ sub done_button_js {
         if ($height !~ /^\d+$/) {
             $height = 400;
             if ($missing) {
-                $height += 60;
+                $height += 60; 
             }
         }
         if ($width !~ /^\d+$/) {
@@ -2558,8 +2474,8 @@ sub done_button_js {
                     click: function() {
                         var proctorkey = \$( '[name="LC_interval_done_proctorkey"]' )[0].value;
                         if ((proctorkey == '') || (proctorkey == null)) {
-                            alert("$lt{'nokey'}");
-                        } else {
+                            alert("$lt{'nokey'}"); 
+                        } else { 
                             \$( '[name="LC_interval_done"]' )[0].value = 'true';
                             \$( '[name="LC_interval_done_proctorpass"]' )[0].value = proctorkey;
                             \$( '[name="LCdoneButton"]' )[0].submit();
@@ -2652,6 +2568,126 @@ END
     }
 }
 
+sub view_as_js {
+    my ($url,$symb) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                ente => 'Enter a username or a student/employee ID',
+                info => 'Information you entered does not match a valid course user',
+    );
+    &js_escape(\%lt);
+    return <<"END";
+
+function toggleViewAsUser(change) {
+    if (document.getElementById('LC_selectuser')) {
+        var seluserid = document.getElementById('LC_selectuser');
+        var currstyle = seluserid.style.display;
+        if (change == 'off') {
+            document.userview.elements['LC_viewas'].value = '';
+            document.userview.elements['vuname'].value = '';
+            document.userview.elements['vid'].value = '';
+            document.userview.submit();
+            return;
+        }
+        if ((document.getElementById('usexpand')) && (document.getElementById('uscollapse'))) {
+            if (currstyle == 'inline') {
+                seluserid.style.display = 'none';
+                document.getElementById('usexpand').style.display= 'inline';
+                document.getElementById('uscollapse').style.display = 'none';
+            } else {
+                seluserid.style.display = 'inline';
+                toggleIdentifier(document.userview);
+                document.getElementById('usexpand').style.display = 'none';
+                document.getElementById('uscollapse').style.display = 'inline';
+            }
+        }
+    }
+    return;
+}
+
+function validCourseUser(form,change) {
+    var possuname = form.elements['vuname'].value;
+    var possuid = form.elements['vid'].value;
+    var domelem = form.elements['vudom'];
+    var possudom = '';
+    if ((domelem.tagName === 'INPUT') && ((domelem.type === 'text') || (domelem.type === 'hidden'))) {
+        possudom = domelem.value;
+    } else if (domelem.tagName === 'SELECT') {
+        possudom = domelem.options[domelem.selectedIndex].value;
+    }
+    if ((possuname == '') && (possuid == '')) {
+        if (change == 'off') {
+            form.elements['LC_viewas'].value = '';
+            form.submit();
+        } else {
+            alert("$lt{'ente'}");
+        }
+        return;
+    }
+    var http = new XMLHttpRequest();
+    var url = "/adm/courseuser";
+    var params = "uname="+possuname+"&uid="+possuid+"&udom="+possudom;
+    http.open("POST", url, true);
+    http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+    http.onreadystatechange = function() {
+        if (http.readyState == 4 && http.status == 200) {
+            var data = JSON.parse(http.responseText);
+            if (Array.isArray(data.match)) {
+               var len = data.match.length;
+               if (len == 2) {
+                   if (data.match[0] != '' && data.match[1] != '') {
+                       form.elements['LC_viewas'].value = data.match[0]+':'+data.match[1];
+                       form.submit(); 
+                   }
+               } else {
+                   alert("$lt{'info'}");
+               }
+            }
+        }
+        return;
+    }
+    http.send(params);
+    return false;
+}
+
+function toggleIdentifier(form) {
+    if ((document.getElementById('LC_vuname')) && (document.getElementById('LC_vid'))) {
+        var identifylabel = document.getElementById('LC_vuidentifier');
+        var identifier;
+        var userbyuname;
+        var radioelem = form.elements['vuidentifier'];
+        if (radioelem.length > 0) {
+            var i;
+            for (i=0; i<radioelem.length; i++) {
+                if (radioelem[i].checked == true) {
+                    if (radioelem[i].value == 'uname') {
+                        userbyuname = 1;
+                        document.getElementById('LC_vuname').type = 'text';
+                        document.getElementById('LC_vid').type = 'hidden';
+                        document.getElementById('LC_vid').value = '';
+                    } else {
+                        userbyuname = 0;
+                        document.getElementById('LC_vuname').type = 'hidden';
+                        document.getElementById('LC_vuname').value = '';
+                        document.getElementById('LC_vid').type = 'text';
+                    }
+                    break;
+                }
+            }
+            if (identifylabel) {
+                if (userbyuname) {
+                    identifylabel.setAttribute("for","LC_vuname");
+                } else {
+                    identifylabel.setAttribute("for","LC_vid");
+                }
+            }
+        }
+    }
+    return;
+}
+
+END
+}
+
 sub utilityfunctions {
     my ($httphost) = @_;
     my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
@@ -2666,7 +2702,7 @@ sub utilityfunctions {
         }
     }
     $currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));
-    
+
     my $dc_popup_cid;
     if ($env{'user.adv'} && exists($env{'user.role.dc./'.
                         $env{'course.'.$env{'request.course.id'}.
@@ -2689,9 +2725,29 @@ sub utilityfunctions {
 
     my $esc_url=&escape($currenturl);
     my $esc_symb=&escape($currentsymb);
+    my $newname = &mt('New Name');
+    &js_escape(\$newname);
 
     my $countdown = &countdown_toggle_js();
 
+    my $viewuser;
+    if (($env{'request.course.id'}) &&
+        ($env{'request.symb'} ne '') &&
+        ($env{'request.filename'}=~/$LONCAPA::assess_re/)) {
+        my $canview;
+        foreach my $priv ('mgr','vgr') {
+            $canview = &Apache::lonnet::allowed($priv,$env{'request.course.id'});
+            if (!$canview && $env{'request.course.sec'} ne '') {
+                $canview =
+                    &Apache::lonnet::allowed($priv,"$env{'request.course.id'}/$env{'request.course.sec'}");
+            }
+            last if ($canview);
+        }
+        if ($canview) {
+            $viewuser = &view_as_js($esc_url,$esc_symb);
+        }
+    }
+
     my ($ltitarget,$deeplinktarget);
     if ($env{'request.lti.login'}) {
         $ltitarget = $env{'request.lti.target'};
@@ -2718,7 +2774,7 @@ function setLCHost() {
                     '        }'."\n".
                     '    }'."\n";
     }
-
+    
     $hostvar .= '    return lcHostname;'."\n".
 '}'."\n";
 
@@ -2762,6 +2818,22 @@ function gocstr(url,filename) {
         this.document.cstrdelete.submit();
         return;
     }
+    if ((url == '/adm/cfile?action=copy') || (url == '/adm/cfile?action=rename')) {
+        this.document.cstrcopy.filename.value = filename;
+        var oldname = filename.substring(filename.lastIndexOf("/") + 1);
+        var newname=prompt('$newname',oldname);
+        if (newname == "" || !newname || newname == oldname)  {
+            return;
+        }
+        if (url == '/adm/cfile?action=rename') {
+            this.document.cstrcopy.action.value = 'rename';
+        } else {
+            this.document.cstrcopy.action.value = 'copy';
+        }
+        this.document.cstrcopy.newfilename.value = newname;
+        this.document.cstrcopy.submit();
+        return;
+    }
     if (url == '/adm/printout') {
         this.document.cstrprint.postdata.value = filename
         this.document.cstrprint.curseed.value = 0;
@@ -2788,6 +2860,10 @@ function gocstr(url,filename) {
         this.document.cstrprint.submit();
         return;
     }
+    if (url == '/adm/preferences?action=authorsettings') {
+        document.location.href=url+'&returnurl='+filename;
+        return;
+    }
     if (url !='') {
         this.document.constspace.filename.value = filename;
         this.document.constspace.action = url;
@@ -2875,6 +2951,7 @@ function open_aboutLC() {
     return;
 }
 
+
 (function (\$) {
   \$(document).ready(function () {
     \$.single=function(a){return function(b){a[0]=b;return a}}(\$([1]));
@@ -2891,22 +2968,27 @@ function open_aboutLC() {
 
 $countdown
 
+$viewuser
+
 ENDUTILITY
 }
 
 sub serverform {
     my $target;
+    unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
+        $target = ' target="_top"';
+    }
     if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
         $target = ' target="_self"';
-    } else {
-        $target = ' target="_top"';
     }
+    my $submit = &mt('Submit');
     return(<<ENDSERVERFORM);
-<form name="server" action="/adm/logout" method="post"$target>
+<form name="server" action="/adm/logout" method="post"$target aria-hidden="true">
 <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />
 <input type="hidden" name="url" value="none" />
 <input type="hidden" name="symb" value="none" />
+<input type="submit" value="$submit" class="LC_visually_hidden" tabindex="-1" disabled="disabled" />
 </form>
 ENDSERVERFORM
 }
@@ -2918,7 +3000,7 @@ sub constspaceform {
         $target = ' target="_parent"';
         $printtarget = ' target="_parent"';
     } else {
-        unless ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) || 
+        unless ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
                 (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
             $target = ' target="_top"';
             $printtarget = ' target="_top"';
@@ -2937,20 +3019,15 @@ sub constspaceform {
 <input type="hidden" name="curseed" value="" />
 <input type="hidden" name="problemtype" value="" />
 </form>
+<form name="cstrcopy" action="/adm/cfile" method="post"$target>
+<input type="hidden" name="action" value="copy" />
+<input type="hidden" name="filename" value="" />
+<input type="hidden" name="newfilename" value="" />
+</form>
 
 ENDCONSTSPACEFORM
 }
 
-sub get_nav_status {
-    my $navstatus="swmenu.w_loncapanav_flag=";
-    if ($env{'environment.remotenavmap'} eq 'on') {
-        $navstatus.="1";
-    } else {
-        $navstatus.="-1";
-    }
-    return $navstatus;
-}
-
 sub hidden_button_check {
     if ( $env{'request.course.id'} eq ''
          || $env{'request.role.adv'} ) {
@@ -2997,7 +3074,7 @@ sub roles_selector {
         if (exists($reqprivs->{$destination})) {
             if ($reqprivs->{$destination} =~ /,/) {
                 @{$privref} = split(/,/,$reqprivs->{$destination});
-            } else {
+            } else { 
                 $privref = [$reqprivs->{$destination}];
             }
         }
@@ -3076,17 +3153,18 @@ sub roles_selector {
         $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,
                             \%roledesc,$privref,$menucoll,$menuref);
         $form = 
-            '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles"'.$targetattr.'>'."\n".
+            '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles"'.$targetattr.' aria-hidden="true">'."\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 .= '  <input type="hidden" name="destsymb" value="'.
+                        &HTML::Entities::encode($destsymb).'" />'."\n";
         }
-        $form .= '</form>'."\n";
+        $form .= '<input type="submit" value="'.&mt('Submit').'" class="LC_visually_hidden" tabindex="-1" disabled="disabled" />'."\n".
+                 '</form>'."\n";
         foreach my $role (@roles_order) {
             my $include;
             if (defined($courseroles{$role})) {
@@ -3118,7 +3196,7 @@ sub roles_selector {
                         $include = 1;
                     }
                 } else {
-                    $include = 1;
+                    $include = 1; 
                 }
                 if ($include) {
                     my $rolename;
@@ -3205,7 +3283,7 @@ sub get_all_courseroles {
         push(@{$courseroles->{'st'}},keys(%sections_count));
         $seccount->{'st'} = scalar(keys(%sections_count));
     }
-    $seccount->{'st'} ++; # Increment for a section-less student role.
+    $seccount->{'st'} ++; # Increment for a section-less student role.  
     my $rolehash = {
                      'roles'    => $courseroles,
                      'seccount' => $seccount,
@@ -3262,7 +3340,7 @@ sub get_customadhoc_roles {
                 foreach my $role (keys(%{$domdefaults{'adhocroles'}})) {
                     next if (($role eq '') || ($role =~ /\W/));
                     $seccount->{"$prefix/$role"} = $numsec;
-                    $roledesc->{"$prefix/$role"} = $description->{$role};  
+                    $roledesc->{"$prefix/$role"} = $description->{$role};
                     if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0)) {
                         if (exists($env{"user.priv.$prefix/$role./$cdom/$cnum./"})) {
                             $courseprivs->{"$prefix/$role./$cdom/$cnum./"} =
@@ -3443,7 +3521,6 @@ function adhocRole(newrole) {
             fullrole += '/'+secchoice;
         }
     } else {
-        document.rolechooser.elements[roleitem].selectedIndex = 0;
         if (secchoice != null) {
             alert("$lt{'youe'} \\""+secchoice+"\\".\\n $lt{'plst'}");
         }
@@ -3569,13 +3646,14 @@ sub countdown_timer {
                 $title = $alttxt.'&nbsp;';
             }
             my $desc = &mt('Countdown to due date/time');
+
             return <<END;
 $donebutton
 <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>
+<span id="duedatecountdown" class="LC_menubuttons_inline_text" style="display: $currdisp;" role="timer"></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>
@@ -3585,6 +3663,13 @@ END
     return;
 }
 
+sub placement_progress {
+    my ($totalpoints,$incomplete) = &Apache::lonplacementtest::check_completion(undef,undef,1);
+    my $complete = 100 - $incomplete;
+    return '<span class="LC_placement_prog">'.
+           &mt('Test is [_1]% complete',$complete).'</span>';
+}
+
 sub linkprot_exit {
     if (($env{'request.course.id'}) && ($env{'request.deeplink.login'})) {
         my ($deeplink_symb,$deeplink);
@@ -3613,11 +3698,11 @@ sub linkprot_exit {
                     );
                     if ($exit) {
                         my ($show,$text) = split(/:/,$exit);
-                        unless ($show eq 'no') {
+                        unless ($show eq 'no') { 
                             my $height = 250;
                             my $width = 300;
                             my $exitbuttontext;
-                            if ($text eq '') {
+                            if ($text eq '') { 
                                 $exitbuttontext = &mt('Exit Tool');
                             } else {
                                 $exitbuttontext = $text;