LON-CAPA '.&mt($title).'

--- loncom/interface/loncommon.pm 2006/03/27 19:38:53 1.323 +++ loncom/interface/loncommon.pm 2006/04/11 18:43:46 1.330 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.323 2006/03/27 19:38:53 albertel Exp $ +# $Id: loncommon.pm,v 1.330 2006/04/11 18:43:46 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -58,7 +58,6 @@ use strict; use Apache::lonnet; use GDBM_File; use POSIX qw(strftime mktime); -use Apache::Constants qw(:common :http :methods); use Apache::lonmenu(); use Apache::lonlocal; use HTML::Entities; @@ -2737,7 +2736,9 @@ Inputs: =item * $forcereg, if page should register as content page (relevant for text interface only) -=item * $customtitle, overrides the $title in some way ???? +=item * $customtitle, alternate text to use instead of $title + in the title box that appears, this text + is not auto translated like the $title is =item * $notopbar, if true, keep the 'what is this' info but remove the navigational links @@ -2767,7 +2768,6 @@ sub bodytag { my $vlink=&designparm($function.'.vlink',$domain); my $sidebg=&designparm($function.'.sidebg',$domain); # Accessibility font enhance - unless ($addentries) { $addentries=''; } my $addstyle=''; if ($env{'browser.fontenhance'} eq 'on') { $addstyle=' font-size: x-large;'; @@ -2786,6 +2786,9 @@ sub bodytag { # Port for miniserver my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'}; if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; } + + my $extra_body_attr = &make_attr_string($forcereg,$addentries); + # construct main body tag my $bodytag = < @@ -2798,13 +2801,10 @@ form, .inline { display: inline; } .filename {font-family: monospace;} +style="margin-top: 0px;$addstyle" $extra_body_attr> END - &Apache::lontexconvert::jsMath_reset(); - if ($env{'environment.texengine'} eq 'jsMath' || - $env{'form.texengine'} eq 'jsMath' ) { - $bodytag.=&Apache::lontexconvert::jsMath_header(); - } + + $bodytag .= &Apache::lontexconvert::init_math_support(); my $upperleft=' '.$function.'

'.$function.'

'; @@ -2933,6 +2933,29 @@ $titleinfo $dc_info $menu ENDBODY } +sub make_attr_string { + my ($register,$attr_ref) = @_; + + if ($attr_ref && !ref($attr_ref)) { + die("addentries Must be a hash ref ". + join(':',caller(1))." ". + join(':',caller(0))." "); + } + + if ($register) { + $attr_ref->{'onload'} = &Apache::lonmenu::loadevents(). + $attr_ref->{'onload'}; + $attr_ref->{'onunload'} = &Apache::lonmenu::unloadevents(). + $attr_ref->{'onunload'}; + } + my $attr_string; + foreach my $attr (keys(%$attr_ref)) { + $attr_string .= " $attr=\"".$attr_ref->{$attr}.'" '; + } + return $attr_string; +} + + ############################################### ############################################### @@ -3007,7 +3030,7 @@ sub headtag { $env{'internal.head.redirect'} = $url; $result.=< - + ADDMETA } if (!defined($title)) { @@ -3015,7 +3038,6 @@ ADDMETA } $result .= ' LON-CAPA '.&mt($title).''.$head_extra; - return $result; } @@ -3052,8 +3074,8 @@ Inputs: $title - optional title for the =cut sub head { - my ($title,$head_extra) = @_; - return &headtag($title,$head_extra).&endheadtag(); + my ($title,$head_extra,$args) = @_; + return &headtag($title,$head_extra,$args).&endheadtag(); } =pod @@ -3083,7 +3105,11 @@ Inputs: $title - optional title for the a html attribute force_register -> if is true will turn on the &bodytag() $forcereg arg - + body_title -> alternate text to use instead of $title + in the title box that appears, this text + is not auto translated like the $title is + frameset -> if true will start with a + rather than =back =cut @@ -3094,19 +3120,26 @@ sub start_page { my %head_args; foreach my $arg ('redirect','force_register') { if (defined($args->{$arg})) { - $head_args{$arg} = $args->{$args}; + $head_args{$arg} = $args->{$arg}; } } $env{'internal.start_page'}++; my $result = &Apache::lonxml::xmlbegin(). - &headtag($title,$head_extra,\%head_args).&endheadtag(). - &bodytag($title, - $args->{'function'}, $args->{'add_entries'}, - $args->{'only_body'}, $args->{'domain'}, - $args->{'force_register'}, undef, - $args->{'no_nav_bar'}, $args->{'bgcolor'}); + &headtag($title,$head_extra,\%head_args).&endheadtag(); + if ($args->{'frameset'}) { + my $attr_string = &make_attr_string($args->{'force_register'}, + $args->{'add_entries'}); + $result .= "\n\n"; + } else { + $result .= + &bodytag($title, + $args->{'function'}, $args->{'add_entries'}, + $args->{'only_body'}, $args->{'domain'}, + $args->{'force_register'}, $args->{'body_title'}, + $args->{'no_nav_bar'}, $args->{'bgcolor'}); + } if ($args->{'js_ready'}) { $result = &js_ready($result); } @@ -3116,6 +3149,7 @@ sub start_page { return $result; } + =pod =over 4 @@ -3129,6 +3163,8 @@ Inputs: $args - additional optio a javascript writeln html_encode -> return a string ready for being used in a html attribute + frameset -> if true will start with a + rather than =back =cut @@ -3137,7 +3173,14 @@ sub end_page { my ($args) = @_; #&Apache::lonnet::logthis("end_page ".join(':',caller(0))); $env{'internal.end_page'}++; - my $result = &endbodytag()."\n"; + my $result; + if ($args->{'frameset'}) { + $result .= ''; + } else { + $result .= &endbodytag(); + } + $result .= "\n"; + if ($args->{'js_ready'}) { $result = &js_ready($result); } @@ -3198,7 +3241,7 @@ sub simple_error_page { &Apache::loncommon::end_page(); if (ref($r)) { $r->print($page); - return OK; + return; } return $page; } @@ -3686,8 +3729,22 @@ sub get_posted_cgi { } } } +# +# Digested POSTed values +# +# Remember the way this was originally done (GET or POST) +# $env{'request.method'}=$ENV{'REQUEST_METHOD'}; - $r->method_number(M_GET); +# +# There may also be stuff in the query string +# Tell subsequent handlers that this was GET, not POST, so they can access query string. +# Also, unset POSTed content length to cover all tracks. +# + +# This does not work, because M_GET is not defined (if it's defined, it is just 0). +# Commenting out for now ... not sure if harm is done. +# $r->method_number(M_GET); + $r->method('GET'); $r->headers_in->unset('Content-length'); }