--- loncom/interface/lonhtmlcommon.pm	2022/05/24 18:21:43	1.402
+++ loncom/interface/lonhtmlcommon.pm	2022/05/29 20:37:21	1.403
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.402 2022/05/24 18:21:43 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.403 2022/05/29 20:37:21 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,12 +79,10 @@ sub coursepreflink {
    my ($text,$category)=@_;
    if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
        my $target =' target="_top"';
-       if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
+       if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
+           (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
            $target ='';
        }
-       if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'})) {
-           $target = ' target="'.$env{'request.deeplink.target'}.'"';
-       }
        return '<a'.$target.' href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'"><span class="LC_setting">'.$text.'</span></a>';
    } else {
       return '';
@@ -109,12 +107,10 @@ sub direct_parm_link {
     $part=&entity_encode($part);
     if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {
         my $target=' target="_top"';
-        if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
+        if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
+            (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
             $target='';
         }
-        if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'})) {
-            $target = ' target="'.$env{'request.deeplink.target'}.'"';
-        }
         return "<a".$target." href=\"/adm/parmset?symb=$symb&amp;filter=$filter&amp;part=$part\"><span class=\"LC_setting\">$linktext</span></a>";
     } else {
         return $linktext;
@@ -1876,6 +1872,13 @@ loncommon::help_open_topic() to generate
 text to include in the link in the optional help item ($topic_help) on the right
 side of the breadcrumbs row.
 
+=item $links_target
+
+optionally includes the target (_top, _parent or _self) for (i) initial
+$menulink item in the breadcrumbs (if present), (ii) return to last location
+(if present), and (iii) help item at the right side of breadcrumbs menu, 
+created by loncommon::help_open_topic() or loncommon::help_open_menu().
+
 =back
 
 =back
@@ -1907,7 +1910,7 @@ returns: nothing
     
     sub breadcrumbs {
         my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt, 
-            $CourseBreadcrumbs,$topic_help,$topic_help_text,$crstype) = @_;
+            $CourseBreadcrumbs,$topic_help,$topic_help_text,$links_target) = @_;
         #
         $css_class ||= 'LC_breadcrumbs';
 
@@ -1951,12 +1954,12 @@ returns: nothing
                 }
             }
             my $target = '_top';
-            if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
+            if ($links_target) {
+                $target = $links_target;
+            } elsif ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
+                (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) {
                 $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,
@@ -1977,14 +1980,8 @@ returns: nothing
                             title => &mt('Back to most recent content resource'),
                             class => 'LC_menubuttons_link',
                           };
-            if ($env{'request.noversionuri'} eq '/adm/searchcat') {
-                $hashref->{'target'} = '_top';
-                if (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
-                    $hashref->{'target'} = '_parent';
-                }
-                if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
-                    $hashref->{'target'} = '_parent';
-                }
+            if ($links_target) {
+                $hashref->{'target'} = $links_target;
             }
             $links=&htmltag( 'a','<img src="/res/adm/pages/tolastloc.png" alt="'.$alttext.'" class="LC_icon" />',
                              $hashref);
@@ -2035,11 +2032,12 @@ returns: nothing
         if ($faq ne '' || $component_help ne '' || $bug ne '') {
             $icons .= &Apache::loncommon::help_open_menu($component,
                                                          $component_help,
-                                                         $faq,$bug);
+                                                         $faq,$bug,'','','','',
+                                                         $links_target);
         }
         if ($topic_help && $topic_help_text) {
            $icons .= ' '.&Apache::loncommon::help_open_topic($topic_help,&mt($topic_help_text),'',
-                                                             undef,600);
+                                                             undef,600,'',$links_target);
         }
         #