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

Diff for /loncom/interface/lonnavmaps.pm between versions 1.372 and 1.374

version 1.372, 2006/03/17 21:33:17 version 1.374, 2006/03/23 22:32:10
Line 203  MENU Line 203  MENU
   
    </script>     </script>
 ENDSUBM  ENDSUBM
         $r->print(&Apache::lonxml::xmlbegin().          $r->print(&Apache::loncommon::start_page(undef,$js,
   &Apache::loncommon::head(undef,$js).   {'only_body' => 1,
   '<body bgcolor="#FFFFFF" onLoad="submitthis()">'.    'bgcolor'   => '#FFFFFF',
   &Apache::loncommon::end_page(undef,$js));    'add_entries' => 
         'onLoad="submitthis()"',}).
     &Apache::loncommon::end_page());
   
         return OK;          return OK;
     }      }
Line 267  MENU Line 269  MENU
     }      }
   
     # Header      # Header
     $r->print(&Apache::lonxml::xmlbegin().      $r->print(&Apache::loncommon::start_page('Navigate Course Contents',$js,
       &Apache::loncommon::head('Navigate Course Contents',$js).       {'add_entries'     => $addentries,
               &Apache::loncommon::bodytag('Navigate Course Contents','',        'only_body'       => $body_only,
   $addentries,$body_only,'',        'force_resgister' =>
   $env{'form.register'}));    $env{'form.register'},}));
     $r->print('<script>window.focus();</script>');      $r->print('<script type="text/javascript">window.focus();</script>');
             
     $r->rflush();      $r->rflush();
   
     # Check that it's defined      # Check that it's defined
     if (!($navmap->courseMapDefined())) {      if (!($navmap->courseMapDefined())) {
  $r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));   $r->print(&Apache::loncommon::help_open_menu('','Navigation Screen','Navigation_Screen','',undef,'RAT'));
         $r->print('<font size="+2" color="red">Coursemap undefined.</font>' .          $r->print('<font size="+2" color="red">'.&mt('Coursemap undefined.').
     '</font>' .
                   &Apache::loncommon::end_page());                    &Apache::loncommon::end_page());
         return OK;          return OK;
     }      }
Line 2402  sub unread_discussion { Line 2405  sub unread_discussion {
 sub wrap_symb {  sub wrap_symb {
     my $self = shift;      my $self = shift;
     my $symb = shift;      my $symb = shift;
     if ($symb =~ m-___(adm/\w+/\w+/)(\d+)(/bulletinboard)$-) {      if ($symb =~ m-___(adm/[^/]+/[^/]+/)(\d+)(/bulletinboard)$-) {
         unless ($symb =~ m|adm/wrapper/adm|) {          unless ($symb =~ m|adm/wrapper/adm|) {
             $symb = 'bulletin___'.$2.'___adm/wrapper/'.$1.$2.$3;              $symb = 'bulletin___'.$2.'___adm/wrapper/'.$1.$2.$3;
         }          }
Line 2414  sub unwrap_symb { Line 2417  sub unwrap_symb {
     my $self = shift;      my $self = shift;
     my $ressymb = shift;      my $ressymb = shift;
     my $discsymb = $ressymb;      my $discsymb = $ressymb;
     if ($ressymb =~ m-^(bulletin___\d+___)adm/wrapper/(adm/\w+/\w+/\d+/bulletinboard)$-) {      if ($ressymb =~ m-^(bulletin___\d+___)adm/wrapper/(adm/[^/]+/[^/]+/\d+/bulletinboard)$-) {
          $discsymb = $1.$2;           $discsymb = $1.$2;
     }      }
     return $discsymb;      return $discsymb;
Removed from v.1.372  
changed lines
  Added in v.1.374

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