--- loncom/interface/lonnavdisplay.pm	2010/10/04 21:46:32	1.13.6.2
+++ loncom/interface/lonnavdisplay.pm	2025/02/26 19:50:21	1.46
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
-# Navigate Maps Handler
+# Navigate Maps Display Handler
 #
-# $Id: lonnavdisplay.pm,v 1.13.6.2 2010/10/04 21:46:32 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.46 2025/02/26 19:50:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,14 +30,16 @@
 package Apache::lonnavdisplay;
 
 use strict;
-use Apache::Constants qw(:common :http);
+use Apache::Constants qw(:common :http REDIRECT);
 use Apache::lonmenu();
 use Apache::loncommon();
 use Apache::lonnavmaps();
 use Apache::lonhtmlcommon();
 use Apache::lonnet;
 use Apache::lonlocal;
-use Time::HiRes qw( gettimeofday tv_interval );
+use Apache::londocs();
+use Apache::lonuserstate;
+use LONCAPA::ltiutils;
 
 sub handler {
     my $r = shift;
@@ -46,140 +48,144 @@ sub handler {
 
 sub real_handler {
     my $r = shift;
-    #my $t0=[&gettimeofday()];
     # Handle header-only request
     if ($r->header_only) {
-        if ($env{'browser.mathml'}) {
-            &Apache::loncommon::content_type($r,'text/xml');
-        } else {
-            &Apache::loncommon::content_type($r,'text/html');
-        }
+        &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
         return OK;
     }
 
-    # Send header, don't cache this page
-    if ($env{'browser.mathml'}) {
-        &Apache::loncommon::content_type($r,'text/xml');
-    } else {
+    # 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');
+        $r->header_out(Location => $url);
+        return REDIRECT;
     }
-    &Apache::loncommon::no_cache($r);
 
-    my %toplinkitems=();
-    &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'blank','',
-				      "Select Action");
-    if ($ENV{QUERY_STRING} eq 'collapseExternal') {
-	&Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
-	&Apache::lonnet::appenv({'environment.remotenavmap' => 'off'});
-	my $menu=&Apache::lonmenu::reopenmenu();
-	my $navstatus=&Apache::lonmenu::get_nav_status();
-	if ($menu) {
-	    $menu=(<<MENU)
-             swmenu=$menu
-             swmenu.clearTimeout(swmenu.menucltim);
-	     $navstatus
-MENU
-        } else {
-	    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
-	    my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
-	    $menu=(<<MENU)
-             swmenu=$mainwindow
-	     $navstatus
-MENU
-	}
-        $r->send_http_header;
-	my $js =<<"ENDSUBM";
-	  <script type="text/javascript">
- 	    function submitthis() {
-		    $menu
-		    self.close();
-	    }
-	
-  	  </script>
-ENDSUBM
-        $r->print(&Apache::loncommon::start_page(undef,$js,
-						 {'only_body' => 1,
-						  'bgcolor'   => '#FFFFFF',
-						  'add_entries' => 
-						      {'onload' =>
-							   "submitthis()"}}).
-		  &Apache::loncommon::end_page());
+# ------------------------------------------------------------ Get query string
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort',
+                                                                  'showOnlyHomework',
+                                                                  'postsymb']);
+    # 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');
+        $r->send_http_header;
+        $r->print(&Apache::loncommon::check_release_result(@reinit));
         return OK;
     }
