--- rat/lonwrapper.pm 2008/12/21 04:49:58 1.28.2.1 +++ rat/lonwrapper.pm 2010/03/03 21:33:20 1.38 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.28.2.1 2008/12/21 04:49:58 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.38 2010/03/03 21:33:20 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -26,84 +26,41 @@ # http://www.lon-capa.org/ # + package Apache::lonwrapper; use strict; use Apache::Constants qw(:common); -use Apache::lonnet; -use Apache::lonxml(); use Apache::lonenc(); -use Apache::lonmenu(); +use Apache::lonnet; # ================================================================ Main Handler - -sub simple_menu { -# -# Producing the menu buttons -# - return &Apache::loncommon::start_page('Menu',undef, - {'only_body' => 1, - 'bgcolor' => '#FFFFFF',}). - &Apache::lonmenu::menubuttons(1,'web',1). - &Apache::loncommon::end_page(); -} - - sub wrapper { - my ($topurl,$bottomurl) = @_; + my $url = shift; - if ($env{'browser.interface'} eq 'textual') { -# -# ssi-based rendering for text-based interface -# - return - &Apache::loncommon::start_page('Menu',undef, - {'bgcolor' => '#FFFFFF', - 'force_register' => 1, - }). - &Apache::lonnet::ssi_body($bottomurl). - &Apache::loncommon::end_page(); - } - - - my %layout = ('border' => 0); - if ($env{'environment.remote'} eq 'off') { - if ($env{'environment.icons'} eq 'iconsonly') { - $layout{'rows'} = "100,*"; - } else { - $layout{'rows'} = "200,*"; - } - } else { - $layout{'rows'} = "1,*"; - $topurl = "/adm/rat/empty.html"; - } - - my $start_page = - &Apache::loncommon::start_page(undef,undef, - {'force_register' => 1, - 'frameset' => 1, - 'add_entries' => \%layout, }); - - my $end_page = - &Apache::loncommon::end_page({'frameset' => 1}); - - foreach my $url ($topurl,$bottomurl) { - if ($url !~ /^https?\:/) { - $url = &Apache::lonenc::check_encrypt($url); - } - } -# -# frame-based rendering for graphical interface -# - my $result =< - -$end_page -ENDDOCUMENT - - return $result; + my $startpage = Apache::loncommon::start_page('Menu',undef, + { 'force_register' =>1, 'bgcolor' => '#FFFFFF',}) ; + my $endpage = Apache::loncommon::end_page(); + + # javascript will position the iframe if window was resized (or zoomed) + return < + \$(document).ready( function() { + \$(window).unbind('resize').resize(function(){ + var header = \$('#LC_head_subbox')[0] ? \$('#LC_head_subbox') : \$('#LC_breadcrumbs'); + var pos = header.height() + header.position().top + 5; + \$('.iframecontainer').css('top', pos); + }); + }); + window.onload = function(){ \$(window).trigger('resize') }; + + +
+ +
+ $endpage +ENDFRAME } sub handler { @@ -113,22 +70,16 @@ sub handler { return OK if $r->header_only; - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['wrapperdisplay']); - if ($env{'form.wrapperdisplay'} eq 'menu') { - $r->print(&simple_menu()); - return OK; + my $url = $r->uri; + my $is_ext; + + for ($url){ + s|^/adm/wrapper||; + $is_ext = $_ =~ s|^/ext/|http://|; + s|http://https://|https://|; + s|:|:|g; } - my $orgurl=$r->uri; - my $url=$orgurl; - $orgurl.=(($orgurl=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; - $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu'; - $url=~s/^\/adm\/wrapper//; - my $is_ext = $url =~ m|^/ext/|; - $url=~s{^/ext/}{http://}; - $url=~s|http://https://|https://|; - $url=~s|:|:|g; # # Actual URL # @@ -136,25 +87,62 @@ sub handler { # # This is uploaded homework # - $env{'request.state'}='uploaded'; - &Apache::lonhomework::renderpage($r,$url); + $env{'request.state'}='uploaded'; + &Apache::lonhomework::renderpage($r,$url); } else { # # This is not homework # - if ($is_ext) { - $ENV{'QUERY_STRING'}=~s/(^|\&)symb=[^\&]*/$1/; - } - $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; - # reappend the query arguments - $r->print(&wrapper($orgurl,$url)); + if ($is_ext) { + $ENV{'QUERY_STRING'} =~ s/(^|\&)symb=[^\&]*/$1/; + $ENV{'QUERY_STRING'} =~ s/\&$//; + } + + unless ($ENV{'QUERY_STRING'} eq '') { + $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; + } + + # encrypt url if not external + &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ; + + $r->print( wrapper($url) ); + } # not just the menu + return OK; } # handler 1; __END__ +=pod + +=head1 NAME + +Apache::lonwrapper - External and binary file management. + +=head1 SYNOPSIS + +Wrapper for external and binary files as standalone resources. Edit handler for rat maps; TeX content handler. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 Subroutines + +=over + +=item wrapper($url) + +Wraps $url in an iframe and generates a page for it. +Returns markup for the entire page. + +=item handler() + +=back + +=cut +