--- rat/lonwrapper.pm 2006/03/19 23:06:00 1.20 +++ rat/lonwrapper.pm 2006/04/04 15:11:48 1.22 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.20 2006/03/19 23:06:00 albertel Exp $ +# $Id: lonwrapper.pm,v 1.22 2006/04/04 15:11:48 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -36,95 +36,109 @@ use Apache::lonmenu; # ================================================================ Main Handler -sub handler { - my $r=shift; - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - - return OK if $r->header_only; - - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['wrapperdisplay']); - my $orgurl=$r->uri; - my $url=$orgurl; - $orgurl.=(($orgurl=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; - $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu'; - $url=~s/^\/adm\/wrapper//; - my $is_ext = $url =~ m|^/ext/|; - $url=~s/^\/ext\//http\:\/\//; - $url=~s|:|:|g; - if ($env{'form.wrapperdisplay'} eq 'menu') { +sub simple_menu { # # Producing the menu buttons # - $r->print('
'. - &Apache::lonmenu::menubuttons(1,'web',1).''); - } else { -# -# Actual URL -# - if ($url=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { -# -# This is uploaded homework -# - $env{'request.state'}='uploaded'; - &Apache::lonhomework::renderpage($r,$url); - } else { -# -# This is not homework -# - if ($is_ext) { - $ENV{'QUERY_STRING'}=~s/(^|\&)symb=[^\&]*/$1/; - } - $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; - # reappend the query arguments - my $events='onLoad="'.&Apache::lonmenu::loadevents. - '" onUnload="'.&Apache::lonmenu::unloadevents.'"'; - my $script=&Apache::lonmenu::registerurl(1,undef); + return &Apache::loncommon::start_page('Menu',undef, + {'only_body' => 1, + 'bgcolor' => '#FFFFFF',}). + &Apache::lonmenu::menubuttons(1,'web',1). + &Apache::loncommon::end_page(); +} + + +sub wrapper { + my ($topurl,$bottomurl) = @_; - if ($env{'browser.interface'} eq 'textual') { + if ($env{'browser.interface'} eq 'textual') { # # ssi-based rendering for text-based interface # - $r->print(''. - &Apache::lonmenu::registerurl(1). - ''. - &Apache::lonmenu::menubuttons(1). - &Apache::lonnet::ssi_body($url).''); - } elsif ($env{'environment.remote'} eq 'off') { + return + &Apache::loncommon::start_page('Menu',undef, + {'bgcolor' => '#FFFFFF', + 'force_register' => 1, + }). + &Apache::lonnet::ssi_body($bottomurl). + &Apache::loncommon::end_page(); + } + + my $events='onLoad="'.&Apache::lonmenu::loadevents. + '" onUnload="'.&Apache::lonmenu::unloadevents.'"'; + + my $result = &Apache::lonxml::xmlbegin(). + &Apache::loncommon::head(undef,undef, + {'force_register' => 1}); + + if ($env{'environment.remote'} eq 'off') { # # This is inline remote # - $r->print(<