--- rat/lonwrapper.pm 2006/03/21 21:50:39 1.21 +++ rat/lonwrapper.pm 2009/11/24 05:37:35 1.37 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.21 2006/03/21 21:50:39 albertel Exp $ +# $Id: lonwrapper.pm,v 1.37 2009/11/24 05:37:35 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,13 +26,15 @@ # http://www.lon-capa.org/ # + package Apache::lonwrapper; use strict; use Apache::Constants qw(:common); use Apache::lonnet; use Apache::lonxml(); -use Apache::lonmenu; +use Apache::lonenc(); +use Apache::lonmenu(); # ================================================================ Main Handler @@ -40,60 +42,57 @@ sub simple_menu { # # Producing the menu buttons # - return '
'. - &Apache::lonmenu::menubuttons(1,'web',1).''; - + 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') { -# -# ssi-based rendering for text-based interface -# - return ''. - &Apache::lonmenu::registerurl(1). - ''. - &Apache::lonmenu::menubuttons(1). - &Apache::lonnet::ssi_body($bottomurl).''; + my %layout = ('border' => 0); + if ($env{'environment.remote'} eq 'off') { + if (($env{'request.course.id'}) && + (&Apache::lonnet::allowed('opa',$env{'request.course.id'}. + ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')))) { + $layout{'rows'} = "135,*"; + } else { + $layout{'rows'} = "100,*"; + } + } else { + $layout{'rows'} = "1,*"; + $topurl = "/adm/rat/empty.html"; } - my $events='onLoad="'.&Apache::lonmenu::loadevents. - '" onUnload="'.&Apache::lonmenu::unloadevents.'"'; - my $script=&Apache::lonmenu::registerurl(1,undef); - - my $result = <