--- rat/lonwrapper.pm 2020/02/17 01:31:20 1.49.2.7.2.2
+++ rat/lonwrapper.pm 2020/01/14 16:48:06 1.71
@@ -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.7.2.2 2020/02/17 01:31:20 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.71 2020/01/14 16:48:06 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,6 +38,7 @@ use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::lonextresedit();
use Apache::lonexttool();
+use Apache::lonhomework();
use LONCAPA qw(:DEFAULT :match);
use HTML::Entities();
@@ -50,7 +51,6 @@ sub wrapper {
unless ($env{'form.folderpath'}) {
$forcereg = 1;
}
-
my %lt = &Apache::lonlocal::texthash(
'noif' => 'No iframe support.',
'show' => 'Show content in pop-up window',
@@ -89,26 +89,53 @@ sub wrapper {
$args->{'only_body'} = $env{'form.only_body'};
}
- my $headjs;
-
-#
-# Where iframe is in use, if window.onload() executes before the custom resize function
-# has been defined (jQuery), two global javascript vars (LCnotready and LCresizedef)
-# are used to ensure document.ready() triggers a call to resize, so the iframe contents
-# do not obscure the Functions menu.
-#
-
- unless (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) {
- $headjs = '
+ my ($countdown,$donemsg);
+ if (($exttool) && (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i)) {
+ $Apache::lonhomework::browse = &Apache::lonnet::allowed('bre',$url);
+ if ($env{'form.markaccess'}) {
+ my $symb=&Apache::lonnet::symbread($url);
+ my @interval=&Apache::lonnet::EXT('resource.0.interval',$symb);
+ my ($timelimit) = split(/_/,$interval[0]);
+ my $setres = &Apache::lonnet::set_first_access($interval[1],$timelimit);
+ if ($setres eq 'ok') {
+ delete($env{'form.markaccess'});
+ }
+ } elsif ($env{'form.LC_interval_done'} eq 'true') {
+ my $symb=&Apache::lonnet::symbread($url);
+ if ($symb) {
+ (my $donebuttonresult,$donemsg) = &Apache::lonhomework::zero_timer($symb);
+ undef($env{'form.LC_interval_done'});
+ undef($env{'form.LC_interval_done_proctorpass'});
+ }
+ }
+ my ($status,$result,$resource_due) =
+ &Apache::lonexttool::gradabletool_access_check();
+ undef($Apache::lonhomework::browse);
+ if ($status eq 'CAN_ANSWER') {
+ if ($resource_due) {
+ my $time_left = $resource_due - time();
+ if ($resource_due && ($time_left > 0)) {
+ $countdown ='
'."\n";
+'."\n".
+ &Apache::lonhtmlcommon::set_due_date($resource_due);
+ }
+ }
+ } else {
+ if ($status eq 'SHOW_ANSWER') {
+ $result = &Apache::lonexttool::display_score().
+ &Apache::lonfeedback::list_discussion('tool','OPEN');
+ }
+ return &Apache::loncommon::start_page('Menu',undef,$args).
+ $result.
+ &Apache::loncommon::end_page();
+ }
}
- my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args);
+ my $startpage = &Apache::loncommon::start_page('Menu',undef,$args).$countdown.$donemsg;
my $endpage = &Apache::loncommon::end_page();
if (($uselink) && ($title eq '')) {
@@ -167,6 +194,9 @@ ENDLINK
if ($explanation ne '') {
$output .= ''.$explanation.'
';
}
+ if (&Apache::lonnet::EXT('resource.0.gradable')) {
+ $output .= &Apache::lonfeedback::list_discussion('tool','OPEN');
+ }
} else {
if ($uselink) {
$linktext = &mt('Link to resource');
@@ -213,20 +243,8 @@ ENDLINK
var pos = height + hdrtop + offset;
\$('.LC_iframecontainer').css('top', pos);
});
- LCresizedef = 1;
- if (LCnotready == 1) {
- LCnotready = 0;
- \$(window).trigger('resize');
- }
});
- window.onload = function(){
- if (LCresizedef) {
- LCnotready = 0;
- \$(window).trigger('resize');
- } else {
- LCnotready = 1;
- }
- };
+ window.onload = function(){ \$(window).trigger('resize') };
SCRIPT
# javascript will position the iframe if window was resized (or zoomed)
my $dest = &HTML::Entities::encode($url.$anchor,'&<>"');
@@ -274,8 +292,8 @@ sub handler {
for ($url){
s|^/adm/wrapper||;
- $is_ext = $_ =~ s|^/ext/|http://|;
- s|http://https://?|https://| if ($is_ext);
+ $is_ext = $_ =~ s|^/ext/|http://|;
+ s|http://https://|https://|;
s|:|:|g;
}
@@ -419,8 +437,11 @@ request object
=item $url
-url to display by including in an iframe within a
-LON-CAPA page which has a standard LON-CAPA inline menu.
+url to display either by including in an iframe within a
+LON-CAPA page which has a standard LON-CAPA inline menu,
+or in some cases launched in a separate tab or window,
+launched via a link in a LON-CAPA page with standard inline
+menu.
=item $brcrum
@@ -455,6 +476,22 @@ true if URL is for an external resource.
true if URL is for a PDF (based on file extension).
+=item $exttool
+
+If URL is for an External Tool, will contain the target type: iframe, window or tab.
+
+=item $linktext
+
+optional. If URL is for an External Tool, and target type is window or tab,
+then the link text may be an option set in the course for each tool instance,
+or may be a default defined in the domain for all instances of the tool.
+
+=item $explanation
+
+optional. If URL is for an External Tool, and target type is window or tab,
+then the explanation is an option set in the course for each tool instance,
+or may be a default defined in the domain for all instances of the tool.
+
=item $title
optional. If wrapped item is a PDF, and $env{'browser.mobile'}
@@ -463,12 +500,45 @@ above the link, but if not provided as a
will be used, otherwise, the filename will be displayed (unless
hidden URL set for the resource).
+=item $width
+
+optional. If URL is for an External Tool, and target type is window,
+then a default width may have been defined in the domain for all instances of
+the tool. If so, that width will be used for the window opened (via a link)
+to launch the external tool.
+
+=item $height
+
+optional. If URL is for an External Tool, and target type is window,
+then a default height may have been defined in the domain for all instances of
+the tool. If so, that height will be used for the window opened (via a link)
+to launch the external tool.
+
=back
Returns markup for the entire page.
=item handler()
+Content handler for requests for: /adm/wrapper/...
+used for content to be displayed in an iframe, or launched in a separate tab
+or window via a link. The target URL is extracted from the requested URL, by
+removing the /adm/wrapper prefix.
+
+The target URL will typically be a PDF served from the current server, an
+external resource URL served from a different server, or an external tool
+(from an LTI Provider) launched from LON-CAPA (as LTI Consumer) and launched
+via a link.
+
+If the request included forceedit in the query string, and the requester has
+rights to modify course content, then the editor will be didplayed to allow
+changes to be made to the resource (e.g., change the URL of the external resource,
+or change the setting for the external tool instance.
+
+If not in edit mode, then the wrapper() subroutine will be called to generate the
+standard LON-CAPA inline menu, and then either a link to launch a separate tab or
+window, or an iframe to display the content inline.
+
=back
=cut