--- rat/lonwrapper.pm 2014/05/20 11:47:06 1.47
+++ rat/lonwrapper.pm 2017/05/10 13:49:21 1.63
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.47 2014/05/20 11:47:06 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.63 2017/05/10 13:49:21 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,22 +37,36 @@ 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) = @_;
+ my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,
+ $title,$width,$height) = @_;
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 $noiframe = &Apache::loncommon::modal_link($url,$lt{'show'},500,400);
+ 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'};
+ }
+ }
+
+ my $noiframe = &Apache::loncommon::modal_link($url.$anchor,$lt{'show'},500,400);
my $args = {'bgcolor' => '#FFFFFF'};
if ($forcereg) {
$args->{'force_register'} = $forcereg;
@@ -61,44 +75,89 @@ 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'}) {
+
+ if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) {
my $output = $startpage;
if ($is_pdf) {
- my $title = $env{'form.title'};
if ($title eq '') {
- unless ($env{'request.enc'}) {
- ($title) = ($url =~ m{/([^/]+)$});
- $title =~ s/(\?[^\?]+)$//;
+ $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)').'';
+ } elsif (($exttool eq 'window') || ($exttool eq 'tab')) {
+ if ($linktext eq '') {
+ $linktext = &mt('Launch External Tool');
+ }
+ if ($exttool eq 'tab') {
+ $output .= '