--- loncom/interface/lonnavdisplay.pm	2023/07/25 04:58:49	1.42
+++ loncom/interface/lonnavdisplay.pm	2025/02/07 20:46:01	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Display Handler
 #
-# $Id: lonnavdisplay.pm,v 1.42 2023/07/25 04:58:49 raeburn Exp $
+# $Id: lonnavdisplay.pm,v 1.45 2025/02/07 20:46:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -129,7 +129,7 @@ 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') {
+        if (($result eq 'main') || ($result eq 'both')) {
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
             $r->print($closure.&Apache::loncommon::end_page());
             return OK;
@@ -160,7 +160,7 @@ ENDCLOSE
     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());
         }
@@ -170,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);
@@ -183,7 +183,7 @@ ENDCLOSE
     }
 
     &startContentScreen($r,'navmaps',$course_type);
-    unless ($result eq 'update') {
+    unless (($result eq 'main') || ($result eq 'both')) {
         $r->rflush();
     }
 
@@ -317,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>');
     }
@@ -371,8 +372,7 @@ sub startpage {
                    no_mt => 1},
                  ];
     my $args = {'bread_crumbs' => $brcrum};
-    my $start_page = &Apache::loncommon::start_page($title,undef,$args);
-    $r->print($start_page.
+    $r->print(&Apache::loncommon::start_page($title,undef,$args).
               '<script type="text/javascript">'."\n".
               '// <![CDATA['."\n".
               'window.focus();'."\n".