--- rat/lonwrapper.pm 2023/10/06 17:35:54 1.49.2.11.2.5 +++ rat/lonwrapper.pm 2020/02/17 00:13:22 1.74 @@ -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.11.2.5 2023/10/06 17:35:54 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.74 2020/02/17 00:13:22 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,15 +39,13 @@ 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,$reuse,$is_supp) = @_; + $title,$width,$height) = @_; my $forcereg; unless ($env{'form.folderpath'}) { @@ -58,9 +56,6 @@ sub wrapper { 'show' => 'Show content in pop-up window', ); - (undef,undef,undef,undef,undef,undef,my $clientmobile) = - &Apache::loncommon::decode_user_agent($r); - my ($anchor,$uselink); if ($is_ext) { if ($env{'form.symb'}) { @@ -71,10 +66,7 @@ sub wrapper { } elsif ($env{'form.anchor'} ne '') { $anchor = '#'.$env{'form.anchor'}; } - if (($is_ext eq 'tab') || ($is_ext eq 'window')) { - $uselink = 1; - } - unless (($is_pdf && $clientmobile) || $uselink) { + unless (($is_pdf) && ($env{'browser.mobile'})) { my $hostname = $r->hostname(); my $lonhost = $r->dir_config('lonHostID'); my $ip = &Apache::lonnet::get_host_ip($lonhost); @@ -95,8 +87,6 @@ sub wrapper { } if ($env{'form.only_body'}) { $args->{'only_body'} = $env{'form.only_body'}; - } elsif (($is_supp) && ($env{'form.folderpath'} ne '')) { - $args->{'bread_crumbs_nomenu'} = 1; } my ($countdown,$donemsg,$headjs); @@ -152,7 +142,7 @@ sub wrapper { # do not obscure the Functions menu. # - unless ($clientmobile || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) { + unless (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) { $headjs = ' -