--- loncom/homework/structuretags.pm	2004/11/10 22:20:50	1.271
+++ loncom/homework/structuretags.pm	2004/11/30 23:28:57	1.273
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.271 2004/11/10 22:20:50 albertel Exp $
+# $Id: structuretags.pm,v 1.273 2004/11/30 23:28:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -88,7 +88,10 @@ sub page_start {
 	    &Apache::lonxml::fontsettings();     
     }
     my $body_tag_start;
-    if (!defined($found{'body'})) {
+    if (!defined($found{'body'}) && $ENV{'request.state'} eq 'construct'
+	&& $ENV{'environment.remote'} eq 'off') {
+	$body_tag_start=&Apache::loncommon::bodytag();
+    } elsif (!defined($found{'body'})) {
 	$body_tag_start='<body onload="'.&Apache::lonmenu::loadevents().'" '.
 	    'onunload="'.&Apache::lonmenu::unloadevents().'" ';
 	my $background=&Apache::lonxml::get_param('background',$parstack,
@@ -1360,12 +1363,13 @@ sub delete_startouttext {
 sub start_simpleeditbutton {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
-    if (($target eq 'web') &&
+    if (($ENV{'form.simple_edit_button'} ne 'off') &&
+	($target eq 'web') &&
         (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
         my $url=$ENV{'request.noversionuri'};
         $url=~s/\?.*$//;
 	$result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
-                '<a href="'.$url.'/smpedit">'.&mt('Simple Problem Editor').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
+                '<a href="'.$url.'/smpedit">'.&mt('Edit').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
 &Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />';
     }
     return $result;
