--- rat/lonwrapper.pm 2013/10/22 23:13:54 1.46 +++ rat/lonwrapper.pm 2014/05/20 11:47:06 1.47 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.46 2013/10/22 23:13:54 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.47 2014/05/20 11:47:06 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,7 +40,7 @@ use Apache::lonextresedit(); # ================================================================ Main Handler sub wrapper { - my ($url,$brcrum,$absolute,$is_ext) = @_; + my ($url,$brcrum,$absolute,$is_ext,$is_pdf) = @_; my $forcereg; unless ($env{'form.folderpath'}) { @@ -68,15 +68,31 @@ sub wrapper { my $endpage = &Apache::loncommon::end_page(); if ($env{'browser.mobile'}) { - return < - - - $endpage -ENDFRAME + my $output = $startpage; + if ($is_pdf) { + my $title = $env{'form.title'}; + if ($title eq '') { + unless ($env{'request.enc'}) { + ($title) = ($url =~ m{/([^/]+)$}); + $title =~ s/(\?[^\?]+)$//; + } + } + unless ($title eq '') { + $output .= $title.'
'; + } + $output .= ''.&mt('Link to PDF (for mobile devices)').''; + } else { + $output .= '
'."\n". + '\n". + "
\n"; + $output .= ''; + } + $output .= $endpage; + return $output; } else { my $script = &Apache::lonhtmlcommon::scripttag(<header_only; my $url = $r->uri; - my ($is_ext,$brcrum,$absolute); + my ($is_ext,$brcrum,$absolute,$is_pdf); for ($url){ s|^/adm/wrapper||; @@ -132,6 +148,10 @@ sub handler { s|:|:|g; } + if ($url =~ /\.pdf$/i) { + $is_pdf = 1; + } + if ($is_ext) { my $hostname = $r->hostname(); my $lonhost = &Apache::lonnet::host_from_dns($hostname); @@ -189,7 +209,7 @@ sub handler { # encrypt url if not external &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ; - $r->print( wrapper($url,$brcrum,$absolute,$is_ext) ); + $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf) ); } # not just the menu @@ -216,7 +236,7 @@ described at http://www.lon-capa.org. =over -=item wrapper($url,$brcrum,$absolute,$is_ext) +=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf)) =over @@ -252,6 +272,10 @@ in Firefox 23 and later, when serving fr true if URL is for an external resource. +=item $is_pdf + +true if URL is for a PDF (based on file extension). + =back Returns markup for the entire page.