--- loncom/homework/bridgetask.pm	2006/12/07 20:44:55	1.214
+++ loncom/homework/bridgetask.pm	2007/08/01 23:57:35	1.234
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.214 2006/12/07 20:44:55 albertel Exp $
+# $Id: bridgetask.pm,v 1.234 2007/08/01 23:57:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,12 +38,11 @@ use Apache::lonlocal;
 use Apache::lonxml;
 use Apache::slotrequest();
 use Time::HiRes qw( gettimeofday tv_interval );
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
 
 BEGIN {
-    &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','GraderNote','ClosingParagraph'));
+    &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','CriteriaText','GraderNote','ClosingParagraph'));
 }
 
 my %dimension;
@@ -98,6 +97,7 @@ sub check_in {
 	&check_in_sequence($user,$domain,$slot_name);
     } else {
 	&create_new_version($type,$user,$domain,$slot_name);
+	&Apache::structuretags::finalize_storage();
     }
     return 1;
 }
@@ -487,6 +487,7 @@ sub webgrade_standard_info {
 	    'stop'   => 'Quit Grading',
 	    'fail'   => 'Fail Rest',
 	    'cancel' => 'Cancel',
+	    'submit' => 'Submit Grades',
 	    );
     %lt=&Apache::lonlocal::texthash(%lt);
 
@@ -494,26 +495,35 @@ sub webgrade_standard_info {
   <div class="LC_GRADING_maincontrols">
 INFO
 
-    if (&grade_mode() eq 'regrade') {
+    if ($env{'request.state'} eq 'construct') {
 	$result.=<<INFO;
+    <input type="submit" name="next" value="$lt{'submit'}" />
+INFO
+    } else {
+	if (&grade_mode() eq 'regrade' && $env{'request.state'} ne 'construct') {
+	    $result.=<<INFO;
     <input type="submit" name="cancel" value="$lt{'cancel'}" />
 INFO
-    }
+        }
 
-    $result.=<<INFO;
+	$result.=<<INFO;
     <input type="submit" name="next" value="$lt{'done'}" />
     <input type="submit" name="stop" value="$lt{'stop'}" />
+INFO
+    }
+    $result.=<<INFO;
     <input type="button" name="fail" value="$lt{'fail'}" 
            onclick="javascript:onFailRest()" />
   </div>
   $file_list
 INFO
     return $result;
+
 }
 
 sub done_screen {
     my ($version) = @_;
-    my $title=&Apache::lonnet::gettitle();
+    my $title=&Apache::lonnet::gettitle($env{'request.uri'});
     my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
     my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();
     my $files = '<ul>';
@@ -590,7 +600,6 @@ sub start_Task {
 	    &Apache::structuretags::page_start($target,$token,$tagstack,
 					       $parstack,$parser,$safeeval,
 					       $name,&style($target));
-	$result .= '<div class="LC_task">'."\n";
     }
 
     if ($target eq 'web' && $env{'request.state'} ne 'construct') {
@@ -620,7 +629,7 @@ sub start_Task {
 	    }
 	}
     }
-    if ($target eq 'web' && $env{'request.state'} eq 'construct') {
+    if ($target =~/(web|webgrade)/ && $env{'request.state'} eq 'construct') {
 	$form_tag_start.=&Apache::structuretags::problem_web_to_edit_header($env{'form.rndseed'});
     }
     if ($target eq 'web' 
@@ -639,6 +648,11 @@ sub start_Task {
 					  'slot' => $slot_name});
 	    ($version,$previous)=&get_version();
 	}
+	
+	my $status_id = 
+	    ($previous || $status eq 'SHOW_ANSWER') ? 'LC_task_feedback'
+	                                            : 'LC_task_take';
+	$result .= '<div class="LC_task" id="'.$status_id.'">'."\n";
 
 	push(@Apache::inputtags::status,$status);
 	$Apache::inputtags::slot_name=$slot_name;
