--- loncom/interface/lonmenu.pm	2022/05/29 21:49:06	1.369.2.83.2.2
+++ loncom/interface/lonmenu.pm	2022/06/11 04:30:48	1.523
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.83.2.2 2022/05/29 21:49:06 raeburn Exp $
+# $Id: lonmenu.pm,v 1.523 2022/06/11 04:30:48 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()
@@ -231,6 +210,7 @@ use Apache::lonenc();
 use Apache::lonlocal;
 use Apache::lonmsg();
 use LONCAPA qw(:DEFAULT :match);
+use LONCAPA::ltiutils;
 use HTML::Entities();
 use Apache::lonwishlist();
 
@@ -267,7 +247,7 @@ sub prep_menuitem {
 # entries from mydesk.tab
 sub primary_menu {
     my ($crstype,$ltimenu,$menucoll,$menuref,$links_disabled,$links_target) = @_;
-    my (%menu,%menuopts);
+    my (%menu,%ltiexc,%menuopts);
     # each element of @primary contains following array:
     # (link url, icon path, alt text, link text, condition, position)
     my $public;
@@ -275,6 +255,26 @@ 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;
+        if (ref($ltimenu) eq 'HASH') {
+            foreach my $item ('fullname','logout') {
+                unless ($ltimenu->{$item}) {
+                    $ltiexc{$item} = 1;
+                }
+            }
+        }
+    }
     my ($listclass,$linkattr,$target);
     if ($links_disabled) {
         $listclass = 'LCisDisabled';
@@ -282,12 +282,15 @@ sub primary_menu {
     }
     if ($links_target ne '') {
         $target = $links_target;
-    } else {    
-        my $deeplinktarget;
+    } else {
+        my ($ltitarget,$deeplinktarget);
+        if ($env{'request.lti.login'}) {
+             $ltitarget = $env{'request.lti.target'};
+        }
         if ($env{'request.deeplink.login'}) {
             $deeplinktarget = $env{'request.deeplink.target'};
         }
-        if ($deeplinktarget eq '_self') {
+        if (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) {
             $target = '_self';
         } else {
             $target = '_top';
@@ -310,11 +313,23 @@ 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 
-        next if    $$menuitem[4]        eq 'courses'   ##'Roles' wanted
-                && !&Apache::loncommon::show_course(); ##
-        
+                && (&Apache::loncommon::show_course()  ##term 'Courses' or
+                || $lti);                              ##'Roles' wanted
+        next if    $$menuitem[4]        eq 'courses'   ##and not LTI access
+                && (!&Apache::loncommon::show_course()
+                || $lti);
+        next if    $$menuitem[4]        eq 'notlti'
+                && $lti;
+        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';
@@ -322,7 +337,7 @@ sub primary_menu {
         if ($env{'request.course.id'} && $menucoll) {
             if (($menuitem->[6]) && (!$menuopts{$menuitem->[6]})) {
                 if ($menuitem->[6] eq 'pers') {
-                    if ($menuopts{'name'} &&
+                    if ($menuopts{'name'} && !$ltiexc{'fullname'} &&
                         $env{'user.name'} && $env{'user.domain'}) {
                         $menu{$position} .= '<li><a href="#">'.
                             &Apache::loncommon::plainname($env{'user.name'},
@@ -346,9 +361,10 @@ 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 ($env{'request.course.id'} && $menucoll) {
@@ -357,7 +373,7 @@ sub primary_menu {
                     push(@primsub,$item);
                 }
                 if ($title eq 'Personal') {
-                    if ($env{'user.name'} && $env{'user.domain'}) {
+                    if ($env{'user.name'} && $env{'user.domain'} && !$ltiexc{'fullname'}) {
                         unless (($env{'request.course.id'}) && ($menucoll) && (!$menuopts{'name'})) {
                             $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
                         }
@@ -378,6 +394,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();
@@ -448,28 +465,29 @@ 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 ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools,%menuopts);
-    $grouptools = 0; 
+    my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools,
+        $lti,$ltimapres,%ltiexc,%menuopts);
+    $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'}) ||
@@ -498,6 +516,19 @@ sub secondary_menu {
                 }
             }
         }
+        if ($env{'request.lti.login'}) {
+            $lti = 1;
+            if (ref($ltimenu) eq 'HASH') {
+                foreach my $item ('fullname','coursetitle','role','logout','grades') {
+                    unless ($ltimenu->{$item}) {
+                        $ltiexc{$item} = 1;
+                    }
+                }
+            }
+            if (($ltiscope eq 'map') || ($ltiscope eq 'resource')) {
+                $ltimapres = 1;
+            }
+        }
     }
     if (($menucoll) && (ref($menuref) eq 'HASH')) {
         %menuopts = %{$menuref};
@@ -509,7 +540,7 @@ sub secondary_menu {
         $linkattr = 'aria-disabled="true"';
     }
 
-    my ($canmodifycoauthor);
+    my ($canmodifycoauthor); 
     if ($env{'request.role'} eq "au./$env{'user.domain'}/") {
         my $extent = "$env{'user.domain'}/$env{'user.name'}";
         if ((&Apache::lonnet::allowed('cca',$extent)) ||
@@ -522,11 +553,14 @@ sub secondary_menu {
     if ($links_target ne '') {
         $target = $links_target;
     } else {
-        my $deeplinktarget
+        my ($ltitarget,$deeplinktarget);
+        if ($env{'request.lti.login'}) {
+            $ltitarget = $env{'request.lti.target'};
+        }
         if ($env{'request.deeplink.login'}) {
             $deeplinktarget = $env{'request.deeplink.target'};
         }
-        if ($deeplinktarget eq '_self') {
+        if (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) {
             $target = '_self';
         } else {
             $target = '_top';
@@ -536,17 +570,14 @@ sub secondary_menu {
     foreach my $menuitem (@secondary_menu) {
         # evaluate conditions 
         next if    ref($menuitem)  ne 'ARRAY';
+        next if (($crstype eq 'Placement') && ($$menuitem[3] ne 'Roles') && (!$env{'request.role.adv'}));
         next if    $$menuitem[4]   ne 'always'
-                && ($$menuitem[4]  ne 'author' && $$menuitem[4] ne 'cca')
+                && ($$menuitem[4]   ne 'author' && $$menuitem[4] ne 'cca')
                 && !$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');
         next if    $$menuitem[4]  eq 'nvgr'
-                && $canvgr;
+                && ($canvgr || $ltiexc{'grades'});
         next if    $$menuitem[4]  eq 'vgr'
                 && !$canvgr;
         next if    $$menuitem[4]   eq 'viewusers'
@@ -561,7 +592,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;
@@ -573,12 +604,18 @@ sub secondary_menu {
                 && !$author;
         next if    $$menuitem[4]    eq 'cca'
                 && !$canmodifycoauthor;
+        next if    $$menuitem[4]    eq 'notltimapres'
+                && $ltimapres;
+        next if    $$menuitem[4]    eq 'notlti'
+                && $lti;
+        next if    $$menuitem[4]    eq 'lti'
+                && (!$lti || !$noprimary);
+        next if    $$menuitem[3]    eq 'Logout'
+                && $ltiexc{'logout'};
 
         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]}));
             }
         }
@@ -603,7 +640,19 @@ sub secondary_menu {
                         next if ($item->[2] eq 'params' && !$canmodpara && !$canviewpara);
                         next if ($item->[2] eq 'author' && !$author);
                         next if ($item->[2] eq 'cca' && !$canmodifycoauthor);
-                        push(@scndsub,$item); 
+                        next if ($item->[2] eq 'lti' && !$lti);
+                        if ($item->[2] =~ /^lti(portfolio|wishlist|blog)$/) {
+                            my $tool = $1;
+                            next if !$lti;
+                            next if (!&Apache::lonnet::usertools_access('','',$tool,
+                                                                        undef,'tools'));
+                        }
+                        push(@scndsub,$item);
+                    }
+                }
+                if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'}) {
+                    unless ($ltiexc{'fullname'}) {
+                        $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
                     }
                 }
                 if (@scndsub > 0) {
@@ -620,14 +669,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];
@@ -677,7 +729,7 @@ sub secondary_menu {
     $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;
     }
@@ -716,7 +768,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 '';
     }
@@ -749,11 +801,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)$/) {
@@ -779,6 +831,7 @@ sub build_submenu {
                 unless (($href eq '') || ($href =~ /^\#/)) {
                     if ($target ne '') {
                         $targetattr = ' target="'.$target.'"';
+                    }
                 }
 
                 $menu .= '<li ';
@@ -792,36 +845,8 @@ 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) = @_;
+    my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname,$ltiscope,$ltiuri) = @_;
     my $const_space = ($env{'request.state'} eq 'construct');
     my $is_const_dir = 0;
 
@@ -829,24 +854,13 @@ sub innerregister {
 
     $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'}) {
@@ -860,33 +874,39 @@ 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 '') &&
-                ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'})) {
-                $navmap = Apache::lonnavmaps::navmap->new();
-                if (ref($navmap)) {
-                    @mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle);
+                (!(($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))) {
+                        $navmap = Apache::lonnavmaps::navmap->new();
+                        if (ref($navmap)) {
+                            @mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle);
+                        }
+                    }
                 }
             }
-            unless (($forcereg) && 
-                    ($env{'request.noversionuri'} eq '/adm/navmaps') &&
-                    ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
+            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);
-                } else {
+                } 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') ||
-                    ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
-                push @crumbs, {text => $maptitle, no_mt => 1,
+            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, 
                                href => &Apache::lonnet::clutter($mapurl).'?navmap=1'};
             }
             if ($restitle && !@mapcrumbs) {
@@ -924,7 +944,7 @@ sub innerregister {
                     {text  => "Supplemental $crstype Content",
                      href  => "javascript:gopost('/adm/supplemental','')"});
                     $title = &mt('View Resource');
-                    ($trail) =
+                    ($trail) = 
                         &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
                 }
                 return $trail;
@@ -950,99 +970,90 @@ 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;
-            if ($env{'request.symb'} ne '') {
-                if ($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')",
+                        'Content Grades');
+            } elsif ($perms{'vgr'}) {
+                &switch('','',7,2,'subm.png','Content Submissions','missions[_1]',
+                        "gocmd('/adm/grades','submission')",
+                        'Content Submissions');
+             }
+        }
+        if (($env{'request.symb'} ne '') && (($perms{'opa'}) || ($perms{'vpa'}))) {
+            &switch('','',7,3,'pparm.png','Content Settings','parms[_2]',
+                    "gocmd('/adm/parmset','set')",
+                    'Content Settings');
+	}
 # End grades/submissions check
 
 #
 # This applies to items inside a folder/page modifiable in the course.
 #
-            if (($env{'request.symb'}=~/^uploaded/) && (($perms{'mdc'}) || ($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');
-            }
-# End modifiable folder/page container check
+        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
+    }
 # End course context
 
 # Prepare the rest of the buttons
-        my ($menuitems,$got_prt,$got_wishlist,$cstritems);
+        my ($menuitems,$got_prt,$got_wishlist);
         if ($const_space) {
 #
 # We are in construction space
@@ -1055,12 +1066,23 @@ sub innerregister {
             if ($currdir =~ m-/$-) {
                 $is_const_dir = 1;
                 if ($thisdisfn eq '') {
-                    $is_const_dir = 2;
+                    unless (($env{'request.course.id'}) && 
+                            ($env{'course.'.$env{'request.course.id'}.'.num'} eq $uname) &&
+                            ($env{'course.'.$env{'request.course.id'}.'.domain'} eq $udom)) { 
+                        $is_const_dir = 2;
+                    }
                 }
             } 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
 #
@@ -1068,45 +1090,102 @@ sub innerregister {
 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
-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);
                 }
+                $menuitems .= (<<ENDMENUITEMS);
+s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document
+ENDMENUITEMS
             }
-            if (ref($bread_crumbs) eq 'ARRAY') {
-                &Apache::lonhtmlcommon::clear_breadcrumbs();
-                foreach my $crumb (@{$bread_crumbs}){
-                     &Apache::lonhtmlcommon::add_breadcrumb($crumb);
+                if (ref($bread_crumbs) eq 'ARRAY') {
+                    &Apache::lonhtmlcommon::clear_breadcrumbs();
+                    foreach my $crumb (@{$bread_crumbs}){
+                        &Apache::lonhtmlcommon::add_breadcrumb($crumb);
+                    }
                 }
-            }
         } elsif ( defined($env{'request.course.id'}) && 
 		 $env{'request.symb'} ne '' ) {
 #
 # We are in a course and looking at a registered URL
 # Should probably be in mydesk.tab
 #
+            $menuitems = "c&3&1";
+            if ($ltiscope eq 'resource') {
+# Suppress display of backward arrow for LTI Provider if scope is resource.
+# Suppress display of forward arrow for LTI Provider if scope is resource.
+            } elsif ($ltiscope eq 'map') {
+# Suppress display of backward arrow for LTI Provider if scope is map and this is first resource.
+# Suppress display of forward arrow for LTI Provider if scope is map and this is the last resource.
+                my $showforw = 1;
+                my $showback = 1;
+                my $navmap = Apache::lonnavmaps::navmap->new();
+                if (ref($navmap)) {
+                    my $mapres = $navmap->getResourceByUrl($ltiuri);
+                    if (ref($mapres)) {
+                        if ($navmap->isLastResource($mapres,$env{'request.symb'})) {
+                            $showforw = 0;
+                        }
+                        if ($navmap->isFirstResource($mapres,$env{'request.symb'})) {
+                            $showback = 0;
+                        }
+                    }
+                }
+                if ($showback) {
+                    $menuitems.="
+s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1";
+                }
+                if ($showforw) {
+                    $menuitems.="
+s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3";
+                }
+            } 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&3&1
-s&2&1&back.png&$swtext{'back'}&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
-s&2&3&forw.png&$swtext{'forw'}&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3
 c&6&3
 c&8&1
 c&8&2
-s&8&3&prt.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 ($cnum,$cdom) = &Apache::loncommon::crsauthor_url($env{'request.uri'});
+                unless ($cnum) {
+                    # 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();
@@ -1118,7 +1197,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'}) {
@@ -1130,19 +1209,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
                 }
 	    }
@@ -1150,7 +1229,7 @@ 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;
             }
@@ -1158,21 +1237,11 @@ ENDMENUITEMS
                 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)) {
@@ -1192,374 +1261,74 @@ ENDMENUITEMS
                 }
             }
         }
-        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 $showprogress;
+        if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) {
+            $showprogress = &placement_progress();
+        }
+
+	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();
 
