--- rat/lonwrapper.pm 2017/06/22 02:11:30 1.49.2.4.2.1 +++ rat/lonwrapper.pm 2016/10/31 19:49:05 1.53 @@ -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.4.2.1 2017/06/22 02:11:30 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.53 2016/10/31 19:49:05 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,18 +38,16 @@ use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonextresedit(); use Apache::lonexttool(); -use LONCAPA qw(:DEFAULT :match); +use LONCAPA qw(:DEFAULT :match);; # ================================================================ Main Handler sub wrapper { - my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation, - $title,$width,$height) = @_; + 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', @@ -76,16 +74,13 @@ sub wrapper { $args->{'bread_crumbs'} = $brcrum; } if ($absolute) { - $args->{'use_absolute'} = $absolute; - } - if ($env{'form.only_body'}) { - $args->{'only_body'} = $env{'form.only_body'}; + $args->{'use_absolute'} = $absolute; } my $startpage = &Apache::loncommon::start_page('Menu',undef,$args); my $endpage = &Apache::loncommon::end_page(); - - if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) { + + if (($env{'browser.mobile'}) || ($exttool eq 'window')) { my $output = $startpage; if ($is_pdf) { if ($title eq '') { @@ -101,46 +96,11 @@ sub wrapper { $output .= $title.'
'; } $output .= ''.&mt('Link to PDF (for mobile devices)').''; - } elsif (($exttool eq 'window') || ($exttool eq 'tab')) { - if ($linktext eq '') { - $linktext = &mt('Launch External Tool'); - } - if ($exttool eq 'tab') { - $output .= '
'. - ''. - $linktext.''. - '
'; - } else { - $output .= <<"ENDLINK"; - -
- -$linktext -
-ENDLINK - } - if ($explanation ne '') { - $output .= '
'.$explanation.'
'; - } + } elsif ($exttool eq 'window') { + $output .= '
'. + ''. + &mt('Launch External Tool').''. + '
'; } else { $output .= '
'."\n". '