--- loncom/auth/lonroles.pm	2021/10/26 14:25:09	1.352
+++ loncom/auth/lonroles.pm	2021/11/15 22:36:38	1.354
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.352 2021/10/26 14:25:09 raeburn Exp $
+# $Id: lonroles.pm,v 1.354 2021/11/15 22:36:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -158,12 +158,21 @@ sub start_loading_course {
     my $brcrum = [{'href' => '',
                    'text' => $title},];
     my $start_page = &Apache::loncommon::start_page($title,undef,
-                                                    {'bread_crumbs' => $brcrum,});
+                                                    {'bread_crumbs' => $brcrum,
+                                                     'bread_crumbs_nomenu' => 1,
+                                                     'links_disabled' => 1});
     $r->print(<<ENDREDIR);
 $start_page
 <script type="text/javascript">
 // <![CDATA[
 $swinfo
+
+document.body.addEventListener('click', function (event) {
+  // filter out clicks on any other elements
+  if (event.target.nodeName == 'A' && event.target.getAttribute('aria-disabled') == 'true') {
+    event.preventDefault();
+  }
+});
 // ]]>
 </script>
 ENDREDIR
@@ -172,8 +181,7 @@ ENDREDIR
 
 sub finish_loading_course {
     my ($r,$msg,$url) = @_;
-#FIXME add continue link, and add jquery to enable menu links when page is loaded
-    my $link;
+    my $link = '<div id="LC_course_loaded" style="display:none"><a href="'.$url.'">'.&mt('Continue').'</a></div>';
     my $end_page = &Apache::loncommon::end_page();
     my $js_url = &js_escape($url);
     $r->print(<<END);
@@ -181,6 +189,9 @@ $msg
 <script type="text/javascript">
 // <![CDATA[
 \$(document).ready(function() {
+    \$("#LC_course_loaded").css("display","block");
+    \$('.isDisabled > a').removeAttr("aria-disabled");
+    \$('.isDisabled').removeClass("isDisabled");
     var url = "$js_url";
     \$(location).attr('href',url);
 });
@@ -912,6 +923,9 @@ ENDCLOSE
                                                 $dest .= (($dest =~/\?/)? '&':'?').'symb='.$esc_symb;
                                             }
                                         }
+                                        if ($env{'form.ttoken'}) {
+                                            $dest .= (($dest =~/\?/)? '&':'?').'ttoken='.$env{'form.ttoken'};
+                                        }
                                         unless ($env{'request.lti.login'}) {
                                             $msg = '<p>'.&mt('Entering [_1] ...',
                                                              $env{'course.'.$cdom.'_'.$cnum.'.description'}).