[BACK]Return to lonnavdisplay.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonnavdisplay.pm between versions 1.22.4.8 and 1.22.4.10.2.1

version 1.22.4.8, 2018/09/10 23:11:26 version 1.22.4.10.2.1, 2022/01/01 04:28:19
Line 55  sub real_handler { Line 55  sub real_handler {
     }      }
   
     # Check for critical messages and redirect if present.      # Check for critical messages and redirect if present.
     my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);      my ($redirect,$url) = &Apache::loncommon::critical_redirect(300,'contents');
     if ($redirect) {      if ($redirect) {
         &Apache::loncommon::content_type($r,'text/html');          &Apache::loncommon::content_type($r,'text/html');
         $r->header_out(Location => $url);          $r->header_out(Location => $url);
Line 87  sub real_handler { Line 87  sub real_handler {
         my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.          my $preamble = '<div id="LC_update_'.$cid.'" class="LC_info">'.
                        '<br />'.                         '<br />'.
                        &mt('Your course session is being updated because of recent changes by course personnel.').                         &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>';                         '<div style="padding:0;clear:both;margin:0;border:0"></div>';
         $closure = <<ENDCLOSE;          $closure = <<ENDCLOSE;
 <script type="text/javascript">  <script type="text/javascript">
Line 100  ENDCLOSE Line 100  ENDCLOSE
         &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));          &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,&mt('Updating course'));
         $r->rflush();          $r->rflush();
         my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum",\%prog_state,$r);          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) {          if ($ferr) {
             &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);              &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
             $r->print($closure.&Apache::loncommon::end_page());              $r->print($closure.&Apache::loncommon::end_page());
Line 228  ENDCLOSE Line 228  ENDCLOSE
                      ."</span>");                       ."</span>");
         }          }
     } else {      } else {
         my $link = 'navmaps?jumpToFirstHomework';          my $link = '/adm/navmaps?jumpToFirstHomework';
         if ($env{'form.register'}) {          if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};               $link .= '&amp;register='.$env{'form.register'}; 
         }          }
Line 251  ENDCLOSE Line 251  ENDCLOSE
         $filterFunc = sub { my $res = shift;           $filterFunc = sub { my $res = shift; 
                             return $res->completable() || $res->is_map();                              return $res->completable() || $res->is_map();
                         };                          };
         my $link = 'navmaps?sort='.$env{'form.sort'};          my $link = '/adm/navmaps?sort='.$env{'form.sort'};
         if ($env{'form.register'}) {          if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};              $link .= '&amp;register='.$env{'form.register'};
         }          }
Line 263  ENDCLOSE Line 263  ENDCLOSE
         $env{'form.condition'} = 1;          $env{'form.condition'} = 1;
  $resource_no_folder_link = 1;   $resource_no_folder_link = 1;
     } else {      } else {
         my $link = 'navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';          my $link = '/adm/navmaps?sort='.$env{'form.sort'}.'&amp;showOnlyHomework=1';
         if ($env{'form.register'}) {          if ($env{'form.register'}) {
             $link .= '&amp;register='.$env{'form.register'};              $link .= '&amp;register='.$env{'form.register'};
         }          }
Removed from v.1.22.4.8  
changed lines
  Added in v.1.22.4.10.2.1

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>