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

Diff for /loncom/interface/loncommon.pm between versions 1.359 and 1.362

version 1.359, 2006/05/01 20:48:55 version 1.362, 2006/05/05 18:04:27
Line 2773  Inputs: Line 2773  Inputs:
   
 =item * $notitle, if true keep the nav controls, but remove the title bar  =item * $notitle, if true keep the nav controls, but remove the title bar
   
   =item * $no_inline_link, if true and in remote mode, don't show the 
            'Switch To Inline Menu' link
   
   
 =back  =back
   
Line 2785  other decorations will be returned. Line 2788  other decorations will be returned.
   
 sub bodytag {  sub bodytag {
     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,      my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,$customtitle,
  $notopbar,$bgcolor,$notitle)=@_;   $notopbar,$bgcolor,$notitle,$no_inline_link)=@_;
   
     $title=&mt($title);      $title=&mt($title);
   
     $function = &get_users_function() if (!$function);      $function = &get_users_function() if (!$function);
     my $img =    &designparm($function.'.img',$domain);      my $img =    &designparm($function.'.img',$domain);
     my $tabbg =  &designparm($function.'.tabbg',$domain);  
     my $font =   &designparm($function.'.font',$domain);      my $font =   &designparm($function.'.font',$domain);
     my $sidebg = &designparm($function.'.sidebg',$domain);  
     my $pgbg   = $bgcolor || &designparm($function.'.pgbg',$domain);      my $pgbg   = $bgcolor || &designparm($function.'.pgbg',$domain);
   
     my %design = ( 'style'   => 'margin-top: 0px',      my %design = ( 'style'   => 'margin-top: 0px',
Line 2847  sub bodytag { Line 2848  sub bodytag {
     $env{'environment.middlename'}      $env{'environment.middlename'}
     $env{'environment.lastname'}      $env{'environment.lastname'}
     $env{'environment.generation'}      $env{'environment.generation'}
        
 </div>  </div>
 <div class="LC_title_bar_role">  <div class="LC_title_bar_role">
 $role  $role&nbsp;
 </div>  </div>
 <div class="LC_title_bar_realm">  <div class="LC_title_bar_realm">
 $realm  $realm&nbsp;
 </div>  </div>
 </td>  </td>
 ENDROLE  ENDROLE
Line 2934  ENDROLE Line 2936  ENDROLE
         $lonhttpdPort.$img.'" alt="'.$function.'" />';          $lonhttpdPort.$img.'" alt="'.$function.'" />';
   
     # Explicit link to get inline menu      # Explicit link to get inline menu
     my $menu='<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>';      my $menu= ($no_inline_link?''
          :'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
     #      #
     if ($notitle) {      if ($notitle) {
  return $bodytag;   return $bodytag;
Line 3106  table#LC_top_nav, table#LC_menubuttons, Line 3109  table#LC_top_nav, table#LC_menubuttons,
   width: 100%;    width: 100%;
   background: $pgbg;    background: $pgbg;
   border: 0px;    border: 0px;
   border-spacing: 1px;    border-spacing: 2px 1px;
   padding: 0px;    padding: 0px;
   margin: 0px;    margin: 0px;
   border-collapse: separate;    border-collapse: separate;
Line 3114  table#LC_top_nav, table#LC_menubuttons, Line 3117  table#LC_top_nav, table#LC_menubuttons,
 table#LC_title_bar {  table#LC_title_bar {
   width: 100%;    width: 100%;
   border: 0;    border: 0;
   border-spacing: 3px;    border-spacing: 0px 1px;
   background: $pgbg;    background: $pgbg;
   font-family: $sans;    font-family: $sans;
     border-collapse: collapse;
 }  }
 table#LC_title_bar.LC_with_remote {  table#LC_title_bar.LC_with_remote {
   width: 100%;    width: 100%;
Line 3453  Inputs: $title - optional title for the Line 3457  Inputs: $title - optional title for the
                                     head -> skip the <html><head> generation                                      head -> skip the <html><head> generation
                                     body -> skip all <body> generation                                      body -> skip all <body> generation
   
                     no_inline_link -> if true and in remote mode, don't show the 
                                       'Switch To Inline Menu' link
   
 =back  =back
   
 =cut  =cut
Line 3488  sub start_page { Line 3495  sub start_page {
  $args->{'only_body'},      $args->{'domain'},   $args->{'only_body'},      $args->{'domain'},
  $args->{'force_register'}, $args->{'body_title'},   $args->{'force_register'}, $args->{'body_title'},
  $args->{'no_nav_bar'},     $args->{'bgcolor'},   $args->{'no_nav_bar'},     $args->{'bgcolor'},
  $args->{'no_title'});   $args->{'no_title'},       $args->{'no_inline_link'});
  }   }
     }      }
   
Removed from v.1.359  
changed lines
  Added in v.1.362

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