--- loncom/homework/structuretags.pm	2002/11/06 22:58:36	1.131
+++ loncom/homework/structuretags.pm	2002/11/11 22:37:23	1.135
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.131 2002/11/06 22:58:36 albertel Exp $
+# $Id: structuretags.pm,v 1.135 2002/11/11 22:37:23 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,6 +29,7 @@
 # 6/26/2001 fixed extra web display at end of <web></web> tags
 # 8/17,8/18,8/20 Gerd Kortemeyer
 
+
 package Apache::structuretags; 
 
 use strict;
@@ -100,6 +101,14 @@ sub page_start {
       }
     }
     $body_tag_start.='>';
+    if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
+	my ($symb)=&Apache::lonxml::whichuser();
+	if ($symb eq '') {
+	    my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
+	    $help="Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored $help<br />";
+	    $body_tag_start.=$help;
+	}
+    }
   }
   my $form_tag_start;
   if (!defined($found{'form'})) {
@@ -140,13 +149,13 @@ sub problem_edit_header {
        <input type="submit" name="problemmode" value="Discard Edits and View" />
        <input type="submit" name="problemmode" value="EditXML" />
        <input type="submit" name="Undo" value="undo" /> <hr />
-       <input type="submit" name="submit" value="Submit Changes" />
-       <input type="submit" name="submit" value="Submit Changes and View" /><br /><p>&nbsp;</p>
+       <input type="submit" name="submit" value="Submit Changes and Edit" />
+       <input type="submit" name="submit" value="Submit Changes and View" /><br /><p>&nbsp;</p><table border="0"><tr><td bgcolor="#DDDDDD">
       ';
 }
 
 sub problem_edit_footer {
-  return '<br /><input type="submit" name="submit" value="Submit Changes and Edit" />
+  return '</td></tr></table><br /><input type="submit" name="submit" value="Submit Changes and Edit" />
     <input type="submit" name="submit" value="Submit Changes and View" />';
 }
 
@@ -290,10 +299,11 @@ sub start_problem {
     my $expression='$external::datestatus="'.$status.'";';
     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
     &Apache::run::run($expression,$safeeval);
+    &Apache::lonxml::debug("Got $status");
     if (( $status eq 'CLOSED' ) ||
         ( $status eq 'UNCHECKEDOUT') ||
         ( $status eq 'BANNED')) {
-      my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]);
+      my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
       if ( $target eq "web" ) {
 	$result.= $head_tag_start.'</head>';
         my $msg=$body_tag_start.
@@ -655,6 +665,19 @@ sub start_part {
 	}
       }
     }
+  } elsif ($target eq 'edit') {
+      $result.=&Apache::edit::tag_start($target,$token);
+      $result.=&Apache::edit::text_arg('Part ID:','id',$token).
+	  &Apache::loncommon::help_open_topic("Part_Tag_Edit_Help").
+	      &Apache::edit::end_row().&Apache::edit::start_spanning_row();
+
+  } elsif ($target eq 'modified') {
+      my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
+						   'id');
+      if ($constructtag) {
+	  $result = &Apache::edit::rebuild_tag($token);
+	  $result.=&Apache::edit::handle_insert();
+      }
   }
   return $result;
 }
@@ -680,7 +703,8 @@ sub start_preduedate {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
-	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
+	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' && 
+        $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
       &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
     }
   }