[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.10 and 1.37

version 1.22.4.10, 2021/03/04 01:38:00 version 1.37, 2018/12/30 15:58:20
Line 39  use Apache::lonnet; Line 39  use Apache::lonnet;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::londocs();  use Apache::londocs();
 use Apache::lonuserstate;  use Apache::lonuserstate;
   use LONCAPA::ltiutils;
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
Line 54  sub real_handler { Line 55  sub real_handler {
         return OK;          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);      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 88  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 101  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 111  ENDCLOSE Line 112  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') {
               &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
               $r->print($closure.&Apache::loncommon::end_page());
               return OK;
           } else {
               &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      # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
   
Line 368  sub startContentScreen { Line 397  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 '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 '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("\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;">');      $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;">');
 }  }
Removed from v.1.22.4.10  
changed lines
  Added in v.1.37

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