--- rat/lonwrapper.pm 2016/08/05 21:34:54 1.49.2.1
+++ rat/lonwrapper.pm 2017/02/25 19:39:10 1.57
@@ -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.1 2016/08/05 21:34:54 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.57 2017/02/25 19:39:10 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -37,26 +37,31 @@ 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',
);
my $anchor;
- if (($is_ext) && ($env{'form.symb'})) {
- (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
- if ($res =~ /(\#.+)$/) {
- $anchor = $1;
+ 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'};
}
}
@@ -69,13 +74,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'}) {
+
+ if (($env{'browser.mobile'}) || ($exttool eq 'window')) {
my $output = $startpage;
if ($is_pdf) {
if ($title eq '') {
@@ -91,6 +99,11 @@ sub wrapper {
$output .= $title.'
';
}
$output .= ''.&mt('Link to PDF (for mobile devices)').'';
+ } elsif ($exttool eq 'window') {
+ $output .= '