-                &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                    'navigation', @inlineremote[21,23]);
+            &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                'navigation', @inlineremote[21,23]);
 
-                if ($buttonshide eq 'yes') {
-                    if ($countdown) {
-                        &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);
-                    }
-                } else {
-                    my @tools = @inlineremote[93,91,81,82,83];
-                    if ($countdown) {
-                        unshift(@tools,$countdown);
-                    }
-                    &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                        'tools',@tools);
-
-                    #publish button in construction space
-                    if ($env{'request.state'} eq 'construct'){
-                        &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                            'advtools', $inlineremote[63]);
-                    } else {
-                        &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                            'tools', $inlineremote[63]);
-                    }
-                    &advtools_crumbs(@inlineremote);
-                }
+        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 ($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>
+            my @tools = @inlineremote[93,91,81,82,83];
+            if ($countdown) {
+                unshift(@tools,$countdown);
+            }
+            &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                'tools',@tools);
 
-$cstrcrumbs
-ENDREGTHIS
+            #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 {
-       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() {
-    }
-
-// END LON-CAPA Internal
-// ]]>
-</script>
-ENDDONOTREGTHIS
-
+        if ($showprogress) {
+            &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress);
         }
-        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.'" />');
     }
-#
-# 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>';
+    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';
+        }
+    }
+    return   &Apache::lonhtmlcommon::scripttag('', 'start')
+           . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text)
+           . &Apache::lonhtmlcommon::scripttag('', 'end');
 }
 
 sub get_editbutton {
@@ -1594,31 +1363,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);
     }
