--- rat/lonwrapper.pm 2012/11/29 20:13:49 1.43
+++ rat/lonwrapper.pm 2020/02/17 00:58:49 1.49.2.9
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.43 2012/11/29 20:13:49 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.49.2.9 2020/02/17 00:58:49 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,59 +40,179 @@ use Apache::lonextresedit();
# ================================================================ Main Handler
sub wrapper {
- my ($url,$brcrum) = @_;
+ my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$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,$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);
+ }
+ }
+
+ my $noiframe = &Apache::loncommon::modal_link($url.$anchor,$lt{'show'},500,400);
my $args = {'bgcolor' => '#FFFFFF'};
if ($forcereg) {
$args->{'force_register'} = $forcereg;
}
if (ref($brcrum) eq 'ARRAY') {
- $args->{'bread_crumbs'} = $brcrum;
+ $args->{'bread_crumbs'} = $brcrum;
+ }
+ if ($absolute) {
+ $args->{'use_absolute'} = $absolute;
}
+ if ($env{'form.only_body'}) {
+ $args->{'only_body'} = $env{'form.only_body'};
+ }
+
+ my $headjs;
- my $startpage = Apache::loncommon::start_page('Menu',undef,$args);
- my $endpage = Apache::loncommon::end_page();
+#
+# 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 $script = Apache::lonhtmlcommon::scripttag(<