--- loncom/interface/lonnavdisplay.pm	2024/07/02 02:17:56	1.22.4.11
+++ loncom/interface/lonnavdisplay.pm	2025/02/26 19:50:21	1.46
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Display Handler
 #
-# $Id: lonnavdisplay.pm,v 1.22.4.11 2024/07/02 02:17:56 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.46 2025/02/26 19:50:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,7 @@ use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::londocs();
 use Apache::lonuserstate;
+use LONCAPA::ltiutils;
 
 sub handler {
     my $r = shift;
@@ -54,8 +55,8 @@ sub real_handler {
         return OK;
     }
 
-    # Check for critical messages and redirect if present.
-    my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);
+    # 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);
@@ -77,10 +78,14 @@ sub real_handler {
         $r->send_http_header;
         $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'};
+    }
+    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);
@@ -110,12 +115,52 @@ ENDCLOSE
             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 'update') {
+        if (($result eq 'main') || ($result eq 'both')) {
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
             $r->print($closure.&Apache::loncommon::end_page());
         }
@@ -125,7 +170,7 @@ ENDCLOSE
         return HTTP_NOT_ACCEPTABLE;
     }
 
-    if ($result eq 'update') {
+    if (($result eq 'main') || ($result eq 'both')) {
         $r->rflush();
         &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
         $r->print($closure);
@@ -137,8 +182,8 @@ ENDCLOSE
         &startpage($r);
     }
 
-    &startContentScreen($r,'navmaps');
-    unless ($result eq 'update') {
+    &startContentScreen($r,'navmaps',$course_type);
+    unless (($result eq 'main') || ($result eq 'both')) {
         $r->rflush();
     }
 
@@ -272,13 +317,14 @@ ENDCLOSE
               '<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('Due Date').'</option>
                        <option value="discussion"'.$selected{'discussion'}.'>'.&mt('Has New Discussion').'</option>
                     </select>
+                    <input type="submit" value="'.&mt('Go').'" />
                  </span>
                </form>');
     }
@@ -336,28 +382,33 @@ sub startpage {
 }
 
 sub startContentScreen {
-    my ($r,$mode)=@_;
+    my ($r,$mode,$course_type)=@_;
 
-    $r->print("\n".'<ul class="LC_TabContentBigger" id="mainnav">'."\n");
+    $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 $allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
-    my ($suppcount,$errors);
-    unless ($allowed) {
+    my $supptab;
+    if ($env{'request.role.adv'}) {
+        $supptab = 1;
+    } else {
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-        ($suppcount,$errors) = &Apache::lonnet::get_numsuppfiles($cnum,$cdom);
+        $supptab = &Apache::lonnet::has_unhidden_suppfiles($cnum,$cdom);
     }
-    if ($allowed || $suppcount) {
+    if ($supptab) {
         $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");
+    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");
+    }
     $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>');
+   $r->print('</div></div></div></div>');
 }
 
 1;