--- rat/lonwrapper.pm 2016/11/30 17:40:39 1.49.2.3
+++ rat/lonwrapper.pm 2017/02/07 02:07:28 1.56
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.49.2.3 2016/11/30 17:40:39 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.56 2017/02/07 02:07:28 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,16 +37,17 @@ use Apache::lonlocal;
use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonextresedit();
+use Apache::lonexttool();
+use LONCAPA qw(:DEFAULT :match);;
# ================================================================ Main Handler
sub wrapper {
- my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_;
+ my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$title) = @_;
my $forcereg;
unless ($env{'form.folderpath'}) {
$forcereg = 1;
}
-
my %lt = &Apache::lonlocal::texthash(
'noif' => 'No iframe support.',
'show' => 'Show content in pop-up window',
@@ -75,11 +76,14 @@ sub wrapper {
if ($absolute) {
$args->{'use_absolute'} = $absolute;
}
+ if ($env{'form.only_body'}) {
+ $args->{'only_body'} = $env{'form.only_body'};
+ }
my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);
my $endpage = &Apache::loncommon::end_page();
-
- if ($env{'browser.mobile'}) {
+
+ if (($env{'browser.mobile'}) || ($exttool eq 'window')) {
my $output = $startpage;
if ($is_pdf) {
if ($title eq '') {
@@ -95,6 +99,11 @@ sub wrapper {
$output .= $title.'
';
}
$output .= ''.&mt('Link to PDF (for mobile devices)').'';
+ } elsif ($exttool eq 'window') {
+ $output .= '