--- rat/lonwrapper.pm 2009/10/21 22:46:31 1.34
+++ rat/lonwrapper.pm 2016/11/30 17:40:39 1.49.2.3
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.34 2009/10/21 22:46:31 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.49.2.3 2016/11/30 17:40:39 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,66 +31,120 @@ 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 wrapper {
+ my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_;
-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();
-}
+ my $forcereg;
+ unless ($env{'form.folderpath'}) {
+ $forcereg = 1;
+ }
+ my %lt = &Apache::lonlocal::texthash(
+ 'noif' => 'No iframe support.',
+ 'show' => 'Show content in pop-up window',
+ );
+
+ my $anchor;
+ if ($is_ext) {
+ if ($env{'form.symb'}) {
+ (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
+ if ($res =~ /(#[^#]+)$/) {
+ $anchor = $1;
+ }
+ } elsif ($env{'form.anchor'} ne '') {
+ $anchor = '#'.$env{'form.anchor'};
+ }
+ }
-sub wrapper {
- my ($topurl,$bottomurl) = @_;
+ my $noiframe = &Apache::loncommon::modal_link($url.$anchor,$lt{'show'},500,400);
+ 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 %layout = ('border' => 0);
- if ($env{'environment.remote'} eq 'off') {
- if ($env{'environment.icons'} eq 'iconsonly') {
- $layout{'rows'} = "100,*";
+ my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);
+ my $endpage = &Apache::loncommon::end_page();
+
+ if ($env{'browser.mobile'}) {
+ my $output = $startpage;
+ if ($is_pdf) {
+ if ($title eq '') {
+ $title = $env{'form.title'};
+ if ($title eq '') {
+ unless ($env{'request.enc'}) {
+ ($title) = ($url =~ m{/([^/]+)$});
+ $title =~ s/(\?[^\?]+)$//;
+ }
+ }
+ }
+ unless ($title eq '') {
+ $output .= $title.'
';
+ }
+ $output .= ''.&mt('Link to PDF (for mobile devices)').'';
} else {
- $layout{'rows'} = "200,*";
+ $output .= '