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

[droeschl]

droeschl		Thu Jul  9 08:53:39 2009 EDT

  Modified files:              
    /loncom/interface	loncommon.pm lonmenu.pm 
  Log:
  Changes related to modification of LON-CAPA screen header.
  - show userinfo and 'switch to inline menu mode'-link when remote control is active
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.852 loncom/interface/loncommon.pm:1.853
--- loncom/interface/loncommon.pm:1.852	Wed Jul  8 18:36:26 2009
+++ loncom/interface/loncommon.pm	Thu Jul  9 08:53:39 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.852 2009/07/08 18:36:26 droeschl Exp $
+# $Id: loncommon.pm,v 1.853 2009/07/09 08:53:39 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4394,6 +4394,9 @@
         $dc_info = '('.$dc_info.')';
     }
 
+    $role = "($role)" if $role;
+    &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
+
     if ($env{'environment.remote'} eq 'off') {
         # No Remote
 	if ($env{'request.state'} eq 'construct') {
@@ -4411,8 +4414,6 @@
 	if ($no_nav_bar) {
 	    $bodytag .= $titletable;
 	} else {
-        $role = "($role)" if $role;
-        &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
         $bodytag .= qq|<div id="LC_nav_bar">$name $role<br />
             <em>$realm</em> $dc_info</div>| unless $env{'form.inhibitmenu'};
 
@@ -4439,7 +4440,12 @@
 
     # Explicit link to get inline menu
     my $menu= ($no_inline_link?''
-	       :'<br /><a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
+	       :'<a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a>');
+    $bodytag .= qq|<div id="LC_nav_bar">$name $role
+            <em>$realm</em> $dc_info </div>
+            <ol class="LC_smallMenu LC_right">
+                <li>$menu</li>
+            </ol>| unless $env{'form.inhibitmenu'};
     #
     return(<<ENDBODY);
 $bodytag
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.271 loncom/interface/lonmenu.pm:1.272
--- loncom/interface/lonmenu.pm:1.271	Wed Jul  8 18:36:26 2009
+++ loncom/interface/lonmenu.pm	Thu Jul  9 08:53:39 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.271 2009/07/08 18:36:26 droeschl Exp $
+# $Id: lonmenu.pm,v 1.272 2009/07/09 08:53:39 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -950,7 +950,7 @@
 #    }
     $returnval.=(<<ENDOPEN);
 window.status='Opening LON-CAPA Remote Control';
-var menu=window.open("/res/adm/pages/menu.html","$menuname",
+var menu=window.open("/res/adm/pages/menu.html?inhibitmenu=yes","$menuname",
 "height=375,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
 self.name='loncapaclient';
 ENDOPEN