-    if ($ENV{QUERY_STRING} =~ /^launchExternal/) {
-	&Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
-	&Apache::lonnet::appenv({'environment.remotenavmap' => 'on'});
- 	my $menu=&Apache::lonmenu::reopenmenu();
-	my $navstatus=&Apache::lonmenu::get_nav_status();
-	if ($menu) {
-	    $r->print(<<MENU);
-             <script type="text/javascript">
-             swmenu=$menu
-             swmenu.clearTimeout(swmenu.menucltim);
-	     $navstatus
-             </script>
-MENU
-        }
-   }
-    if ($ENV{QUERY_STRING} eq 'turningOffExternal') {
-	$env{'environment.remotenavmap'}='off';
+    my ($cid,$cnum,$cdom);
+    if ($result) {
+        $cid = $env{'request.course.id'};
+        $cnum = $env{'course.'.$cid.'.num'};
+        $cdom = $env{'course.'.$cid.'.domain'};
+    }
+    if (($result eq 'main') || ($result eq 'both')) {
+        &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!'));
+        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;
+            return HTTP_NOT_ACCEPTABLE;
+        }
+    }
+    if (($result eq 'both') || ($result eq 'supp')) {
+        my $possdel;
+        if ($result eq 'supp') {
+            $possdel = 1;
+        }
+        my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom,'',$possdel);
+        unless ($refs_updated) {
+            &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental,$possdel);
+        }
+    }
+
+    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 'main') || ($result eq 'both')) {
+            &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+            $r->print($closure.&Apache::loncommon::end_page());
+            return OK;
+        } else {
+            unless ($furl eq '/adm/navmaps') {
+                &Apache::loncommon::content_type($r,'text/html');
+                $r->header_out(Location => $furl);
+                return REDIRECT;
+            }
+        }
+    }
+
+    if ($env{'request.lti.login'}) {
+        if ($env{'request.lti.uri'} ne '') {
+            my $cid = $env{'request.course.id'};
+            my $cnum = $env{'course.'.$cid.'.num'};
+            my $cdom = $env{'course.'.$cid.'.domain'};
+            my ($scope,$url) = &LONCAPA::ltiutils::lti_provider_scope($env{'request.lti.uri'},$cdom,$cnum);
+            if (($scope eq 'map') || ($scope eq 'resource')) {
+                &Apache::loncommon::content_type($r,'text/html');
+                $r->header_out(Location => $url);
+                return REDIRECT;
+            }
+        }
     }
 
     # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();
 
     if (!defined($navmap)) {
+        if (($result eq 'main') || ($result eq 'both')) {
+            &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;
     }
-    $r->send_http_header;
 
-# ------------------------------------------------------------ Get query string
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['sort','showOnlyHomework','postsymb','register']);
-    
-# ----------------------------------------------------- Force menu registration
-    my $body_only='';
-    my $js;
-    if ($env{'environment.remotenavmap'} eq 'on') {
-	$js='<script type="text/javascript">
-                function collapse() {
-                   this.document.location="/adm/navmaps?collapseExternal";
-                }
-             </script>';
-	$body_only=1;
+    if (($result eq 'main') || ($result eq 'both')) {
+        $r->rflush();
+        &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+        $r->print($closure);
+        $r->rflush();
+    } else {
+        # Send header, don't cache this page
+        &Apache::loncommon::content_type($r,'text/html');
+        $r->send_http_header;
+        &startpage($r);
     }
 
-    # Header
-    my $course_type = &Apache::loncommon::course_type();
-    my ($title,$breadcrumb_text,$start_page,$args);
-    if ($course_type eq 'Community') {
-        $title = 'Community Contents';
-        $breadcrumb_text = &mt('Community Contents');
-    } else {
-        $title = 'Course Contents';
-        $breadcrumb_text = &mt('Course Contents');
+    &startContentScreen($r,'navmaps',$course_type);
+    unless (($result eq 'main') || ($result eq 'both')) {
+        $r->rflush();
     }
-    if ($env{'form.register'}) {
-        $args = {'force_register' => $env{'form.register'},
-                 'only_body'      => $body_only};
-        $start_page = &Apache::loncommon::start_page($title,$js,$args);
-    } else {
-        my $brcrum = [{href => '/adm/navmaps',
-                       text => $breadcrumb_text,
-                       no_mt => 1},
-                     ];
-        $args = {'bread_crumbs' => $brcrum,
-                 'only_body'    => $body_only};
-        $start_page = &Apache::loncommon::start_page($title,$js,$args);
-    }
-    $r->print($start_page.
-              '<script type="text/javascript">window.focus();</script>');
-     
-    $r->rflush();
 
     # Check that it's defined
     if (!($navmap->courseMapDefined())) {
@@ -190,21 +196,32 @@ MENU
         return OK;
     }
 
-    # See if there's only one map in the top-level, if we don't
-    # already have a filter... if so, automatically display it
-    # (older code; should use retrieveResources)
-    if ($ENV{QUERY_STRING} !~ /filter/) {
-        my $iterator = $navmap->getIterator(undef, undef, undef, 0);
-        my $curRes;
-        my $sequenceCount = 0;
-        my $sequenceId;
-        while ($curRes = $iterator->next()) {
-            if (ref($curRes) && $curRes->is_sequence()) {
+    my %toplinkitems=();
+    my @resources = $navmap->retrieveResources();
+    my $sequenceCount = 0;
+    my $problemCount = 0;
+    my $notaprobCount = 0;
+    my $sequenceId;
+    my $notools;
+    foreach my $curRes (@resources) {
+        if (ref($curRes)) {
+            if ($curRes->is_sequence()) {
                 $sequenceCount++;
                 $sequenceId = $curRes->map_pc();
+            } elsif ($curRes->is_problem()) {
+                $problemCount ++;
+            } else {
+                $notaprobCount ++;
             }
         }
-        
+    }
+    if (($sequenceCount == 1) && (!$problemCount) && ($notaprobCount <= 1)) {
+        $notools = 1;
+    }
+
+    # If there's only one map in the top-level and we don't
+    # already have a filter, automatically display it
+    if ($ENV{QUERY_STRING} !~ /filter/) {
         if ($sequenceCount == 1) {
             # The automatic iterator creation in the render call 
             # will pick this up. We know the condition because
@@ -214,27 +231,6 @@ MENU
         }
     }
 
-    if ($ENV{QUERY_STRING} eq 'launchExternal') {
-	$r->print('
-          <form name="returnwin" action="/adm/flip?postdata=navlaunch%3a" 
-                method="post" target="loncapaclient">
-          </form>');
-	$r->print('
-          <script type="text/javascript">
-              this.document.returnwin.submit();
-          </script>');
-    }
-
-    if ($env{'environment.remotenavmap'} ne 'on') {
-	$r->print(&launch_win('link','yes',\%toplinkitems));
-    } 
-    if ($env{'environment.remotenavmap'} eq 'on') {
-	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'closenav',
-					  'collapse()',
-					  "Close navigation window");
-    } 
-
-
     # Check to see if the student is jumping to next open, do-able problem
     if ($ENV{QUERY_STRING} =~ /^jumpToFirstHomework/) {
         # Find the next homework problem that they can do.
@@ -277,13 +273,12 @@ MENU
                      ."</span>");
         }
     } else {
-        my $link = 'navmaps?jumpToFirstHomework';
-        if ($env{'form.register'}) {
-            $link .= '&amp;register='.$env{'form.register'};
+        my $link = '/adm/navmaps?jumpToFirstHomework';
+        unless ($notools) {
+	    &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
+					      'location.href="'.$link.'"',
+					      "Show my first due problem");
         }
-	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'firsthomework',
-					  'location.href="'.$link.'"',
-					  "Show my first due problem");
     }
 
     my $suppressEmptySequences = 0;
@@ -298,41 +293,41 @@ MENU
         $filterFunc = sub { my $res = shift; 
                             return $res->completable() || $res->is_map();
                         };
-        my $link = 'navmaps?sort='.$env{'form.sort'};
-        if ($env{'form.register'}) {
-            $link .= '&amp;register='.$env{'form.register'};
-        }
+        my $link = '/adm/navmaps?sort='.$env{'form.sort'};
 	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'everything',
 					  'location.href="'.$link.'"',
-					  "Show everything");
+					  'Show everything');
         $r->print("<span class=\"LC_info\">".&mt("Uncompleted Problems")."</span>");
         $env{'form.filter'} = '';
         $env{'form.condition'} = 1;
 	$resource_no_folder_link = 1;
     } else {
-        my $link = 'navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
-        if ($env{'form.register'}) {
-            $link .= '&amp;register='.$env{'form.register'};
+        my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
+        unless ($notools) {
+	    &Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
+					      'location.href="'.$link.'"',
+					      'Show only uncompleted problems');
         }
-	&Apache::lonnavmaps::add_linkitem(\%toplinkitems,'uncompleted',
-					  'location.href="'.$link.'"',
-					  "Show only uncompleted problems");
     }
 
     my %selected=($env{'form.sort'} => ' selected="selected"');
