--- rat/lonwrapper.pm 2016/11/30 16:02:27 1.55 +++ rat/lonwrapper.pm 2017/05/10 13:49:21 1.63 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.55 2016/11/30 16:02:27 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.63 2017/05/10 13:49:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,7 +42,8 @@ use LONCAPA qw(:DEFAULT :match);; # ================================================================ Main Handler sub wrapper { - my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$title) = @_; + my ($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation, + $title,$width,$height) = @_; my $forcereg; unless ($env{'form.folderpath'}) { @@ -74,13 +75,16 @@ 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 $startpage = &Apache::loncommon::start_page('Menu',undef,$args); my $endpage = &Apache::loncommon::end_page(); - if (($env{'browser.mobile'}) || ($exttool eq 'window')) { + if (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab')) { my $output = $startpage; if ($is_pdf) { if ($title eq '') { @@ -96,11 +100,44 @@ sub wrapper { $output .= $title.'
'; } $output .= ''.&mt('Link to PDF (for mobile devices)').''; - } elsif ($exttool eq 'window') { - $output .= '
'. - ''. - &mt('Launch External Tool').''. - '
'; + } 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.'
'; + } } else { $output .= '
'."\n". '