Diff for /loncom/interface/lonnavdisplay.pm between versions 1.22.4.5 and 1.26

version 1.22.4.5, 2014/05/22 12:25:32 version 1.26, 2014/05/03 15:22:02
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Navigate Maps Display Handler  # Navigate Maps Handler
 #  #
 # $Id$  # $Id$
 #  #
Line 30 Line 30
 package Apache::lonnavdisplay;  package Apache::lonnavdisplay;
   
 use strict;  use strict;
 use Apache::Constants qw(:common :http REDIRECT);  use Apache::Constants qw(:common :http);
 use Apache::lonmenu();  use Apache::lonmenu();
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonnavmaps();  use Apache::lonnavmaps();
Line 59  sub real_handler { Line 59  sub real_handler {
         return OK;          return OK;
     }      }
   
     # Check for critical messages and redirect if present.  
     my ($redirect,$url) = &Apache::loncommon::critical_redirect(300);  
     if ($redirect) {  
         &Apache::loncommon::content_type($r,'text/html');  
         $r->header_out(Location => $url);  
         return REDIRECT;  
     }  
   
     # Send header, don't cache this page      # Send header, don't cache this page
     if ($env{'browser.mathml'}) {      if ($env{'browser.mathml'}) {
         &Apache::loncommon::content_type($r,'text/xml');          &Apache::loncommon::content_type($r,'text/xml');
Line 108  sub real_handler { Line 100  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 312  sub startContentScreen { Line 308  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.5  
changed lines
  Added in v.1.26


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