[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.7 and 1.34

version 1.22.4.7, 2017/04/02 13:35:30 version 1.34, 2017/06/26 01:56:58
Line 54  sub real_handler { Line 54  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 83  sub real_handler { Line 83  sub real_handler {
         }          }
     }      }
   
       my $course_type = &Apache::loncommon::course_type();
       if (($course_type eq 'Placement') && (!$env{'request.role.adv'})) { 
           my $furl = &Apache::lonpageflip::first_accessible_resource();
           &Apache::loncommon::content_type($r,'text/html');
           $r->header_out(Location => $furl);
           return REDIRECT;
       }
   
     # Create the nav map      # Create the nav map
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
   
Line 117  sub real_handler { Line 125  sub real_handler {
         $start_page = &Apache::loncommon::start_page($title,undef,$args);          $start_page = &Apache::loncommon::start_page($title,undef,$args);
     }      }
     $r->print($start_page.      $r->print($start_page.
               '<script type="text/javascript">window.focus();</script>');                '<script type="text/javascript">'."\n".
                 '// <![CDATA['."\n".
                 'window.focus();'."\n".
                 '// ]]>'."\n".
                 '</script>');
     &startContentScreen($r,'navmaps');      &startContentScreen($r,'navmaps');
     $r->rflush();      $r->rflush();
   
Line 320  sub startContentScreen { Line 332  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.7  
changed lines
  Added in v.1.34

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