[LON-CAPA-cvs] cvs: loncom /interface lonhtmlcommon.pm

[raeburn]

raeburn		Tue Dec 31 01:17:34 2013 EDT

  Modified files:              
    /loncom/interface	lonhtmlcommon.pm 
  Log:
  - Return to last location link in inline menu in upper frame of search page
    needs a target of _top, to escape the frame.
  
  
Index: loncom/interface/lonhtmlcommon.pm
diff -u loncom/interface/lonhtmlcommon.pm:1.354 loncom/interface/lonhtmlcommon.pm:1.355
--- loncom/interface/lonhtmlcommon.pm:1.354	Sat Dec 28 23:16:11 2013
+++ loncom/interface/lonhtmlcommon.pm	Tue Dec 31 01:17:34 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.354 2013/12/28 23:16:11 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.355 2013/12/31 01:17:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1706,11 +1706,15 @@
         my $links;
         if ((&show_return_link) && (!$CourseBreadcrumbs) && (ref($last) eq 'HASH')) {
             my $alttext = &mt('Go Back');
+            my $hashref = { href => '/adm/flip?postdata=return:',
+                            title => &mt('Back to most recent content resource'),
+                            class => 'LC_menubuttons_link',
+                          };
+            if ($env{'request.noversionuri'} eq '/adm/searchcat') {
+                $hashref->{'target'} = '_top'; 
+            }
             $links=&htmltag( 'a','<img src="/res/adm/pages/tolastloc.png" alt="'.$alttext.'" class="LC_icon" />',
-                            { href => '/adm/flip?postdata=return:',
-                              title => &mt('Back to most recent content resource'),
-                              class => 'LC_menubuttons_link',
-                            });
+                             $hashref);
             $links=&htmltag('li',$links);
         }
         $links.= join "",