--- loncom/interface/lonnavdisplay.pm	2021/03/04 14:00:19	1.22.4.9.4.2
+++ loncom/interface/lonnavdisplay.pm	2017/11/16 13:41:56	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Display Handler
 #
-# $Id: lonnavdisplay.pm,v 1.22.4.9.4.2 2021/03/04 14:00:19 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.35 2017/11/16 13:41:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -54,7 +54,7 @@ sub real_handler {
         return OK;
     }
 
-    # Check for critical messages and redirect if present.
+    # Check for critical messages and redirect if present.  
     my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'contents');
     if ($redirect) {
         &Apache::loncommon::content_type($r,'text/html');
@@ -87,7 +87,7 @@ sub real_handler {
         my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.
                        '<br />'.
                        &mt('Your course session is being updated because of recent changes by course personnel.').
-                       ' '.&mt('Please be patient').'.<br /></div>'.
+                       ' '.&mt('Please be patient.').'<br /></div>'.
                        '<div style="padding:0;clear:both;margin:0;border:0"></div>';
         $closure = <<ENDCLOSE;
 <script type="text/javascript">
@@ -100,7 +100,7 @@ ENDCLOSE
         &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
         $r->rflush();
         my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum",\%prog_state,$r);
-        &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished!'));
+        &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Finished'));
         if ($ferr) {
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
             $r->print($closure.&Apache::loncommon::end_page());
@@ -111,6 +111,20 @@ ENDCLOSE
         }
     }
 
+    my $course_type = &Apache::loncommon::course_type();
+    if (($course_type eq 'Placement') && (!$env{'request.role.adv'})) { 
+        my $furl = &Apache::lonpageflip::first_accessible_resource();
+        if ($result eq 'update') {
+            &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+            $r->print($closure.&Apache::loncommon::end_page());
+            return OK;
+        } else {
+            &Apache::loncommon::content_type($r,'text/html');
+            $r->header_out(Location => $furl);
+            return REDIRECT;
+        }
+    }
+
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
 
@@ -228,7 +242,7 @@ ENDCLOSE
                      ."</span>");
         }
     } else {
-        my $link = '/adm/navmaps?jumpToFirstHomework';
+        my $link = 'navmaps?jumpToFirstHomework';
         if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'}; 
         }
@@ -251,7 +265,7 @@ ENDCLOSE
         $filterFunc = sub { my $res = shift; 
                             return $res->completable() || $res->is_map();
                         };
-        my $link = '/adm/navmaps?sort='.$env{'form.sort'};
+        my $link = 'navmaps?sort='.$env{'form.sort'};
         if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};
         }
@@ -263,7 +277,7 @@ ENDCLOSE
         $env{'form.condition'} = 1;
 	$resource_no_folder_link = 1;
     } else {
-        my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
+        my $link = 'navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
         if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};
         }
@@ -368,6 +382,7 @@ sub startContentScreen {
         $r->print('<li '.(($mode eq 'supplemental')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');
     }
     $r->print('<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Search').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
+    $r->print('<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Content Index').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
     $r->print("\n".'</ul>'."\n");
     $r->print('<div class="LC_Box" style="clear:both;margin:0;"><div id="maincoursedoc" style="margin:0 0;padding:0 0;"><div class="LC_ContentBox" id="mainCourseDocuments" style="display: block;">');
 }