--- rat/lonwrapper.pm 2010/02/11 15:12:11 1.32.2.2 +++ rat/lonwrapper.pm 2012/11/27 23:45:15 1.42 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.32.2.2 2010/02/11 15:12:11 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.42 2012/11/27 23:45:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,80 +31,68 @@ package Apache::lonwrapper; use strict; use Apache::Constants qw(:common); -use Apache::lonnet; -use Apache::lonxml(); use Apache::lonenc(); -use Apache::lonmenu(); +use Apache::lonnet; +use Apache::lonlocal; +use Apache::loncommon(); +use Apache::lonhtmlcommon(); +use Apache::lonextresedit(); # ================================================================ Main Handler - -sub simple_menu { -# -# Producing the menu buttons -# - 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) = @_; + my ($url,$brcrum) = @_; - if ($env{'browser.interface'} eq 'textual') { -# -# ssi-based rendering for text-based interface -# - return - &Apache::loncommon::start_page('Menu',undef, - {'bgcolor' => '#FFFFFF', - 'force_register' => 1, - }). - &Apache::lonnet::ssi_body($bottomurl). - &Apache::loncommon::end_page(); + my $forcereg; + unless ($env{'form.folderpath'}) { + $forcereg = 1; } - - my %layout = ('border' => 0); - if ($env{'environment.remote'} eq 'off') { - if ($env{'environment.icons'} eq 'iconsonly') { - $layout{'rows'} = "100,*"; - } else { - $layout{'rows'} = "200,*"; - } - } else { - $layout{'rows'} = "1,*"; - $topurl = "/adm/rat/empty.html"; + my $args = {'bgcolor' => '#FFFFFF'}; + if ($forcereg) { + $args->{'force_register'} = $forcereg; } - - my $start_page = - &Apache::loncommon::start_page(undef,undef, - {'force_register' => 1, - 'frameset' => 1, - 'add_entries' => \%layout, }); - - my $end_page = - &Apache::loncommon::end_page({'frameset' => 1}); - - foreach my $url ($topurl,$bottomurl) { - if ($url !~ /^https?\:/) { - $url = &Apache::lonenc::check_encrypt($url); - } + if (ref($brcrum) eq 'ARRAY') { + $args->{'bread_crumbs'} = $brcrum; } -# -# frame-based rendering for graphical interface -# - my $result =< - -$end_page -ENDDOCUMENT - return $result; + my $startpage = Apache::loncommon::start_page('Menu',undef,$args); + my $endpage = Apache::loncommon::end_page(); + + my $script = Apache::lonhtmlcommon::scripttag(<