--- rat/lonwrapper.pm 2016/08/05 21:34:54 1.49.2.1
+++ rat/lonwrapper.pm 2020/02/16 23:52:03 1.49.2.8
@@ -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.49.2.8 2020/02/16 23:52:03 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,7 +40,7 @@ use Apache::lonextresedit();
# ================================================================ Main Handler
sub wrapper {
- my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_;
+ my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$title) = @_;
my $forcereg;
unless ($env{'form.folderpath'}) {
@@ -52,11 +52,21 @@ sub wrapper {
'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;
+ my ($anchor,$uselink,$linktext);
+ 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'};
+ }
+ unless (($is_pdf) && ($env{'browser.mobile'})) {
+ my $hostname = $r->hostname();
+ my $lonhost = $r->dir_config('lonHostID');
+ my $ip = &Apache::lonnet::get_host_ip($lonhost);
+ $uselink = &Apache::loncommon::is_nonframeable($url,$absolute,$hostname,$ip);
}
}
@@ -69,43 +79,77 @@ 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 $headjs;
+
+#
+# Where iframe is in use, if window.onload() executes before the custom resize function
+# has been defined (jQuery), two global javascript vars (LCnotready and LCresizedef)
+# are used to ensure document.ready() triggers a call to resize, so the iframe contents
+# do not obscure the Functions menu.
+#
+
+ unless (($env{'browser.mobile'}) || $uselink) {
+ $headjs = '
+'."\n";
- my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);
+ my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args);
my $endpage = &Apache::loncommon::end_page();
+ if (($uselink) && ($title eq '')) {
+ if ($env{'form.symb'}) {
+ $title=&Apache::lonnet::gettitle($env{'form.symb'});
+ } else {
+ my $symb=&Apache::lonnet::symbread($r->uri);
+ if ($symb) {
+ $title=&Apache::lonnet::gettitle($symb);
+ }
+ }
+ }
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)').'';
+ $linktext = &mt('Link to PDF (for mobile devices)');
+ $output .= &create_link($url,$anchor,$title,$linktext);
} else {
- $output .= '