--- rat/lonwrapper.pm 2021/10/19 00:16:32 1.77 +++ rat/lonwrapper.pm 2022/08/28 02:41:30 1.78 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.77 2021/10/19 00:16:32 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.78 2022/08/28 02:41:30 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,13 +39,15 @@ use Apache::lonhtmlcommon(); use Apache::lonextresedit(); use Apache::lonexttool(); use Apache::lonhomework(); +use Apache::lonnavmaps(); use LONCAPA qw(:DEFAULT :match); use HTML::Entities(); +use Digest::MD5(); # ================================================================ Main Handler sub wrapper { my ($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation, - $title,$width,$height) = @_; + $title,$width,$height,$reuse) = @_; my $forcereg; unless ($env{'form.folderpath'}) { @@ -69,7 +71,10 @@ sub wrapper { } elsif ($env{'form.anchor'} ne '') { $anchor = '#'.$env{'form.anchor'}; } - unless (($is_pdf) && ($clientmobile)) { + if (($is_ext eq 'tab') || ($is_ext eq 'window')) { + $uselink = 1; + } + unless (($is_pdf && $clientmobile) || $uselink) { my $hostname = $r->hostname(); my $lonhost = $r->dir_config('lonHostID'); my $ip = &Apache::lonnet::get_host_ip($lonhost); @@ -168,22 +173,79 @@ var LCresizedef = 0; } } } - if ($clientmobile || ($exttool eq 'window') || ($exttool eq 'tab')) { + if ($clientmobile || ($exttool eq 'window') || ($exttool eq 'tab') || + ($is_ext eq 'tab') || ($is_ext eq 'window')) { my $output = $startpage; if ($is_pdf) { $linktext = &mt('Link to PDF (for mobile devices)'); $output .= &create_link($url,$anchor,$title,$linktext); - } elsif (($exttool eq 'window') || ($exttool eq 'tab')) { + } elsif (($exttool eq 'window') || ($exttool eq 'tab') || + ($is_ext eq 'tab') || ($is_ext eq 'window')) { + my $preamble; if ($linktext eq '') { - $linktext = &mt('Launch External Tool'); + if ($exttool) { + $linktext = &mt('Launch External Tool'); + } else { + $linktext = &mt('Link to External Resource'); + } + } + if ($exttool) { + $url = &HTML::Entities::encode($url,'"<>&'); + } else { + $url = &HTML::Entities::encode($url.$anchor,'&<>"'); } - $url = &HTML::Entities::encode($url,'"<>&'); - if ($exttool eq 'tab') { - $output .= '