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

Diff for /loncom/interface/lonnavdisplay.pm between versions 1.10.4.1 and 1.14

version 1.10.4.1, 2010/02/14 21:53:02 version 1.14, 2010/03/10 21:25:50
Line 72  sub real_handler { Line 72  sub real_handler {
     if ($ENV{QUERY_STRING} eq 'collapseExternal') {      if ($ENV{QUERY_STRING} eq 'collapseExternal') {
  &Apache::lonnet::put('environment',{'remotenavmap' => 'off'});   &Apache::lonnet::put('environment',{'remotenavmap' => 'off'});
  &Apache::lonnet::appenv({'environment.remotenavmap' => 'off'});   &Apache::lonnet::appenv({'environment.remotenavmap' => 'off'});
  my $menu=&Apache::lonmenu::reopenmenu();   my $menu='';
  my $navstatus=&Apache::lonmenu::get_nav_status();   my $navstatus=&Apache::lonmenu::get_nav_status();
  if ($menu) {      my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
     $menu=(<<MENU)      my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';
              swmenu=$menu      $menu=(<<MENU);
              swmenu.clearTimeout(swmenu.menucltim);           swmenu=$mainwindow
      $navstatus       $navstatus
 MENU  MENU
         } else {      $r->send_http_header;
     my $nothing = &Apache::lonhtmlcommon::javascript_nothing();  
     my $mainwindow='window.open('.$nothing.',"loncapaclient","",false);';  
     $menu=(<<MENU)  
              swmenu=$mainwindow  
      $navstatus  
 MENU  
  }  
         $r->send_http_header;  
  my $js =<<"ENDSUBM";   my $js =<<"ENDSUBM";
   <script type="text/javascript">    <script type="text/javascript">
      function submitthis() {       function submitthis() {
Line 111  ENDSUBM Line 103  ENDSUBM
     if ($ENV{QUERY_STRING} =~ /^launchExternal/) {      if ($ENV{QUERY_STRING} =~ /^launchExternal/) {
  &Apache::lonnet::put('environment',{'remotenavmap' => 'on'});   &Apache::lonnet::put('environment',{'remotenavmap' => 'on'});
  &Apache::lonnet::appenv({'environment.remotenavmap' => 'on'});   &Apache::lonnet::appenv({'environment.remotenavmap' => 'on'});
   my $menu=&Apache::lonmenu::reopenmenu();    my $menu='';
  my $navstatus=&Apache::lonmenu::get_nav_status();   my $navstatus=&Apache::lonmenu::get_nav_status();
  if ($menu) {   if ($menu) {
     $r->print(<<MENU);      $r->print(<<MENU);
Line 155  MENU Line 147  MENU
   
     # Header      # Header
     my $course_type = &Apache::loncommon::course_type();      my $course_type = &Apache::loncommon::course_type();
     my $title;      my ($title,$breadcrumb_text);
     if ($course_type eq 'Community') {      if ($course_type eq 'Community') {
         $title = 'Community Contents';          $title = 'Community Contents';
           $breadcrumb_text = &mt('Community Contents');
     } else {      } else {
         $title = 'Course Contents';          $title = 'Course Contents';
           $breadcrumb_text = &mt('Course Contents');
     }      }
     $r->print(&Apache::loncommon::start_page($title,      $r->print(&Apache::loncommon::start_page($title,
      $js,                           $js,
      {'only_body'       => $body_only,                           {'only_body'       => $body_only,
       'force_register'  =>                            'force_register'  => $env{'form.register'},
   $env{'form.register'},}));                            'bread_crumbs'    => [{text => $breadcrumb_text }],}));
     $r->print('<script type="text/javascript">window.focus();</script>');      $r->print('<script type="text/javascript">window.focus();</script>');
             
     $r->rflush();      $r->rflush();
Removed from v.1.10.4.1  
changed lines
  Added in v.1.14

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