[LON-CAPA-cvs] cvs: loncom /homework lonhomework.pm /interface loncommon.pm /xml lonxml.pm rat lonratedt.pm lonratmenu.pm

[albertel]

albertel		Thu Apr 13 15:01:41 2006 EDT

  Modified files:              
    /loncom/xml	lonxml.pm 
    /rat	lonratedt.pm lonratmenu.pm 
    /loncom/interface	loncommon.pm 
    /loncom/homework	lonhomework.pm 
  Log:
  - moving the 'only body tag when in construction space and using the remote control' detection into the bodytag function directly
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.405 loncom/xml/lonxml.pm:1.406
--- loncom/xml/lonxml.pm:1.405	Thu Apr 13 14:35:17 2006
+++ loncom/xml/lonxml.pm	Thu Apr 13 15:00:40 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.405 2006/04/13 18:35:17 albertel Exp $
+# $Id: lonxml.pm,v 1.406 2006/04/13 19:00:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1505,7 +1505,6 @@
 	    my %options = ();
 	    if ($env{'environment.remote'} ne 'off') {
 		$options{'bgcolor'}   = '#FFFFFF';
-		$options{'only_body'} = 1;
 	    }
 	    my $start_page = &Apache::loncommon::start_page(undef,undef,
 							    \%options);
Index: rat/lonratedt.pm
diff -u rat/lonratedt.pm:1.75 rat/lonratedt.pm:1.76
--- rat/lonratedt.pm:1.75	Tue Apr 11 15:35:16 2006
+++ rat/lonratedt.pm	Thu Apr 13 15:00:57 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.75 2006/04/11 19:35:16 albertel Exp $
+# $Id: lonratedt.pm,v 1.76 2006/04/13 19:00:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1096,11 +1096,11 @@
 </script>
 ENDJS
 
-    my $start_page =
-        &Apache::loncommon::start_page(undef,$js,
-				       {'only_body' =>
-					    ($env{'environment.remote'} ne 'off')}).
-        &Apache::loncommon::help_open_menu('','Sequence_Simple_Editor_Creation','Sequence_Simple_Editor_Creation','',6,'RAT');    
+    my $start_page = &Apache::loncommon::start_page(undef,$js).
+        &Apache::loncommon::help_open_menu('',
+					   'Sequence_Simple_Editor_Creation',
+					   'Sequence_Simple_Editor_Creation',
+					   '',6,'RAT');    
     my $end_page = &Apache::loncommon::end_page();
 
     $r->print(<<ENDSMPHEAD);
Index: rat/lonratmenu.pm
diff -u rat/lonratmenu.pm:1.5 rat/lonratmenu.pm:1.6
--- rat/lonratmenu.pm:1.5	Mon Apr 10 18:22:41 2006
+++ rat/lonratmenu.pm	Thu Apr 13 15:00:57 2006
@@ -41,9 +41,7 @@
     my %loaditem = ('onunload' => "leave();",);
     my $start_page = 
 	&Apache::loncommon::start_page('Advanced Editor',$js,
-				       {'add_entries' => \%loaditem,
-					'only_body'   =>
-				       ($env{'environment.remote'} ne 'off')}).
+				       {'add_entries' => \%loaditem,}).
 	&Apache::loncommon::help_open_menu('','Sequence_Advanced_Editor_Creation','Sequence_Advanced_Editor_Creation','',6,'RAT');
     $r->print($start_page);
     my $readfile=$r->uri;
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.331 loncom/interface/loncommon.pm:1.332
--- loncom/interface/loncommon.pm:1.331	Tue Apr 11 16:00:44 2006
+++ loncom/interface/loncommon.pm	Thu Apr 13 15:01:25 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.331 2006/04/11 20:00:44 albertel Exp $
+# $Id: loncommon.pm,v 1.332 2006/04/13 19:01:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2816,7 +2816,9 @@
 
     my $upperleft='<img src="http://'.$ENV{'HTTP_HOST'}.':'.
                    $lonhttpdPort.$img.'" alt="'.$function.'" />';
-    if ($bodyonly) {
+    if ($bodyonly 
+	|| ($env{'request.state'} eq 'construct' 
+	    && $env{'environment.remote'} ne 'off' )) {
         return $bodytag;
     } elsif ($env{'browser.interface'} eq 'textual') {
 # Accessibility
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.239 loncom/homework/lonhomework.pm:1.240
--- loncom/homework/lonhomework.pm:1.239	Tue Apr 11 17:08:29 2006
+++ loncom/homework/lonhomework.pm	Thu Apr 13 15:01:40 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.239 2006/04/11 21:08:29 albertel Exp $
+# $Id: lonhomework.pm,v 1.240 2006/04/13 19:01:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -623,8 +623,8 @@
 sub analyze_header {
     my ($request) = @_;
     my $result =
-	&Apache::loncommon::start_page('Analyzing a problem',undef,
-				       {'only_body' => ($env{'environment.remote'} ne 'off'),});
+	&Apache::loncommon::start_page('Analyzing a problem',undef);
+
     $result .= 
 	&Apache::lonxml::message_location().'
             <form name="lonhomework" method="POST" action="'.
@@ -756,9 +756,7 @@
 	if ($rows < 20) { $rows = 20; }
 	my $start_page = 
 	    &Apache::loncommon::start_page("EditXML $file",
-					   &Apache::edit::js_change_detection(),
-					   {'only_body' =>
-						($env{'environment.remote'} ne 'off')});
+					   &Apache::edit::js_change_detection());
 
 	$result.=$start_page.
 	    &renderpage($request,$file,['no_output_web'],1).
@@ -911,8 +909,8 @@
 	    $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";
 	}
 	my $instructions;
-	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,
-					($env{'environment.remote'} ne 'off'));
+	my $start_page = 
+	    &Apache::loncommon::start_page("Create New $extension");
 	if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");}
 	my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
 			  'resource' => 'resource',
@@ -923,7 +921,7 @@
 			  'Create' => 'Create',
 			  'button' => 'button');
 	$request->print(<<ENDNEWPROBLEM);
-$bodytag
+$start_page
 <h1>$lt{'create'} $extension $lt{'resource'}</h1>
 $errormsg
 $lt{'requested'} <tt>$shownurl</tt> $lt{'not exist'}.