-    my $sort_html=('<form name="sortForm" action="">
+    my $sort_html;
+    unless ($notools) {
+        $sort_html=(
+              '<form name="sortForm" action="">
                  <span class="LC_nobreak">
                     <input type="hidden" name="showOnlyHomework" value="'.$env{'form.showOnlyHomework'}.'" />
-                    '.&mt('Sort by:').'
-                    <select name="sort" onchange="document.sortForm.submit()">
+                    <label for="LC_navmap_sort">'.&mt('Sort by:').'</label>
+                    <select name="sort" id="LC_navmap_sort">
                        <option value="default"'.$selected{'default'}.'>'.&mt('Default').'</option>
                        <option value="title"'.$selected{'title'}.'>'.&mt('Title').'</option>
-                       <option value="duedate"'.$selected{'duedate'}.'>'.&mt('Duedate').'</option>
+                       <option value="duedate"'.$selected{'duedate'}.'>'.&mt('Due Date').'</option>
                        <option value="discussion"'.$selected{'discussion'}.'>'.&mt('Has New Discussion').'</option>
                     </select>
-                    <input type="hidden" name="register" value="'.$env{'form.register'}.'" />
+                    <input type="submit" value="'.&mt('Go').'" />
                  </span>
                </form>');
+    }
     # renderer call
     my $renderArgs = { 'cols' => [0,1,2,3],
 		       'sort' => $env{'form.sort'},
@@ -345,7 +340,9 @@ MENU
 		       'sort_html'=> $sort_html,
                        'r' => $r,
                        'caller' => 'navmapsdisplay',
-                       'linkitems' => \%toplinkitems};
+                       'linkitems' => \%toplinkitems,
+                       'notools' => $notools};
+                      
     my $render = &Apache::lonnavmaps::render($renderArgs);
 
     # If no resources were printed, print a reassuring message so the
@@ -357,42 +354,61 @@ MENU
             $r->print("<p><span class=\"LC_info\">".&mt("This course is empty.")."</span></p>");
         }
     }
