--- rat/lonwrapper.pm 2003/04/15 03:53:03 1.12 +++ rat/lonwrapper.pm 2008/12/19 13:47:40 1.31 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.12 2003/04/15 03:53:03 www Exp $ +# $Id: lonwrapper.pm,v 1.31 2008/12/19 13:47:40 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,102 +25,164 @@ # # http://www.lon-capa.org/ # -# (Edit Handler for RAT Maps -# (TeX Content Handler -# -# 05/29/00,05/30 Gerd Kortemeyer) -# 7/1,6/30 Gerd Kortemeyer) -# -# 7/5 Gerd Kortemeyer + package Apache::lonwrapper; use strict; use Apache::Constants qw(:common); -use Apache::lonnet(); +use Apache::lonnet; use Apache::lonxml(); -use Apache::lonmenu; +use Apache::lonenc(); +use Apache::lonmenu(); # ================================================================ Main Handler -sub handler { - my $r=shift; - $r->content_type('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; - $url=~s/^\/adm\/wrapper//; - $url=~s/^\/ext\//http\:\/\//; - 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=~/^\/uploaded\//) { - $url=&Apache::lonnet::tokenwrapper($url); - } - $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(); +} - if ($ENV{'browser.interface'} eq 'textual') { + +sub wrapper { + my ($topurl,$bottomurl) = @_; + + 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') { -# -# This is inline remote -# - $r->print(<