--- loncom/interface/lonnavdisplay.pm	2021/03/04 14:00:19	1.22.4.9.4.2
+++ loncom/interface/lonnavdisplay.pm	2017/06/26 01:56:58	1.34
@@ -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.34 2017/06/26 01:56:58 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');
@@ -62,15 +62,9 @@ sub real_handler {
         return REDIRECT;
     }
 
-# ------------------------------------------------------------ Get query string
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort',
-                                                                  'showOnlyHomework',
-                                                                  'postsymb','register']);
     # Check if course needs to be re-initialized
     my $loncaparev = $r->dir_config('lonVersion');
     my ($result,@reinit) = &Apache::loncommon::needs_coursereinit($loncaparev);
-    my %prog_state=();
-    my $closure;
 
     if ($result eq 'switch') {
         &Apache::loncommon::content_type($r,'text/html');
@@ -78,32 +72,10 @@ sub real_handler {
         $r->print(&Apache::loncommon::check_release_result(@reinit));
         return OK;
     } elsif ($result eq 'update') {
-        my $cid = $env{'request.course.id'};
-        my $cnum = $env{'course.'.$cid.'.num'};
-        my $cdom = $env{'course.'.$cid.'.domain'};
-        &Apache::loncommon::content_type($r,'text/html');
-        $r->send_http_header;
-        &startpage($r);
-        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>'.
-                       '<div style="padding:0;clear:both;margin:0;border:0"></div>';
-        $closure = <<ENDCLOSE;
-<script type="text/javascript">
-// <![CDATA[
-\$("#LC_update_$cid").hide('slow');
-// ]]>
-</script>
-ENDCLOSE
-        %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,undef,$preamble);
-        &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!'));
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
         if ($ferr) {
-            &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-            $r->print($closure.&Apache::loncommon::end_page());
             my $requrl = $r->uri;
             $env{'user.error.msg'}="$requrl:bre:0:0:Course not initialized";
             $env{'user.reinit'} = 1;
@@ -111,36 +83,55 @@ ENDCLOSE
         }
     }
 
+    my $course_type = &Apache::loncommon::course_type();
+    if (($course_type eq 'Placement') && (!$env{'request.role.adv'})) { 
+        my $furl = &Apache::lonpageflip::first_accessible_resource();
+        &Apache::loncommon::content_type($r,'text/html');
+        $r->header_out(Location => $furl);
+        return REDIRECT;
+    }
+
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
 
     if (!defined($navmap)) {
-        if ($result eq 'update') {
-            &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-            $r->print($closure.&Apache::loncommon::end_page());
-        }
         my $requrl = $r->uri;
         $env{'user.error.msg'} = "$requrl:bre:0:0:Course not initialized";
         $env{'user.reinit'} = 1;
         return HTTP_NOT_ACCEPTABLE;
     }
 
-    if ($result eq 'update') {
-        $r->rflush();
-        &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
-        $r->print($closure);
-        $r->rflush();
+    # Send header, don't cache this page
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+
+# ------------------------------------------------------------ Get query string
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort','showOnlyHomework','postsymb','register']);
+    
+# ----------------------------------------------------- Force menu registration
+    # Header
+    my $course_type = &Apache::loncommon::course_type();
+    my $title = $course_type . ' Contents';
+    my ($start_page,$args);
+    if ($env{'form.register'}) {
+        $args = {'force_register' => $env{'form.register'}};
+        $start_page = &Apache::loncommon::start_page($title,undef,$args);
     } else {
-        # Send header, don't cache this page
-        &Apache::loncommon::content_type($r,'text/html');
-        $r->send_http_header;
-        &startpage($r);
+        my $brcrum = [{href => '/adm/navmaps',
+                       text => &mt($course_type . ' Contents'),
+                       no_mt => 1},
+                     ];
+        $args = {'bread_crumbs' => $brcrum};
+        $start_page = &Apache::loncommon::start_page($title,undef,$args);
     }
-
+    $r->print($start_page.
+              '<script type="text/javascript">'."\n".
+              '// <![CDATA['."\n".
+              'window.focus();'."\n".
+              '// ]]>'."\n".
+              '</script>');
     &startContentScreen($r,'navmaps');
-    unless ($result eq 'update') {
-        $r->rflush();
-    }
+    $r->rflush();
 
     # Check that it's defined
     if (!($navmap->courseMapDefined())) {
@@ -228,7 +219,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 +242,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 +254,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'};
         }
@@ -325,33 +316,6 @@ ENDCLOSE
     return OK;
 }
 
-sub startpage {
-    my ($r) = @_;
-# ----------------------------------------------------- Force menu registration
-    # Header
-    my $course_type = &Apache::loncommon::course_type();
-    my $title = $course_type . ' Contents';
-    my ($start_page,$args);
-    if ($env{'form.register'}) {
-        $args = {'force_register' => $env{'form.register'}};
-        $start_page = &Apache::loncommon::start_page($title,undef,$args);
-    } else {
-        my $brcrum = [{href => '/adm/navmaps',
-                       text => &mt($course_type . ' Contents'),
-                       no_mt => 1},
-                     ];
-        $args = {'bread_crumbs' => $brcrum};
-        $start_page = &Apache::loncommon::start_page($title,undef,$args);
-    }
-    $r->print($start_page.
-              '<script type="text/javascript">'."\n".
-              '// <![CDATA['."\n".
-              'window.focus();'."\n".
-              '// ]]>'."\n".
-              '</script>');
-    return;
-}
-
 sub startContentScreen {
     my ($r,$mode)=@_;
 
@@ -368,6 +332,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;">');
 }