--- loncom/interface/lonmenu.pm	2016/05/13 22:48:05	1.448
+++ loncom/interface/lonmenu.pm	2016/06/19 04:27:50	1.451
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.448 2016/05/13 22:48:05 raeburn Exp $
+# $Id: lonmenu.pm,v 1.451 2016/06/19 04:27:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -812,7 +812,11 @@ 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|[^/]+$||;
@@ -1650,10 +1654,8 @@ sub done_button_js {
                  nokey    => 'A proctor key is required', 
     );
     my $navmap = Apache::lonnavmaps::navmap->new(); 
-    my ($missing,$tried);
+    my ($missing,$tried) = (0,0);
     if (ref($navmap)) {
-        $missing=0;
-        $tried=0;
         my @resources=();
         if ($type eq 'map') {
             my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($env{'request.symb'});
@@ -1667,13 +1669,7 @@ sub done_button_js {
             }
         }
         foreach my $res (@resources) {
-            if ($res->singlepart()) {
-                if (!$res->tries()) {
-                    $missing++;
-                } else {
-                    $tried++;
-                }
-            } else {
+            if (ref($res->parts()) eq 'ARRAY') {
                 foreach my $part (@{$res->parts()}) {
                     if (!$res->tries($part)) {
                         $missing++;
@@ -1697,6 +1693,7 @@ sub done_button_js {
             $lt{'miss'} .= ' '.&mt('If you confirm you are done you will be unable to submit an answer for it.').'</p>';
         }
     }
+    $donebuttontext = &HTML::Entities::encode($donebuttontext,'<>&"');
     if ($proctor) {
         if ($height !~ /^\d+$/) {
             $height = 400;
@@ -1721,7 +1718,7 @@ sub done_button_js {
   <p>$lt{'preamble'} $lt{$type}</p>
   $lt{'miss'}
   <p>$lt{'proctor'}</p>
-  <form>
+  <form name="LCdoneButtonProctor" action="">
     <label>$lt{'key'}<input type="password" name="LC_interval_done_proctorkey" value="" /></label>
     <input type="submit" tabindex="-1" style="position:absolute; top:-1000px" />
   </form>
@@ -1795,7 +1792,7 @@ END
 
 <form method="post" name="LCdoneButton" action="">
     <input type="hidden" name="LC_interval_done" value="" />
-    <button id="LC_done-confirm-opener" type="button">$lt{'button'}</button>
+    <button id="LC_done-confirm-opener" type="button">$donebuttontext</button>
 </form>
 
 <div id="LC_done-confirm" title="$lt{'title'}">