-    #my $td=&tv_interval($t0);
-    #$r->print("<br />$td");
-
+    &endContentScreen($r);
     $r->print(&Apache::loncommon::end_page());
     $r->rflush();
 
     return OK;
 }
 
-sub launch_win {
-    my ($mode,$script,$toplinkitems,$firsttime)=@_;
-    my $result;
-    if ($script ne 'no') {
-	$result.='<script type="text/javascript">';
-    }
-    if ($firsttime) {
-	$result.='function launch_navmapwin() {
-                 newWindow=open(\'/adm/navmaps?launchExternalRoles\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
-               }';
+sub startpage {
+    my ($r) = @_;
+# ----------------------------------------------------- Force menu registration
+    # Header
+    my $course_type = &Apache::loncommon::course_type();
+    my $title = $course_type . ' Contents';
+    my $brcrum = [{href => '/adm/navmaps',
+                   text => &mt($course_type . ' Contents'),
+                   no_mt => 1},
+                 ];
+    my $args = {'bread_crumbs' => $brcrum};
+    $r->print(&Apache::loncommon::start_page($title,undef,$args).
+              '<script type="text/javascript">'."\n".
+              '// <![CDATA['."\n".
+              'window.focus();'."\n".
+              '// ]]>'."\n".
+              '</script>');
+    return;
+}
+
+sub startContentScreen {
+    my ($r,$mode,$course_type)=@_;
+
+    $r->print("\n".'<div class="LC_landmark" role="main">'.
+              '<ul class="LC_TabContentBigger" id="mainnav">'."\n");
+    $r->print('<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&mt('Main Content').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</b></a></li>'."\n");
+    my $supptab;
+    if ($env{'request.role.adv'}) {
+        $supptab = 1;
     } else {
-	$result.='function launch_navmapwin() {
-                 newWindow=open(\'/adm/navmaps?launchExternal\',\'loncapanav\',\'width=400,height=600,scrollbars=1\');
-               }';
-    }
-    if ($mode eq 'now') {
-	$result.="\nlaunch_navmapwin();\n";
-    }
-    if ($script ne 'no') {
-	$result.='</script>';
-    }
-    if ($mode eq 'link') {
-	&Apache::lonnavmaps::add_linkitem($toplinkitems,'launchnav',
-					  'launch_navmapwin()',
-					  "Launch navigation window");
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $supptab = &Apache::lonnet::has_unhidden_suppfiles($cnum,$cdom);
+    }
+    if ($supptab) {
+        $r->print('<li '.(($mode eq 'supplemental')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>');
+    }
+    unless ($course_type eq 'Placement') {
+        $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");
     }
-    return $result;
+    $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;">');
+}
+
+sub endContentScreen {
+   my ($r)=@_;
+   $r->print('</div></div></div></div>');
 }
 
 1;