Diff for /loncom/interface/loncommon.pm between versions 1.310 and 1.314

version 1.310, 2006/03/16 21:34:03 version 1.314, 2006/03/19 22:48:53
Line 2972  Inputs: $title - optional title for the Line 2972  Inputs: $title - optional title for the
 =cut  =cut
   
 sub headtag {  sub headtag {
     my ($title,$head_extra) = @_;      my ($title,$head_extra,$args) = @_;
           
     my $result =      my $result =
  '<head>'.   '<head>'.
  &Apache::lonxml::fontsettings().   &Apache::lonxml::fontsettings().
  &Apache::lonhtmlcommon::htmlareaheaders();   &Apache::lonhtmlcommon::htmlareaheaders();
           
       if (ref($args->{'redirect'})) {
    my ($time,$url) = @{$args->{'redirect'}};
    $result.=<<ADDMETA
   <meta http-equiv="pragma" content="no-cache" />
   <meta HTTP-EQUIV="Refresh" CONTENT="2; url=$url" />
   ADDMETA
       }
     if (!defined($title)) {      if (!defined($title)) {
  $title = 'The LearningOnline Network with CAPA';   $title = 'The LearningOnline Network with CAPA';
     }      }
Line 3036  Returns a complete <html> .. <body> sect Line 3043  Returns a complete <html> .. <body> sect
 Inputs: $title - optional title for the page  Inputs: $title - optional title for the page
         $head_extra - optional extra HTML to incude inside the <head>          $head_extra - optional extra HTML to incude inside the <head>
         %args - additional optional args supported are:          %args - additional optional args supported are:
                   only_body  -> is true will set &bodytag() onlybodytag arg on                    only_body   -> is true will set &bodytag() onlybodytag arg on
                   no_nav_bar -> is true will set &bodytag() notopbar arg on                    no_nav_bar  -> is true will set &bodytag() notopbar arg on
                     add_entries -> additional attributes to add to the  <body>
                     domain      -> force to color decorate a page for a 
                                    specific domain
                     function    -> force usage of a specific rolish color scheme
                     redirect    -> ...
   
 =back  =back
   
Line 3045  Inputs: $title - optional title for the Line 3057  Inputs: $title - optional title for the
   
 sub start_page {  sub start_page {
     my ($title,$head_extra,$args) = @_;      my ($title,$head_extra,$args) = @_;
       my %head_args;
       if (defined($args->{'redirect'})) {
    $head_args{'redirect'} = $args->{'redirect'};
       }
   
     return       return 
  &Apache::lonxml::xmlbegin().   &Apache::lonxml::xmlbegin().
  &headtag($title,$head_extra).&endheadtag().   &headtag($title,$head_extra,\%head_args).&endheadtag().
  &bodytag($title,undef,undef,$args->{'only_body'},undef,undef,undef,   &bodytag($title, $args->{'function'}, $args->{'add_entries'},
  $args->{'no_nav_bar'});   $args->{'only_body'},
    undef,undef,undef,$args->{'no_nav_bar'});
 }  }
   
 =pod  =pod

Removed from v.1.310  
changed lines
  Added in v.1.314


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