--- rat/lonwrapper.pm 2016/11/29 19:53:58 1.54
+++ rat/lonwrapper.pm 2017/11/30 14:41:30 1.65
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.54 2016/11/29 19:53:58 damieng Exp $
+# $Id: lonwrapper.pm,v 1.65 2017/11/30 14:41:30 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,11 +38,13 @@ use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonextresedit();
use Apache::lonexttool();
-use LONCAPA qw(:DEFAULT :match);;
+use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities();
# ================================================================ Main Handler
sub wrapper {
- my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$title) = @_;
+ my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
+ $title,$width,$height) = @_;
my $forcereg;
unless ($env{'form.folderpath'}) {
@@ -74,13 +76,16 @@ sub wrapper {
$args->{'bread_crumbs'} = $brcrum;
}
if ($absolute) {
- $args->{'use_absolute'} = $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'}) || ($exttool eq 'window')) {
+ if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
my $output = $startpage;
if ($is_pdf) {
if ($title eq '') {
@@ -96,14 +101,51 @@ sub wrapper {
$output .= $title.'
';
}
$output .= ''.&mt('Link to PDF (for mobile devices)').'';
- } elsif ($exttool eq 'window') {
- $output .= '