--- loncom/interface/loncommon.pm	2012/08/01 04:34:00	1.1075.2.11
+++ loncom/interface/loncommon.pm	2012/08/03 17:35:32	1.1075.2.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.11 2012/08/01 04:34:00 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.12 2012/08/03 17:35:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4954,6 +4954,9 @@ Inputs:
 
 =item * $bgcolor, used to override the bgcolor on a webpage to a specific value
 
+=item * $no_inline_link, if true and in remote mode, don't show the
+         'Switch To Inline Menu' link
+
 =item * $args, optional argument valid values are
             no_auto_mt_title -> prevents &mt()ing the title arg
             inherit_jsmath -> when creating popup window in a page,
@@ -4971,7 +4974,7 @@ other decorations will be returned.
 
 sub bodytag {
     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
-        $no_nav_bar,$bgcolor,$args)=@_;
+        $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
 
     my $public;
     if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
@@ -5013,6 +5016,8 @@ sub bodytag {
     }
 
     if (!$realm) { $realm='&nbsp;'; }
+# Set messages
+    my $messages=&domainlogo($domain);
 
     my $extra_body_attr = &make_attr_string($forcereg,\%design);
 
@@ -5047,6 +5052,7 @@ sub bodytag {
     $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
 
+    unless ($env{'environment.remote'} eq 'on') {
         if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { 
             return $bodytag; 
         } 
@@ -5103,6 +5109,42 @@ sub bodytag {
         }
 
         return $bodytag;
+    }
+
+#
+# Top frame rendering, Remote is up
+#
+
+    my $imgsrc = $img;
+    if ($img =~ /^\/adm/) {
+        $imgsrc = &lonhttpdurl($img);
+    }
+    my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
+
+    # 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>');
+
+    if ($dc_info) {
+        $dc_info = qq|<span class="LC_cusr_subheading">($dc_info)</span>|;
+    }
+
+    unless ($env{'form.inhibitmenu'}) {
+        $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>
+                       <ol class="LC_primary_menu LC_right">
+                       <li>$menu</li>
+                       </ol><div id="LC_realm"> $realm $dc_info</div>|;
+    }
+    return(<<ENDBODY);
+$bodytag
+<table id="LC_title_bar" class="LC_with_remote">
+<tr><td>$upperleft</td>
+    <td>$messages&nbsp;</td>
+</tr>
+<tr><td>$titleinfo $dc_info $menu</td>
+</tr>
+</table>
+ENDBODY
 }
 
 sub dc_courseid_toggle {
@@ -5134,8 +5176,15 @@ sub make_attr_string {
 		delete($attr_ref->{$key});
 	    }
 	}
-	$attr_ref->{'onload'}  = $on_load;
-	$attr_ref->{'onunload'}= $on_unload;
+        if ($env{'environment.remote'} eq 'on') {
+            $attr_ref->{'onload'}  =
+                &Apache::lonmenu::loadevents().  $on_load;
+            $attr_ref->{'onunload'}=
+                &Apache::lonmenu::unloadevents().$on_unload;
+        } else {  
+	    $attr_ref->{'onload'}  = $on_load;
+	    $attr_ref->{'onunload'}= $on_unload;
+        }
     }
 
     my $attr_string;
@@ -7100,8 +7149,8 @@ sub headtag {
     if (!$args->{'frameset'}) {
 	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
     }
-    if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
-        $result .= Apache::lonxml::display_title();
+    if ($args->{'force_register'}) {
+        $result .= &Apache::lonmenu::registerurl(1);
     }
     if (!$args->{'no_nav_bar'} 
 	&& !$args->{'only_body'}
@@ -7310,6 +7359,8 @@ $args - additional optional args support
              skip_phases    -> hash ref of 
                                     head -> skip the <html><head> generation
                                     body -> skip all <body> generation
+             no_inline_link -> if true and in remote mode, don't show the
+                                    'Switch To Inline Menu' link
              no_auto_mt_title -> prevent &mt()ing the title arg
              inherit_jsmath -> when creating popup window in a page,
                                     should it have jsmath forced on by the
@@ -7345,7 +7396,8 @@ sub start_page {
                          $args->{'function'},       $args->{'add_entries'},
                          $args->{'only_body'},      $args->{'domain'},
                          $args->{'force_register'}, $args->{'no_nav_bar'},
-                         $args->{'bgcolor'},        $args);
+                         $args->{'bgcolor'},        $args->{'no_inline_link'},
+                         $args);
         }
     }
 
