--- loncom/homework/structuretags.pm	2006/12/11 01:07:07	1.372
+++ loncom/homework/structuretags.pm	2007/04/06 21:22:24	1.375
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.372 2006/12/11 01:07:07 albertel Exp $
+# $Id: structuretags.pm,v 1.375 2007/04/06 21:22:24 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -88,6 +88,14 @@ sub page_start {
 					   $parstack,$parser,$safeeval);
     }
 
+    $extra_head.= '
+<script type="text/javascript">
+function setSubmittedPart (part) {
+   this.document.lonhomework.submitted.value="part_"+part;
+}
+</script>
+';
+
     my %body_args;
     if (defined($found{'html'})) {
 	$body_args{'skip_phases'}{'head'}=1;
@@ -213,7 +221,8 @@ sub setup_rndseed {
 	    }
 	    $env{'form.rndseed'}=$rndseed;
 	}
-	if ($env{'form.resetdata'} eq &mt('New Problem Variation') ||
+	if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	      && $env{'form.submitted'} eq 'yes')  ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    srand(time);
 	    $rndseed=int(rand(2100000000));
@@ -276,9 +285,7 @@ sub option {
 sub problem_web_to_edit_header {
     my ($rndseed)=@_;
     my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />';
-    if (!$Apache::lonhomework::parsing_a_task) {
-	$result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';
-    }
+    $result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';
     $result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
              <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
              <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
@@ -360,7 +367,8 @@ sub initialize_storage {
 	
 	my $namespace = $symb || $env{'request.uri'};
 	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
-	    $env{'form.resetdata'} eq &mt('New Problem Variation') ||
+	    ($env{'form.resetdata'} eq &mt('New Problem Variation')
+	     && $env{'form.submitted'} eq 'yes') ||
 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
 	    &Apache::lonnet::tmpreset($namespace,'',$domain,$name);
 	    &Apache::lonxml::debug("Attempt reset");
@@ -731,7 +739,8 @@ sub start_problem {
 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
 						       $style);
 	    if ($target eq 'web') {
-		$result .= &Apache::bridgetask::proctor_validation_screen();
+		$result .= 
+		    &Apache::bridgetask::proctor_validation_screen($slot);
 	    } elsif ($target eq 'grade') {
 		&Apache::bridgetask::proctor_check_auth($slot_name,$slot,
 							'problem');
@@ -787,7 +796,6 @@ sub end_problem {
     }
 
     if ($target eq 'tex') {
-
 	# Figure out the front matter and replace the
 	# INSERTTEXFRONTMATTERHERE in result with it.  note that we do
 	# this in end_problem because whether or not we display due