'.
+ ''.
$linktext.''.
'
';
} else {
- my ($target,$extlinkimg);
- if ($exttool) {
- $target = 'LCExternalToolPopUp';
- } else {
- $target = 'LCExternalResPopUp';
- if ($title ne '') {
- $preamble = ''.$title.''; - } - $extlinkimg = '
.'/externallink.gif').'){kind=small}
';
- unless ($reuse) {
- my $resid;
- if ($env{'request.course.id'}) {
- unless (($is_supp) || ($env{'form.folderpath'} =~ /^supplemental/)) {
- my $symb=&Apache::lonnet::symbread($r->uri);
- if ($symb) {
- my $navmap = Apache::lonnavmaps::navmap->new();
- if (ref($navmap)) {
- my $res = $navmap->getBySymb($symb);
- if (ref($res)) {
- $resid = $res->id;
- $resid =~ s/\./_/g;
- }
- }
- }
- }
- }
- if ($resid eq '') {
- $resid = substr(Digest::MD5::md5_hex(Digest::MD5::md5_hex(time(). {}. rand(). $$)), 0, 8);
- }
- &js_escape(\$resid);
- $target .= $resid;
- }
- }
$output .= <<"ENDLINK";
-$preamble
-
-$linktext$extlinkimg
+
ENDLINK
}
- if ($exttool) {
- if ($explanation ne '') {
- $output .= '
'; - } - my $dest = &HTML::Entities::encode($url.$anchor,'&<>"'); - $shownlink .= ''.$linktext.''; - return $shownlink; -} - sub handler { my $r=shift; &Apache::loncommon::content_type($r,'text/html'); @@ -384,38 +224,18 @@ sub handler { my $url = $r->uri; my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname, - $linktext,$explanation,$width,$height,$reuse,$is_supp); + $linktext,$explanation,$width,$height); for ($url){ s|^/adm/wrapper||; - $is_ext = $_ =~ s|^/ext/|http://|; - s|http://https://|https://| if ($is_ext); - s|:|:|g; + $is_ext = $_ =~ s|^/ext/|http://|; + s|http://https://|https://|; + s|:|:|g; } + if ($url =~ /\.pdf$/i) { $is_pdf = 1; - } elsif (($is_ext) && ($env{'request.course.id'})) { - if ($env{'course.'.$env{'request.course.id'}.'.extresource'}) { - (my $selected,$reuse,$width,$height) = split(/:/,$env{'course.'.$env{'request.course.id'}.'.extresource'}); - if ($selected eq 'tab') { - $is_ext = 'tab'; - $width = ''; - $height = ''; - } elsif ($selected eq 'window') { - $is_ext = 'window'; - unless ($width =~ /^\d+$/) { - $width = ''; - } - unless ($height =~ /^\d+$/) { - $height = ''; - } - } else { - $width = ''; - $height = ''; - $reuse = ''; - } - } } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { $cdom = $1; $cnum = $2; @@ -425,16 +245,9 @@ sub handler { my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation','id','width','height'], $cdom,$cnum); if ($toolhash{'id'}) { - my ($idx,%ltitools); - if ($toolhash{'id'} =~ /^c(\d+)$/) { - $idx = $1; - %ltitools = &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer'); - } else { - $idx = $toolhash{'id'}; - %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); - } - if (ref($ltitools{$idx}) eq 'HASH') { - $exttoolremote = $ltitools{$idx}{'url'}; + my %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); + if (ref($ltitools{$toolhash{'id'}}) eq 'HASH') { + $exttoolremote = $ltitools{$toolhash{'id'}}{'url'}; } } if ($toolhash{'target'} eq 'window') { @@ -442,10 +255,10 @@ sub handler { $width = $toolhash{'width'}; $height = $toolhash{'height'}; } elsif ($toolhash{'target'} eq 'tab') { - $exttool = 'tab'; + $exttool = 'tab'; } if (($exttool eq 'window') || ($exttool eq 'tab')) { - $linktext = $toolhash{'linktext'}; + $linktext = $toolhash{'linktext'}; $explanation = $toolhash{'explanation'}; } elsif (($exttoolremote =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) { $exttool = 'tab'; @@ -467,7 +280,6 @@ sub handler { if ($env{'form.anchor'} ne '') { $url .= '#'.$env{'form.anchor'}; } - $is_supp = 1; } my $type = 'ext'; if ($exttool) { @@ -491,34 +303,8 @@ sub handler { $title = &mt('External Tool'); } } - $title = &HTML::Entities::encode($title,'\'"<>&'); - $is_supp = 1; - if ($env{'request.course.id'}) { - $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom); - } - $brcrum = - &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); - } - } elsif ($env{'request.course.id'}) { - my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'}); - $courseurl =~ s{^/}{}; - if ($url =~ m{^\Q/uploaded/$courseurl/supplemental/\E}) { - $is_supp = 1; - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['folderpath','title']); - if ($env{'form.folderpath'}) { - $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom); - } - my $title = $env{'form.title'}; - $title = &HTML::Entities::encode($title,'\'"<>&'); - my $crstype = &Apache::loncommon::course_type(); $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); - } } @@ -550,9 +336,8 @@ sub handler { &Apache::lonenc::check_encrypt(\$url); } - $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool, - $linktext,$explanation,undef,$width,$height,$reuse, - $is_supp) ); + $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool, + $linktext,$explanation,undef,$width,$height) ); } # not just the menu @@ -579,21 +364,14 @@ described at http://www.lon-capa.org. =over -=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height,$reuse,$is_supp) +=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$linktext,$explanation,$title,$width,$height) =over -=item $r - -request object - =item $url -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. +url to display by including in an iframe within a +LON-CAPA page which has a standard LON-CAPA inline menu. =item $brcrum @@ -622,89 +400,26 @@ in Firefox 23 and later, when serving fr =item $is_ext -true if URL is for an external resource. Default true value -is 1 (display in iframe, unless $uselink is true). -If external resource is to be displayed in a tab, -value of $is_ext will be tab, if to be displayed in a pop-up window, -value of $is_ext will be window. +true if URL is for an external resource. =item $is_pdf 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 $clientmobile is true, -a link to a PDF is shown. The "title" will be displayed +optional. If wrapped item is a PDF, and $env{'browser.mobile'} +is true, a link to a PDF is shown. The "title" will be displayed above the link, but if not provided as an arg, $env{'form.title'} 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. If the URL is for an External Resource, and -$is_ext is window, then a default width (px) may have been defined in the current -course for all external resource instances. - -=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. If the URL is for an External Resource, and -$is_ext is window, then a default height (px) may have been defined in the current -course for all external resource instances. - -=item $reuse - -optional. If the URL is for an External Resource, and $is_ext is tab or window, -then $reuse will be true if the same tab or window is to be reused for display -of all external resource instances in a a course. - =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 displayed 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
'.$explanation.'
';
- }
- if (&Apache::lonnet::EXT('resource.0.gradable')) {
- $output .= &Apache::lonfeedback::list_discussion('tool','OPEN');
- }
+ if ($explanation ne '') {
+ $output .= ''.$explanation.'
';
}
- } else {
- if ($uselink) {
- $linktext = &mt('Link to resource');
- $output .= &create_link($url,$anchor,$title,$linktext);
- } else {
- my $dest = &HTML::Entities::encode($url.$anchor,'&<>"');
- $output .= ''."\n".
- '\n".
- "
\n";
+ if (&Apache::lonnet::EXT('resource.0.gradable')) {
+ $output .= &Apache::lonfeedback::list_discussion('tool','OPEN');
}
+ } else {
+ my $dest = &HTML::Entities::encode($url.$anchor,'&<>"');
+ $output .= ''."\n".
+ '\n".
+ "
\n";
}
$output .= $endpage;
return $output;
- } elsif ($uselink) {
- $linktext = &mt('Link to resource');
- return $startpage.&create_link($url,$anchor,$title,$linktext).$endpage;
} else {
my $offset = 5;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
@@ -327,20 +199,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,'&<>"');
@@ -355,26 +215,6 @@ ENDFRAME
}
}
-sub create_link {
- my ($url,$anchor,$title,$linktext) = @_;
- my $shownlink;
- if ($title eq '') {
- $title = $env{'form.title'};
- if ($title eq '') {
- unless ($env{'request.enc'}) {
- ($title) = ($url =~ m{/([^/]+)$});
- $title =~ s/(\?[^\?]+)$//;
- }
- }
- }
- unless ($title eq '') {
- $shownlink = ''.$title.''; - } - my $dest = &HTML::Entities::encode($url.$anchor,'&<>"'); - $shownlink .= ''.$linktext.''; - return $shownlink; -} - sub handler { my $r=shift; &Apache::loncommon::content_type($r,'text/html'); @@ -384,38 +224,18 @@ sub handler { my $url = $r->uri; my ($is_ext,$brcrum,$absolute,$is_pdf,$exttool,$cdom,$cnum,$hostname, - $linktext,$explanation,$width,$height,$reuse,$is_supp); + $linktext,$explanation,$width,$height); for ($url){ s|^/adm/wrapper||; - $is_ext = $_ =~ s|^/ext/|http://|; - s|http://https://|https://| if ($is_ext); - s|:|:|g; + $is_ext = $_ =~ s|^/ext/|http://|; + s|http://https://|https://|; + s|:|:|g; } + if ($url =~ /\.pdf$/i) { $is_pdf = 1; - } elsif (($is_ext) && ($env{'request.course.id'})) { - if ($env{'course.'.$env{'request.course.id'}.'.extresource'}) { - (my $selected,$reuse,$width,$height) = split(/:/,$env{'course.'.$env{'request.course.id'}.'.extresource'}); - if ($selected eq 'tab') { - $is_ext = 'tab'; - $width = ''; - $height = ''; - } elsif ($selected eq 'window') { - $is_ext = 'window'; - unless ($width =~ /^\d+$/) { - $width = ''; - } - unless ($height =~ /^\d+$/) { - $height = ''; - } - } else { - $width = ''; - $height = ''; - $reuse = ''; - } - } } elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { $cdom = $1; $cnum = $2; @@ -425,16 +245,9 @@ sub handler { my %toolhash = &Apache::lonnet::get('exttool_'.$marker,['target','linktext','explanation','id','width','height'], $cdom,$cnum); if ($toolhash{'id'}) { - my ($idx,%ltitools); - if ($toolhash{'id'} =~ /^c(\d+)$/) { - $idx = $1; - %ltitools = &Apache::lonnet::get_course_lti($cnum,$cdom,'consumer'); - } else { - $idx = $toolhash{'id'}; - %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); - } - if (ref($ltitools{$idx}) eq 'HASH') { - $exttoolremote = $ltitools{$idx}{'url'}; + my %ltitools = &Apache::lonnet::get_domain_lti($cdom,'consumer'); + if (ref($ltitools{$toolhash{'id'}}) eq 'HASH') { + $exttoolremote = $ltitools{$toolhash{'id'}}{'url'}; } } if ($toolhash{'target'} eq 'window') { @@ -442,10 +255,10 @@ sub handler { $width = $toolhash{'width'}; $height = $toolhash{'height'}; } elsif ($toolhash{'target'} eq 'tab') { - $exttool = 'tab'; + $exttool = 'tab'; } if (($exttool eq 'window') || ($exttool eq 'tab')) { - $linktext = $toolhash{'linktext'}; + $linktext = $toolhash{'linktext'}; $explanation = $toolhash{'explanation'}; } elsif (($exttoolremote =~ /^http:/) && ($ENV{'SERVER_PORT'} == 443)) { $exttool = 'tab'; @@ -467,7 +280,6 @@ sub handler { if ($env{'form.anchor'} ne '') { $url .= '#'.$env{'form.anchor'}; } - $is_supp = 1; } my $type = 'ext'; if ($exttool) { @@ -491,34 +303,8 @@ sub handler { $title = &mt('External Tool'); } } - $title = &HTML::Entities::encode($title,'\'"<>&'); - $is_supp = 1; - if ($env{'request.course.id'}) { - $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom); - } - $brcrum = - &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); - } - } elsif ($env{'request.course.id'}) { - my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'}); - $courseurl =~ s{^/}{}; - if ($url =~ m{^\Q/uploaded/$courseurl/supplemental/\E}) { - $is_supp = 1; - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['folderpath','title']); - if ($env{'form.folderpath'}) { - $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom); - } - my $title = $env{'form.title'}; - $title = &HTML::Entities::encode($title,'\'"<>&'); - my $crstype = &Apache::loncommon::course_type(); $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); - } } @@ -550,9 +336,8 @@ sub handler { &Apache::lonenc::check_encrypt(\$url); } - $r->print( wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool, - $linktext,$explanation,undef,$width,$height,$reuse, - $is_supp) ); + $r->print( wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool, + $linktext,$explanation,undef,$width,$height) ); } # not just the menu @@ -579,21 +364,14 @@ described at http://www.lon-capa.org. =over -=item wrapper($r,$url,$brcrum,$absolute,$is_ext,$is_pdf,$exttool,$linktext,$explanation,$title,$width,$height,$reuse,$is_supp) +=item wrapper($url,$brcrum,$absolute,$is_ext,$is_pdf,$linktext,$explanation,$title,$width,$height) =over -=item $r - -request object - =item $url -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. +url to display by including in an iframe within a +LON-CAPA page which has a standard LON-CAPA inline menu. =item $brcrum @@ -622,89 +400,26 @@ in Firefox 23 and later, when serving fr =item $is_ext -true if URL is for an external resource. Default true value -is 1 (display in iframe, unless $uselink is true). -If external resource is to be displayed in a tab, -value of $is_ext will be tab, if to be displayed in a pop-up window, -value of $is_ext will be window. +true if URL is for an external resource. =item $is_pdf 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 $clientmobile is true, -a link to a PDF is shown. The "title" will be displayed +optional. If wrapped item is a PDF, and $env{'browser.mobile'} +is true, a link to a PDF is shown. The "title" will be displayed above the link, but if not provided as an arg, $env{'form.title'} 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. If the URL is for an External Resource, and -$is_ext is window, then a default width (px) may have been defined in the current -course for all external resource instances. - -=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. If the URL is for an External Resource, and -$is_ext is window, then a default height (px) may have been defined in the current -course for all external resource instances. - -=item $reuse - -optional. If the URL is for an External Resource, and $is_ext is tab or window, -then $reuse will be true if the same tab or window is to be reused for display -of all external resource instances in a a course. - =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 displayed 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