@@ -706,6 +720,7 @@ sub start_Task {
 	      $target eq 'webgrade') {
 	my $webgrade='yes';
 	if ($target eq 'webgrade') {
+	    $result .= '<div class="LC_task">'."\n";
 	    $result.= "\n".'<div class="LC_GRADING_task">'."\n".
 		'<script type="text/javascript" 
                          src="/res/adm/includes/task_grading.js"></script>';
@@ -718,8 +733,12 @@ sub start_Task {
 	if ($todo) {
 	    &setup_env_for_other_user($todo,$safeeval);
 	    my ($symb,$uname,$udom)=&decode_queue_key($todo);
-	    $result.="\n".'<table><tr><td>Found '.
-		&Apache::lonnet::gettitle($symb).' for '.$uname.' at '.$udom.'</td></tr></table>';
+	    if ($env{'request.state'} eq 'construct') {
+		$symb = $env{'request.uri'};
+	    }
+	    $result.="\n".'<p>'.
+		&mt('Grading [_1] for [_2] at [_3]',
+		    &Apache::lonnet::gettitle($symb),$uname,$udom).'</p>';
 	    $form_tag_start.=
 		'<input type="hidden" name="gradingkey" value="'.
 		&escape($todo).'" />';
@@ -794,6 +813,12 @@ sub start_Task {
 		}
 	    }
 	    if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
+	} elsif ($target eq 'webgrade' 
+		 && $env{'request.state'} eq 'construct') {
+	    $result.=$form_tag_start;
+	    $result.='<input type="hidden" name="webgrade" value="'.
+		$webgrade.'" />';
+	    $result.=&webgrade_standard_info();
 	}
 	if ($target eq 'webgrade') {
 	    $result.="\n".'<div id="LC_GRADING_criterialist">';
@@ -807,8 +832,15 @@ sub start_Task {
 	    &Apache::structuretags::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;
+	$result.= &Apache::edit::text_arg('Required number of passed optional elements to pass the Task:','OptionalRequired',$token,10)." <br />\n";
+	$result.= &Apache::edit::insertlist($target,$token);
+    } elsif ($target eq 'modified') {
+	my $constructtag=
+	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
+					'OptionalRequired');
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	}
     } else {
 	# page_start returned a starting result, delete it if we don't need it
 	$result = '';
@@ -834,6 +866,12 @@ sub get_key_todo {
     my ($target)=@_;
     my $todo;
 
+    if ($env{'request.state'} eq 'construct') {
+	my ($symb,$cid,$udom,$uname) = &Apache::lonnet::whichuser();
+	my $gradingkey=&encode_queue_key($symb,$udom,$uname);
+	return ($gradingkey);
+    }
+
     if (defined($env{'form.reviewasubmission'})) {
 	&Apache::lonxml::debug("review a submission....");
 	$env{'form.queue'}='reviewqueue';
@@ -862,8 +900,8 @@ sub get_key_todo {
 	my ($symb,$cid)=&Apache::lonnet::whichuser();
 	my $cnum  = $env{'course.'.$cid.'.num'};
 	my $cdom  = $env{'course.'.$cid.'.domain'};
-	my $uname = $env{'form.gradinguser'};
-	my $udom  = $env{'form.gradingdomain'};
+	my $uname = &LONCAPA::clean_username($env{'form.gradinguser'});
+	my $udom  = &LONCAPA::clean_domain($env{'form.gradingdomain'});
 
 	my $gradingkey=&encode_queue_key($symb,$udom,$uname);
 
@@ -1026,7 +1064,7 @@ sub end_Task {
 		}
 		if (!$previous && $status ne 'SHOW_ANSWER' &&
 		    &show_task($status,$previous)) {
-		    $result.=&Apache::inputtags::gradestatus('0');
+		    $result.=&Apache::inputtags::gradestatus('0',$target,1);
 		}
 		
 		$result.='</form>';
@@ -1044,8 +1082,7 @@ DONEBUTTON
 		if (&show_task($status,$previous) &&
 		    $Apache::lonhomework::history{"resource.$version.0.status"} =~ /^(pass|fail)$/) {
 		    my $bt_status=$Apache::lonhomework::history{"resource.$version.0.status"};
-		    my $title=&Apache::lonnet::gettitle();
-
+		    my $title=&Apache::lonnet::gettitle($env{'request.uri'});
 		    my $start_time;
 
 		    my $slot_name=
@@ -1116,7 +1153,8 @@ DONEBUTTON
 	}
 	
 
-	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
+	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous
+	    && $status eq 'CAN_ANSWER') {
 	    my $award='SUBMITTED';
 	    &Apache::essayresponse::file_submission("$version.0",'bridgetask',
 						    'portfiles',\$award);
@@ -1318,9 +1356,7 @@ DONEBUTTON
 	$result.=&Apache::response::meta_stores_write('status','string',
 						      'Bridge Task Status');
     } elsif ($target eq 'edit') {
-	&Apache::structuretags::reset_problem_globals('Task');
-	undef($Apache::lonhomework::parsing_a_task);
-	return ('','no');
+	$result.= &Apache::structuretags::problem_edit_footer();
     }
     &Apache::structuretags::reset_problem_globals('Task');
     undef($Apache::lonhomework::parsing_a_task);
@@ -1523,19 +1559,25 @@ sub show_queue {
 	}
     }
 
+    $result .= 
+	'<p><a href="/adm/flip?postdata=return:">'.
+	&mt('Return to resource').'</a></p><hr />'.
+	"\n<h3>Current Queue - $queue</h3>";
     my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     my ($tmp)=%queue;
     if ($tmp=~/^error: 2 /) {
-	return "\n<h3>Current Queue - $queue</h3>".
+	$result.=
+	    
 	    &Apache::loncommon::start_data_table().
 	    &Apache::loncommon::start_data_table_row().
 	    '<td>'.&mt('Empty').'</td>'.
 	    &Apache::loncommon::end_data_table_row().
 	    &Apache::loncommon::end_data_table();
+	return $result;
     }
     my $title=&Apache::lonnet::gettitle($symb);
-    $result.="\n<h3>Current Queue - $title $queue </h3>".
+    $result.=
 	&Apache::loncommon::start_data_table().
 	&Apache::loncommon::start_data_table_header_row();
     if ($with_selects) { $result.="<th>Status</th><th></th>"; }
@@ -1577,17 +1619,16 @@ sub show_queue {
 		my $ekey=&escape($key);
 		my ($action,$description,$status)=('select',&mt('Select'));
 		if (exists($queue{"$key\0locked"})) {
-		    my $locker = $queue{"$key\0locked"};
-		    my $time;
-		    if (ref($queue{"$key\0locked"}) eq 'ARRAY') {
-			($locker, $time) = @{$queue{"$key\0locked"}};
+		    my ($locker,$time) = 
+			&get_lock_info($queue{"$key\0locked"});
+		    if ($time) {
 			$time = 
 			    &Apache::lonnavmaps::timeToHumanString($time,
 								   'start');
 		    }
 		    my $me=$env{'user.name'}.':'.$env{'user.domain'};
 		    $status=&mt('Locked by <tt>[_1]</tt> [_2]',$locker,$time);
-		    if ($me eq $queue{"$key\0locked"}) {
+		    if ($me eq $locker) {
 			($action,$description)=('resume',&mt('Resume'));
 		    } else {
 			($action,$description)=('unlock',&mt('Unlock'));
@@ -1697,7 +1738,7 @@ sub queue_key_locked {
     my ($key_locked,$value)=
 	&Apache::lonnet::get($queue,["$key\0locked"],$cdom,$cnum);
     if ($key_locked eq "$key\0locked") {
-	return $value;
+	return &get_lock_info($value);
     }
     return undef;
 }
@@ -1778,6 +1819,24 @@ sub pick_from_queue_data {
     return undef;
 }
 
+sub get_lock_info {
+    my ($lock_info) = @_;
+    if (wantarray) {
+	if (ref($lock_info) eq 'ARRAY') {
+	    return @{$lock_info};
+	} else {
+	    return ($lock_info);
+	}
+    } else {
+	if (ref($lock_info) eq 'ARRAY') {
+	    return $lock_info->[0];
+	} else {
+	    return $lock_info;
+	}
+    }
+    return;
+}
+
 sub find_mid_grade {
     my ($queue,$symb,$cdom,$cnum)=@_;
     my $todo=&unescape($env{'form.gradingkey'});
@@ -1789,7 +1848,7 @@ sub find_mid_grade {
     my $regexp="^$symb\0.*\0locked\$";
     my %locks=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     foreach my $key (keys(%locks)) {
-	my $who=$locks{$key};
+	my $who= &get_lock_info($locks{$key});
 	if ($who eq $me) {
 	    $todo=$key;
 	    $todo=~s/\0locked$//;
@@ -2046,6 +2105,9 @@ sub start_ClosingParagraph {
     if ($target eq 'web') {
     } elsif ($target eq 'webgrade') {
 	&Apache::lonxml::startredirection();
+    } elsif ($target eq 'edit') {
+	$result = &Apache::edit::tag_start($target,$token);
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -2060,6 +2122,14 @@ sub end_ClosingParagraph {
     return $result;
 }
 
+sub insert_ClosingParagraph {
+    return '
+<ClosingParagraph>
+    <startouttext />
+    <endouttext />
+</ClosingParagraph>';
+}
+
 sub get_dim_id {
     if (@Apache::bridgetask::dimension) {
 	return $Apache::bridgetask::dimension[-1];
@@ -2077,11 +2147,24 @@ sub get_id {
 
 sub start_Setup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    #undef(%dimension);
+    my $result;
     my $dim = &get_id($parstack,$safeeval);
     push(@Apache::bridgetask::dimension,$dim);
-    &Apache::lonxml::startredirection();
-    return;# &internal_location($dim);
+    if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
+	&Apache::lonxml::startredirection();
+    } elsif ($target eq 'edit') {
+	$result = &Apache::edit::tag_start($target,$token);
+	$result.= &Apache::edit::text_arg('Id:','id',$token,10).
+	    &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);
+	}
+    }
+    return $result;
 }
 
 {
@@ -2108,55 +2191,89 @@ sub start_Dimension {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $dim = &get_id($parstack,$safeeval);
     my $previous_dim;
-    if (@Apache::bridgetask::dimension) {
-	$previous_dim = $Apache::bridgetask::dimension[-1];
-	push(@{$Apache::bridgetask::dimension{$previous_dim}{'contains'}},
-	     $dim);
-	if(&skip_dimension_parsing($dim)) {
-	    $dimension{$previous_dim}{'criteria.'.$dim} =
-		$token->[4]
-		.&Apache::lonxml::get_all_text('/'.$tagstack->[-1],$parser,
-					      $style)
-		.'</'.$tagstack->[-1].'>';
-	}
-	$dimension{$previous_dim}{'criteria.'.$dim.'.type'}='dimension';
-	$dimension{$previous_dim}{'criteria.'.$dim.'.mandatory'}=
-	    &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
-	push(@{$dimension{$previous_dim}{'criterias'}},$dim);
-	$dimension{$dim}{'nested'}=$previous_dim;
-	$dimension{$dim}{'depth'} = 1 + $dimension{$previous_dim}{'depth'};
-
-	&Apache::lonxml::debug("adding $dim as criteria to $previous_dim");
-    } else {
-	$dimension{$top}{'depth'}=0;
-	$dimension{$top}{'criteria.'.$dim.'.type'}='dimension';
-	$dimension{$top}{'criteria.'.$dim.'.mandatory'}=
-	    &Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
-	push(@{$dimension{$top}{'criterias'}},$dim);
-	$dimension{$dim}{'nested'}=$top;
-    }
-    push(@Apache::bridgetask::dimension,$dim);
-    &Apache::lonxml::startredirection();
-    if (!&skip_dimension_parsing($dim)) {
-	&enable_dimension_parsing($dim);
+    my $result;
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+	if (@Apache::bridgetask::dimension) {
+	    $previous_dim = $Apache::bridgetask::dimension[-1];
+	    push(@{$Apache::bridgetask::dimension{$previous_dim}{'contains'}},
+		 $dim);
+	    if(&skip_dimension_parsing($dim)) {
+		$dimension{$previous_dim}{'criteria.'.$dim} =
+		    $token->[4]
+		    .&Apache::lonxml::get_all_text('/'.$tagstack->[-1],$parser,
+						   $style)
+		    .'</'.$tagstack->[-1].'>';
+	    }
+	    $dimension{$previous_dim}{'criteria.'.$dim.'.type'}='dimension';
+	    $dimension{$previous_dim}{'criteria.'.$dim.'.mandatory'}=
+		&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
+	    push(@{$dimension{$previous_dim}{'criterias'}},$dim);
+	    $dimension{$dim}{'nested'}=$previous_dim;
+	    $dimension{$dim}{'depth'} = 1 + $dimension{$previous_dim}{'depth'};
+	    
+	    &Apache::lonxml::debug("adding $dim as criteria to $previous_dim");
+	} else {
+	    $dimension{$top}{'depth'}=0;
+	    $dimension{$top}{'criteria.'.$dim.'.type'}='dimension';
+	    $dimension{$top}{'criteria.'.$dim.'.mandatory'}=
+		&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
+	    push(@{$dimension{$top}{'criterias'}},$dim);
+	    $dimension{$dim}{'nested'}=$top;
+	}
+        push(@Apache::bridgetask::dimension,$dim);
+	&Apache::lonxml::startredirection();
+	if (!&skip_dimension_parsing($dim)) {
+	    &enable_dimension_parsing($dim);
+	}
+    } elsif ($target eq 'edit') {
+  	$result = &Apache::edit::tag_start($target,$token);
+	$result.=  
+	    &Apache::edit::text_arg('Id:','id',$token,10).' '.
+	    &Apache::edit::select_arg('Passing is Mandatory:','Mandatory',
+				      [['Y', 'Yes'],
+				       ['N','No'],],
+				      $token).' <br /> '.
+	    &Apache::edit::text_arg('Required number of passed optional elements to pass the '.$token->[1].':',
+				    'OptionalRequired',$token,4).
+	    &Apache::edit::end_row().
+	    &Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag=
+	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
+					'id','Mandatory','OptionalRequired');
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	}
     }
-    return;# &internal_location($dim);
+    return $result;# &internal_location($dim);
 }
 
 sub start_QuestionText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    my $dim = &get_dim_id();
-    my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style);
+    my $result;
     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+	my $text=&Apache::lonxml::get_all_text('/questiontext',$parser,$style);
+    my $dim = &get_dim_id();
 	$dimension{$dim}{'questiontext'}=$text;
+    } elsif ($target eq 'edit') {
+	$result = &Apache::edit::tag_start($target,$token);
+    } elsif ($target eq 'modified') {
     }
-    return '';
+    return $result;
 }
 
 sub end_QuestionText {
     return '';
 }
 
+sub insert_QuestionText {
+    return '
+<QuestionText>
+    <startouttext />
+    <endouttext />
+</QuestionText>';
+}
+
 sub get_instance {
     my ($dim)=@_;
     my $rand_alg=&Apache::lonnet::get_rand_alg();
@@ -2218,12 +2335,14 @@ sub link {
 sub end_Question { return &end_Dimension(@_); }
 sub end_Dimension {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my $result=&Apache::lonxml::endredirection();
+    my $result;
     my $dim=&get_id($parstack,$safeeval);
-    if (&skip_dimension_parsing($dim)) {
-	&disable_dimension_parsing($dim);
-	pop(@Apache::bridgetask::dimension);
-	return;
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+	$result=&Apache::lonxml::endredirection();
+	if (&skip_dimension_parsing($dim)) {
+	    pop(@Apache::bridgetask::dimension);
+	    return;
+	}
     }
     my $instance=&get_instance($dim);
     my $version=&get_version();
@@ -2266,10 +2385,10 @@ sub end_Dimension {
 		    ('sub' x $dimension{$dim}{'depth'}).'question';
 		$ucquestion =~ s/^(.)/uc($1)/e;
 		if ($dim_status eq 'pass') {
-		    $dim_info.='<h3>'.$ucquestion.' : you passed the above '.$mandatory.' '.$question.'</h3>';
+		    $dim_info.='<h3>'.$ucquestion.' : you passed this '.$mandatory.' '.$question.'</h3>';
 		}
 		if ($dim_status eq 'fail') {
-		    $dim_info.='<h3>'.$ucquestion.' : you did not pass the above '.$mandatory.' '.$question.'</h3>';
+		    $dim_info.='<h3>'.$ucquestion.' : you did not pass this '.$mandatory.' '.$question.'</h3>';
 		}
 		my %counts = &get_counts($dim,$instance,$parstack,
 					 $safeeval);
@@ -2299,8 +2418,11 @@ sub end_Dimension {
 		    }
 		}
 		# puts the results at the end of the dimension
-		$result .= $dim_info;
-
+		if ($result =~m{<QuestionGradeInfo\s*/>}) {
+		    $result=~s{<QuestionGradeInfo\s*/>}{$dim_info};
+		} else {
+		    $result .= $dim_info;
+		}
 		# puts the results at the beginning of the dimension
 		# my $internal_location=&internal_location($dim);
 		# $result=~s/\Q$internal_location\E/$dim_info/;
@@ -2422,12 +2544,16 @@ sub end_Dimension {
 	    $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		'pass';
 	}
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
     } else {
 	# any other targets no output
 	undef($result);
     }
-    &disable_dimension_parsing();
-    pop(@Apache::bridgetask::dimension);
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+	&disable_dimension_parsing();
+	pop(@Apache::bridgetask::dimension);
+    }
     return $result;
 }
 
@@ -2462,7 +2588,15 @@ sub question_status_message {
     $status .= '.';
     if ($counts->{'opt'}) {
 	$status .= ' You were required to pass '.$counts->{'opt_req'}.
-	    ' optional component'.($counts->{'opt_req'} == 1?'':'s');
+	    ' optional ';
+	if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
+	    $status .=
+		($counts->{'opt_req'} == 1?'criterion':'criteria');
+	} else {
+	    $status .=
+		'component'.($counts->{'opt_req'} == 1?'':'s');
+	}
+	$status .= '.';
     }
     return $status;
 }
@@ -2522,10 +2656,13 @@ sub get_counts {
 
 sub end_Setup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my $result=&Apache::lonxml::endredirection();
+    my $result;
     my $dim=&get_id($parstack,$safeeval);
     my $instance=&get_instance($dim);
     my $version=&get_version();
+    if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
+	$result=&Apache::lonxml::endredirection();
+    }
     if ($target eq 'web') {
 	@Apache::scripttag::parser_env = @_;
 	$result.=&Apache::scripttag::xmlparse($dimension{$dim}{'intro'});
@@ -2604,6 +2741,9 @@ sub start_IntroParagraph {
 	    &Apache::lonxml::startredirection();
 	}
 	
+    } elsif ($target eq 'edit') {
+	$result = &Apache::edit::tag_start($target,$token);
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -2615,6 +2755,14 @@ sub end_IntroParagraph {
     }
 }
 
+sub insert_IntroParagraph {
+    return '
+<IntroParagraph>
+    <startouttext />
+    <endouttext />
+</IntroParagraph>';
+}
+
 sub start_Instance {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $dim = &get_dim_id();
@@ -2628,32 +2776,72 @@ sub start_Instance {
     if (lc($disabled) eq 'yes') {
 	$dimension{$dim}{$id.'.disabled'}='1';
     }
-    return '';
+    my $result;
+    if ($target eq 'edit') {
+	$result = &Apache::edit::tag_start($target,$token);
+	$result.=  
+	    &Apache::edit::text_arg('Id:','id',$token,10).' '.
+	    &Apache::edit::select_arg('Instance is Disabled:','Disabled',
+				      [['no', 'No'],
+				       ['yes','Yes'],],
+				      $token)
+	    .' <br /> '.
+	    &Apache::edit::text_arg('Required number of passed optional elements to pass the Instance:',
+				    'OptionalRequired',$token,4)
+	    .&Apache::edit::end_row().
+	    &Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag=
+	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
+					'id','OptionalRequired','Disabled');
+	if ($constructtag) {
+	    $result = &Apache::edit::rebuild_tag($token);
+	}
+    }
+    return $result;
 }
 
 sub end_Instance {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    if ($target eq 'edit') {
+	$result = &Apache::edit::tag_end($target,$token);
+    }
+    return $result;
 }
 
 sub start_InstanceText {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    my $dim = &get_dim_id();
-    my $instance_id=$Apache::bridgetask::instance{$dim}[-1];
-    my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
+    my $result;
     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+	my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
+	my $dim = &get_dim_id();
+	my $instance_id=$Apache::bridgetask::instance{$dim}[-1];
 	$dimension{$dim}{$instance_id.'.text'}=$text;
+    } elsif ($target eq 'edit') {
+	$result = &Apache::edit::tag_start($target,$token);
+    } elsif ($target eq 'modified') {
     }
-    return '';
+    return $result;
 }
 
 sub end_InstanceText {
     return '';
 }
 
+sub insert_InstanceText {
+    return '
+<InstanceText>
+    <startouttext />
+    <endouttext />
+</InstanceText>';
+}
+
 sub start_Criteria {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
     my $result = '';
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
+	my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
 	my $dim = &get_dim_id();
 	my $id=&get_id($parstack,$safeeval);
 	if ($target eq 'web' || $target eq 'webgrade') {
@@ -2680,6 +2868,21 @@ sub start_Criteria {
 		&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
 	    push(@{$dimension{$dim}{'criterias'}},$id);
 	}
+    } elsif ($target eq 'edit') {
+	$result .=&Apache::edit::tag_start($target,$token);
+	$result.=  
+	    &Apache::edit::text_arg('Id:','id',$token,10).' '.
+	    &Apache::edit::select_arg('Passing is Mandatory:','Mandatory',
+				      [['Y', 'Yes'],
+				       ['N','No'],],
+				      $token)
+	    .' <br /> '.&Apache::edit::end_row().
+	    &Apache::edit::start_spanning_row();
+    } elsif ($target eq 'modified') {
+	my $constructtag=
+	    &Apache::edit::get_new_args($token,$parstack,$safeeval,
+					'id','Mandatory');
+	if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }
     return $result;
 }
@@ -2766,17 +2969,58 @@ END_CRITERIA
 }
 
 sub end_Criteria {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    if ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
+    }
+}
+sub insert_Criteria {
+    return '
+<Criteria>
+    <CriteriaText>
+        <startouttext />
+        <endouttext />
+    </CriteriaText>
+</Criteria>';
+}
+
+sub start_CriteriaText {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $result;
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+	
+    } elsif ($target eq 'edit') {
+	$result = &Apache::edit::tag_start($target,$token);
+    } elsif ($target eq 'modified') {
+    }
+    return $result;
+}
+
+sub end_CriteriaText {
+    return '';
+}
+
+sub insert_CriteriaText {
+    return '
+<CriteriaText>
+    <startouttext />
+    <endouttext />
+</CriteriaText>';
 }
 
 sub start_GraderNote {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    
+    my $result;
     if ($target eq 'webgrade') {
-	return '<div class="LC_GRADING_gradernote"><b>'.
+	$result = '<div class="LC_GRADING_gradernote"><b>'.
 	    &mt('Note to graders:').'</b>';
+    } elsif ($target eq 'edit') {
+	$result = &Apache::edit::tag_start($target,$token);
+    } elsif ($target eq 'modified') {
+    } elsif ($target eq 'web' || $target eq 'grade') {
+	my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); 
     }
-    my $note=&Apache::lonxml::get_all_text('/gradernote',$parser,$style); 
-    return;
+    return $result;
 }
 
 sub end_GraderNote {
@@ -2788,25 +3032,56 @@ sub end_GraderNote {
     return;
 }
 
+sub insert_GraderNote {
+    return '
+<GraderNote>
+    <startouttext />
+    <endouttext />
+</GraderNote>';
+}
 
 
 sub proctor_validation_screen {
     my ($slot) = @_;
     my (undef,undef,$domain,$user) = &Apache::lonnet::whichuser();
     my $url=&Apache::lonnet::studentphoto($domain,$user,'jpg');
+    if ($url ne '/adm/lonKaputt/lonlogo_broken.gif') {
+	$url = "<tr><td colspan=\"2\"><img src=\"$url\" /></td></tr>";
+    } else {
+	undef($url);
+    }
+
     my $name=&Apache::loncommon::plainname($user,$domain);
     
     my $msg;
     if ($env{'form.proctorpassword'}) {
-	$msg='<p><font color="red">'.&mt("Failed to authenticate the proctor.")
-	    .'</font></p>';
+	$msg.='<p><span class="LC_warning">'
+	    .&mt("Failed to authenticate the proctor.")
+	    .'</span></p>';
+    }
+
+    my $valid;
+    my @possible_proctors=split(",",$slot->{'proctor'});
+    foreach my $proctor (@possible_proctors) {
+	if ($proctor =~ /$LONCAPA::username_re:$LONCAPA::domain_re/) {
+	    $valid = 1;
+	    last;
+	}
     }
+    if (!$valid) {
+	$msg.='<p><span class="LC_error">'
+	    .&mt("No valid poctors are defined.")
+	    .'</span></p>';
+    }
+    
     if (!$env{'form.proctordomain'}) { $env{'form.proctordomain'}=$domain; }
+    my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
+    $uri = &HTML::Entities::encode($uri,'<>&"');
     my $result= (<<ENDCHECKOUT);
 <h2>Proctor Validation</h2>
     <p>Your room's proctor needs to validate your access to this resource.</p>
     $msg
-<form name="checkout" method="post" action="$env{'request.uri'}">
+<form name="checkout" method="post" action="$uri">
 <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />
 <table>
@@ -2822,7 +3097,7 @@ sub proctor_validation_screen {
       <tr><td>Name:</td><td>$name</td></tr>
       <tr><td>Student ID:</td><td>$env{'environment.id'}</td></tr>
       <tr><td>Usename</td><td>$user:$domain</td></tr>
-      <tr><td colspan="2"><img src="$url" /></td></tr>
+      $url
     </table>
   </tr></td>
 </table>