[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm

[raeburn]

raeburn		Mon Dec 30 01:31:56 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Provide Remote Contol users with access to help menu (will open in new
      window).
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.59 loncom/interface/loncommon.pm:1.1075.2.60
--- loncom/interface/loncommon.pm:1.1075.2.59	Fri Dec 27 15:50:34 2013
+++ loncom/interface/loncommon.pm	Mon Dec 30 01:31:55 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.59 2013/12/27 15:50:34 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.60 2013/12/30 01:31:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1352,8 +1352,10 @@
 sub top_nav_help {
     my ($text) = @_;
     $text = &mt($text);
-    my $stay_on_page = 1;
-
+    my $stay_on_page;
+    unless ($env{'environment.remote'} eq 'on') {
+        $stay_on_page = 1;
+    }
     my $link = ($stay_on_page) ? "javascript:helpMenu('display')"
 	                     : "javascript:helpMenu('open')";
     my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);
@@ -5196,6 +5198,9 @@
     }
     my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
 
+    my $help=($no_inline_link?''
+              :&Apache::loncommon::top_nav_help('Help'));
+
     # Explicit link to get inline menu
     my $menu= ($no_inline_link?''
                :'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');
@@ -5213,6 +5218,7 @@
     unless ($env{'form.inhibitmenu'}) {
         $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>
                        <ol class="LC_primary_menu LC_floatright LC_right">
+                       <li>$help</li>
                        <li>$menu</li>
                        </ol><div id="LC_realm"> $realm $dc_info</div>|;
     }