@@ -1668,8 +1421,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 {
@@ -1699,8 +1452,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'}))) {
@@ -1718,7 +1470,8 @@ sub prepare_functions {
                         &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/)) {
@@ -1761,7 +1514,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;
@@ -1778,19 +1531,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');
                 }
             }
         }
@@ -1825,7 +1578,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') {
@@ -1838,13 +1591,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');
         }
     }
 }
@@ -1855,25 +1604,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]);
+        } else {
+            &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                'advtools', @funcs[61,71,72,73,74,92]);
+        }
     } elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') {
         &Apache::lonhtmlcommon::add_breadcrumb_tool(
             'advtools', $funcs[61]);
     }
+    return;
 }
 
 # ================================================================== Raw Config
 
 sub clear {
     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
@@ -1881,7 +1631,7 @@ 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)=@_;
     $act=~s/\$uname/$uname/g;
     $act=~s/\$udom/$udom/g;
     $top=&mt($top);
@@ -1890,24 +1640,6 @@ sub switch {
     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;
@@ -1942,7 +1674,8 @@ sub switch {
         unless ($env{'request.state'} eq 'construct') {
             push(@tools,63);
         }
-        if (($env{'environment.icons'} eq 'iconsonly') &&
+        if ((($env{'environment.icons'} eq 'iconsonly') ||
+             ($env{'environment.icons'} eq '') && ($env{'request.lti.login'})) &&
             (grep(/^$idx$/,@tools))) {
             $inlineremote[$idx] =
         '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic.'</a>';
@@ -1969,13 +1702,6 @@ 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);
@@ -2018,13 +1744,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'};
@@ -2209,18 +1929,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'},
@@ -2232,36 +1946,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 ...)',
@@ -2309,12 +2010,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.
 #
@@ -2325,17 +2026,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=();
@@ -2384,7 +2085,7 @@ sub done_button_js {
         if ($height !~ /^\d+$/) {
             $height = 400;
             if ($missing) {
-                $height += 60;
+                $height += 60; 
             }
         }
         if ($width !~ /^\d+$/) {
@@ -2428,8 +2129,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();
@@ -2536,7 +2237,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'}.
@@ -2559,10 +2260,14 @@ sub utilityfunctions {
 
     my $esc_url=&escape($currenturl);
     my $esc_symb=&escape($currentsymb);
+    my $newname = &mt('New Name');
 
     my $countdown = &countdown_toggle_js();
 
-    my $deeplinktarget;
+    my ($ltitarget,$deeplinktarget);
+    if ($env{'request.lti.login'}) {
+        $ltitarget = $env{'request.lti.target'};
+    }
     if ($env{'request.deeplink.login'}) {
         $deeplinktarget = $env{'request.deeplink.target'};
     }
@@ -2585,7 +2290,7 @@ function setLCHost() {
                     '        }'."\n".
                     '    }'."\n";
     }
-
+    
     $hostvar .= '    return lcHostname;'."\n".
 '}'."\n";
 
@@ -2629,6 +2334,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;
@@ -2667,8 +2388,9 @@ function golist(url) {
        currentURL = null;
        currentSymb= null;
        var lcHostname = setLCHost();
+       var ltitarget = '$ltitarget';
        var deeplinktarget = '$deeplinktarget';
-       if (deeplinktarget == '_self') {
+       if ((ltitarget == 'iframe') || (deeplinktarget == '_self')) {
            document.location.href=lcHostname+url;
        } else {
            top.location.href=lcHostname+url;
@@ -2730,6 +2452,18 @@ function open_source() {
                          'height=500,width=600,resizable=yes,location=no,menubar=no,toolbar=no,scrollbars=yes');
 }
 
+function open_aboutLC() {
+    var isMobile = "$env{'browser.mobile'}";
+    var url = '/adm/about.html';
+    if (isMobile == 1) {
+        openMyModal(url,600,400,'yes');
+    } else {
+        window.open(url,"aboutLONCAPA","height=400,width=600,scrollbars=1,resizable=1,menubar=0,location=1");
+    }
+    return;
+}
+
+
 (function (\$) {
   \$(document).ready(function () {
     \$.single=function(a){return function(b){a[0]=b;return a}}(\$([1]));
@@ -2751,10 +2485,11 @@ 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"';
     }
     return(<<ENDSERVERFORM);
 <form name="server" action="/adm/logout" method="post"$target>
@@ -2773,7 +2508,8 @@ sub constspaceform {
         $target = ' target="_parent"';
         $printtarget = ' target="_parent"';
     } else {
-        unless (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
+        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"';
         }
@@ -2791,20 +2527,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'} ) {
@@ -2851,7 +2582,7 @@ sub roles_selector {
         if (exists($reqprivs->{$destination})) {
             if ($reqprivs->{$destination} =~ /,/) {
                 @{$privref} = split(/,/,$reqprivs->{$destination});
-            } else {
+            } else { 
                 $privref = [$reqprivs->{$destination}];
             }
         }
@@ -2937,8 +2668,8 @@ sub roles_selector {
             '  <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";
         foreach my $role (@roles_order) {
@@ -2972,7 +2703,7 @@ sub roles_selector {
                         $include = 1;
                     }
                 } else {
-                    $include = 1;
+                    $include = 1; 
                 }
                 if ($include) {
                     my $rolename;
@@ -3059,7 +2790,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,
@@ -3116,7 +2847,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./"} =
@@ -3297,7 +3028,6 @@ function adhocRole(newrole) {
             fullrole += '/'+secchoice;
         }
     } else {
-        document.rolechooser.elements[roleitem].selectedIndex = 0;
         if (secchoice != null) {
             alert("$lt{'youe'} \\""+secchoice+"\\".\\n $lt{'plst'}");
         }
@@ -3350,16 +3080,26 @@ sub required_privs {
 
 sub countdown_timer {
     if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') &&
-        ($env{'request.filename'}=~/$LONCAPA::assess_re/)) {
+        (($env{'request.filename'}=~/$LONCAPA::assess_re/) ||
+         (($env{'request.symb'} =~ /ext\.tool$/) &&
+         (&Apache::lonnet::EXT('resource.0.gradable',$env{'request.symb'}) =~ /^yes$/i)))) {
         my ($type,$hastimeleft,$slothastime);
         my $now = time;
         if ($env{'request.filename'} =~ /\.task$/) {
             $type = 'Task';
+        } elsif ($env{'request.symb'} =~ /ext\.tool$/) {
+            $type = 'tool';
         } else {
             $type = 'problem';
         }
-        my ($status,$accessmsg,$slot_name,$slot) =
-            &Apache::lonhomework::check_slot_access('0',$type);
+        my ($status,$accessmsg,$slot_name,$slot);
+        if ($type eq 'tool') {
+            ($status,$accessmsg,$slot_name,$slot) =
+                &Apache::lonhomework::check_slot_access('0',$type,$env{'request.symb'},['0']);
+        } else {
+            ($status,$accessmsg,$slot_name,$slot) =
+                &Apache::lonhomework::check_slot_access('0',$type);
+        }
         if ($slot_name ne '') {
             if (ref($slot) eq 'HASH') {
                 if (($slot->{'starttime'} < $now) &&
@@ -3413,6 +3153,7 @@ 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">
@@ -3429,6 +3170,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>';
+}
+
 # ================================================================ Main Program
 
 BEGIN {