--- loncom/interface/lonhtmlcommon.pm 2021/10/26 02:31:22 1.400
+++ loncom/interface/lonhtmlcommon.pm 2022/05/24 18:21:43 1.402
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.400 2021/10/26 02:31:22 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.402 2022/05/24 18:21:43 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -82,6 +82,9 @@ sub coursepreflink {
if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
$target ='';
}
+ if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'})) {
+ $target = ' target="'.$env{'request.deeplink.target'}.'"';
+ }
return '&"').'">'.$text.'';
} else {
return '';
@@ -109,6 +112,9 @@ sub direct_parm_link {
if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
$target='';
}
+ if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'})) {
+ $target = ' target="'.$env{'request.deeplink.target'}.'"';
+ }
return "$linktext";
} else {
return $linktext;
@@ -1948,6 +1954,9 @@ returns: nothing
if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
$target='';
}
+ if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'})) {
+ $target = $env{'request.deeplink.target'};
+ }
$menulink = { href =>'/adm/menu',
title =>'Go to main menu',
target =>$target,
@@ -1971,7 +1980,10 @@ returns: nothing
if ($env{'request.noversionuri'} eq '/adm/searchcat') {
$hashref->{'target'} = '_top';
if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
- $hashref->{'target'} = '';
+ $hashref->{'target'} = '_parent';
+ }
+ if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
+ $hashref->{'target'} = '_parent';
}
}
$links=&htmltag( 'a','
',