--- loncom/homework/structuretags.pm	2003/11/05 21:43:11	1.224
+++ loncom/homework/structuretags.pm	2004/01/15 03:44:01	1.229
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.224 2003/11/05 21:43:11 www Exp $
+# $Id: structuretags.pm,v 1.229 2004/01/15 03:44:01 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -186,8 +186,12 @@ sub problem_edit_header {
        <input type="submit" name="problemmode" value="'.&mt('EditXML').'" />
        <input type="submit" name="Undo" value="'.&mt('undo').'" /> <hr />
        <input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
-       <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" /><br /><p>&nbsp;</p><table border="0"><tr><td bgcolor="#DDDDDD">
-      ';
+       <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
+       &Apache::loncommon::help_open_topic('Problem_Editor_XML_Index',
+					   'Problem Editing Help').'</td><td>'.
+       &Apache::loncommon::help_open_faq(5).
+       &Apache::loncommon::help_open_bug('Authoring').'</td></tr></table>'.
+       '<table border="0"><tr><td bgcolor="#DDDDDD">';
 }
 
 sub problem_edit_footer {
@@ -208,8 +212,9 @@ sub problem_web_to_edit_header {
            onChange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
              <input type="checkbox" name="showallfoils" ';
     if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
-    $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').'
-             <hr />';
+    $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
+	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
+	'<hr />';
     my $numtoanalyze=$ENV{'form.numtoanalyze'};
     if (!$numtoanalyze) { $numtoanalyze=20; }
     $result.= '<input type="submit" name="problemmode" value='.
@@ -429,26 +434,19 @@ sub start_problem {
 	    }
 	} elsif ($target eq 'web') {
 	    my $name= &get_resource_name($parstack,$safeeval);
-	    if ($status eq 'CAN_ANSWER') {
-		# create a page header and exit
-		$result.="$head_tag_start<title>$name</title></head>
+	    $result.="$head_tag_start<title>$name</title></head>
               $body_tag_start \n $form_tag_start".	
-		  '<input type="hidden" name="submitted" value="yes" />';
-		if ($ENV{'request.state'} eq "construct") {
-		    $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
-		}
-		# if we are viewing someone else preserve that info
-		if (defined $ENV{'form.grade_symb'}) {
-		    foreach my $field ('symb','courseid','domain','username') {
-			$result .= '<input type="hidden" name="grade_'.$field.
-			    '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
-		    }
+	      '<input type="hidden" name="submitted" value="yes" />';
+	    # create a page header and exit
+	    if ($ENV{'request.state'} eq "construct") {
+		$result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
+	    }
+	    # if we are viewing someone else preserve that info
+	    if (defined $ENV{'form.grade_symb'}) {
+		foreach my $field ('symb','courseid','domain','username') {
+		    $result .= '<input type="hidden" name="grade_'.$field.
+			'" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
 		}
-	    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
-		     || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE' ||
-		     $status eq 'INVALID_ACCESS') {
-		$result.=$head_tag_start.
-		    "<title>$name</title></head>\n$body_tag_start\n";
 	    }
 	} elsif ($target eq 'tex') {
 	    my $startminipage = '';
@@ -503,6 +501,8 @@ sub start_problem {
     } elsif ($target eq 'edit') {
 	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
 	    &problem_edit_header();
+	$Apache::lonxml::warnings_error_header=
+	    &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />";
 	my $temp=&Apache::edit::insertlist($target,$token);
 	$result.=$temp;
     } elsif ($target eq 'modified') {
@@ -537,17 +537,9 @@ sub end_problem {
 	    (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
 	    ($target eq 'answer') || ($target eq 'tex')
 	   ) {
-	    if ($status eq 'CAN_ANSWER') {
-		if ($target ne 'tex' &&
-		    $ENV{'form.answer_output_mode'} ne 'tex') {
-		    $result.="</form></body>\n";
-		}
-	    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
-		    $status eq 'UNCHECKEDOUT' || $status eq 'INVALID_ACCESS') {
-		if ($target ne 'tex' &&
-		    $ENV{'form.answer_output_mode'} ne 'tex') {
-		    $result.="</body>\n";
-		}
+	    if ($target ne 'tex' &&
+		$ENV{'form.answer_output_mode'} ne 'tex') {
+		$result.="</form></body>\n";
 	    }
 	    if ($target eq 'web') {
 		$result.=&Apache::lonxml::xmlend();
@@ -1003,10 +995,9 @@ sub start_part {
 		&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
-						     $safeeval,'id').
-			 &Apache::edit::get_new_args($token,$parstack,
-						     $safeeval,'display');
+						     $safeeval,'id','display');
 	if ($constructtag) {
+	    #limiting ids to only letters numbers, and space
 	    $token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs;
 	    $result = &Apache::edit::rebuild_tag($token);
 	    $result.=&Apache::edit::handle_insert();