--- rat/lonwrapper.pm 2008/12/19 14:30:51 1.32
+++ rat/lonwrapper.pm 2013/10/15 10:17:19 1.45
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.32 2008/12/19 14:30:51 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.45 2013/10/15 10:17:19 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,80 +31,71 @@ 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,$absolute,$is_ext) = @_;
- 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;
+ }
+ if (ref($brcrum) eq 'ARRAY') {
+ $args->{'bread_crumbs'} = $brcrum;
+ }
+ if ($absolute) {
+ $args->{'use_absolute'} = $absolute;
}
- 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);
- }
- }
-#
-# frame-based rendering for graphical interface
-#
- my $result =<
-
-$end_page
-ENDDOCUMENT
+ my $startpage = Apache::loncommon::start_page('Menu',undef,$args);
+ my $endpage = Apache::loncommon::end_page();
- return $result;
+ my $script = Apache::lonhtmlcommon::scripttag(<