--- loncom/homework/bridgetask.pm	2006/05/23 19:55:40	1.153
+++ loncom/homework/bridgetask.pm	2016/05/30 02:45:32	1.266
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.153 2006/05/23 19:55:40 albertel Exp $
+# $Id: bridgetask.pm,v 1.266 2016/05/30 02:45:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,26 +37,29 @@ use Apache::lonmenu;
 use Apache::lonlocal;
 use Apache::lonxml;
 use Apache::slotrequest();
+use Apache::structuretags();
 use Time::HiRes qw( gettimeofday tv_interval );
+use LONCAPA;
+ 
 
 BEGIN {
-    &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','Instance','InstanceText','Criteria','ClosingParagraph'));
+    &Apache::lonxml::register('Apache::bridgetask',('Task','IntroParagraph','Dimension','Question','QuestionText','Setup','Instance','InstanceText','Criteria','CriteriaText','GraderNote','ClosingParagraph'));
 }
 
+my %dimension;
+my $top = 'top';
+
 sub initialize_bridgetask {
     # id of current Dimension, 0 means that no dimension is current 
     # (inside <Task> only)
-    $Apache::bridgetask::dimension='';
-    # list of all Dimension ids seen
-    @Apache::bridgetask::dimensionlist=();
-    # mandatory attribute of all Dimensions seen
-    %Apache::bridgetask::dimensionmandatory=();
+    @Apache::bridgetask::dimension=();
     # list of all current Instance ids
-    @Apache::bridgetask::instance=();
+    %Apache::bridgetask::instance=();
     # list of all Instance ids seen in this problem
     @Apache::bridgetask::instancelist=();
     # key of queud user data that we are currently grading
     $Apache::bridgetask::queue_key='';
+    undef(%dimension);
 }
 
 sub proctor_check_auth {
@@ -80,7 +83,10 @@ sub proctor_check_auth {
 		}
 	    }
 	    if ($authenticated) {
-		&create_new_version($type,$user,$domain,$slot_name);
+		my $check = &check_in($type,$user,$domain,$slot_name,$slot->{'iptied'});
+                if ($check =~ /^error:/) {
+                    return 0;
+                }
 		return 1;
 	    }
 	}
@@ -88,8 +94,78 @@ sub proctor_check_auth {
     return 0;
 }
 
+sub check_in {
+    my ($type,$user,$domain,$slot_name,$needsiptied) = @_;
+    my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
+    my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
+    if ( $useslots eq 'map_map') {
+	my $result = &check_in_sequence($user,$domain,$slot_name,$ip,$needsiptied);
+        if ($result =~ /^error: /) {
+            return $result;
+        }
+    } else {
+        my ($symb) = &Apache::lonnet::whichuser();
+	my $result = &create_new_version($type,$user,$domain,$slot_name,$symb,$ip,$needsiptied);
+        if ($result eq 'ok') {
+	    &Apache::structuretags::finalize_storage();
+        }
+        return $result; 
+    }
+    return 1;
+}
+
+sub check_in_sequence {
+    my ($user,$domain,$slot_name,$ip,$needsiptied) = @_;
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    if (!defined($navmap)) {
+        return 'error: No navmap';
+    }
+    my ($symb) = &Apache::lonnet::whichuser();
+    my ($map)  = &Apache::lonnet::decode_symb($symb);
+    my @resources = 
+	$navmap->retrieveResources($map, sub { $_[0]->is_problem() },0,0);
+    my %old_history = %Apache::lonhomework::history;
+    my %old_results = %Apache::lonhomework::results;
+
+    my $errorcount;
+    foreach my $res (@resources) {
+	&Apache::lonxml::debug("doing ".$res->src);
+	&Apache::structuretags::initialize_storage($res->symb);
+	my $type = ($res->is_task()) ? 'Task' : 'problem';
+	my $result = &create_new_version($type,$user,$domain,$slot_name,$res->symb,$ip,$needsiptied);
+        if ($result eq 'ok') {
+	    &Apache::structuretags::finalize_storage($res->symb);
+        } else {
+            $errorcount ++;
+        }
+    }
+    
+    %Apache::lonhomework::history = %old_history;
+    %Apache::lonhomework::results = %old_results;
+    if ($errorcount) {
+        return 'error: IP taken';
+    }
+}
+
 sub create_new_version {
-    my ($type,$user,$domain,$slot_name) = @_;
+    my ($type,$user,$domain,$slot_name,$symb,$ip,$needsiptied) = @_;
+
+    if ($needsiptied) {
+        my $uniqkey = "$slot_name\0$symb\0$ip";
+        my ($cdom,$cnum);
+        if ($env{'request.course.id'}) {
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            my %hash = (
+                          "$slot_name\0$symb\0$ip" => $env{'user.name'}.':'.$env{'user.domain'}, 
+                       );
+            unless (&Apache::lonnet::newput('slot_uniqueips',\%hash,$cdom,$cnum) eq 'ok') {
+                return 'error: IP taken';
+            }
+        }
+    }
+    
+    my $id = '0';
     if ($type eq 'Task') {
 	# increment version
 	my $version=
@@ -104,29 +180,30 @@ sub create_new_version {
 	}
 	
 	#setup new version and who did it
-	$Apache::lonhomework::results{'resource.0.version'}=$version;
-	if (defined($user) && defined($domain)) {
-	    $Apache::lonhomework::results{"resource.$version.0.checkedin"}=
-		$user.':'.$domain;
-	} else {
-	    $Apache::lonhomework::results{"resource.$version.0.checkedin"}=
-		$env{'user.name'}.':'.$env{'user.domain'};
-	}
-	if (defined($slot_name)) {
-	    $Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
-		$slot_name;
+       	$Apache::lonhomework::results{'resource.0.version'}=$version;
+	$id = "$version.0";
+	if (!defined($user) || !defined($domain)) {
+	    $user = $env{'user.name'};
+	    $domain = $env{'user.domain'};
 	}
+	
     } elsif ($type eq 'problem') {
 	&Apache::lonxml::debug("authed $slot_name");
-	if (defined($user) && defined($domain)) {
-	    $Apache::lonhomework::results{"resource.0.checkedin"}=
-		$user.':'.$domain;
-	}
-	if (defined($slot_name)) {
-	    $Apache::lonhomework::results{"resource.0.checkedin.slot"}=
-		$slot_name;
-	}
     }
+    if (!defined($user) || !defined($domain)) {
+	$user = $env{'user.name'};
+	$domain = $env{'user.domain'};
+    }
+
+    $Apache::lonhomework::results{"resource.$id.checkedin"}=
+	$user.':'.$domain;
+    $Apache::lonhomework::results{"resource.$id.checkedin.ip"}=$ip;
+
+    if (defined($slot_name)) {
+	$Apache::lonhomework::results{"resource.$id.checkedin.slot"}=
+	    $slot_name;
+    }
+    return 'ok'; 
 }
 
 sub get_version {
@@ -152,6 +229,10 @@ sub get_version {
 
 sub add_previous_version_button {
     my ($status)=@_;
+    my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        return;
+    }
     my $result;
     if ($Apache::lonhomework::history{'resource.0.version'} eq '') {
 	return '';
@@ -188,7 +269,10 @@ sub add_previous_version_button {
 }
 
 sub add_grading_button {
-    my (undef,$cid)=&Apache::lonxml::whichuser();
+    my (undef,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        return;
+    }
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
     my %sections = &Apache::loncommon::get_sections($cdom,$cnum);
@@ -197,36 +281,56 @@ sub add_grading_button {
     if (scalar(keys(%sections)) < 3) {
 	$size=scalar(keys(%sections))+2;
     }
-    my $sec_select = '<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
-    $sec_select .= "<option value='all' selected='selected'>all</option>\n";
+    my $sec_select = "\n".'<select multiple="multiple" name="chosensections" size="'.$size.'">'."\n";
+    $sec_select .= "\t".'<option value="all" selected="selected">'.&mt('all')."</option>\n";
     foreach my $sec (sort {lc($a) cmp lc($b)} (keys(%sections))) {
-	$sec_select .= "<option value=\"$sec\">$sec</option>\n";
+	$sec_select .= "\t<option value=\"$sec\">$sec</option>\n";
     }
-    $sec_select .= "<option value='none'>none</option></select>\n";
-    
-    my $result=' <input type="submit" name="gradeasubmission" value="'.
-	&mt("Get a submission to grade").'" />';
-    $result.='<input type="hidden" name="grade_target" value="webgrade" />';
-    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
+    $sec_select .= "\t".'<option value="none">'.&mt('none')."</option>\n</select>\n";
+
+    my $uri=$env{'request.uri'};
+    if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
+    my $result = 
+        '<form name="gradesubmission" method="post" action="'.$uri.'">'.
+        "\n\t".'<input type="submit" name="gradeasubmission" value="'.
+	&mt("Get a submission to grade").'" />'.
+        "\n\t".'<input type="hidden" name="grade_target" value="webgrade" />';
+    my $see_all = &Apache::lonnet::allowed('mgq',$env{'request.course.id'});
+    my $see_sec = &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.
+					   '/'.$env{'request.course.sec'});
+
+    if ($see_all || $see_sec) {
 	my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
-	$result.='<table><tr>';
-	$result.='<td rowspan="4">Specify a section: </td><td rowspan="4">'.$sec_select.'</td>';
-	$result.='<td>'.' <input type="submit" name="reviewagrading" value="'.
+	$result.="\n\t".'<table>'."\n\t\t".'<tr>';
+	if ($see_all || (!&section_restricted())) {
+	    $result.="\n\t\t\t".'<td rowspan="4">'.&mt('Specify a section:').' </td>'.
+		"\n\t\t\t".'<td rowspan="4">'.$sec_select."\n\t\t\t".'</td>';
+	} else {
+	    $result.="\n\t\t\t".'<td rowspan="4">'.&mt('Grading section:').' </td>'.
+		"\n\t\t\t".'<td rowspan="4">'.$env{'request.course.sec'}."\n\t\t\t".'</td>';
+	}
+	$result.="\n\t\t\t".'<td>'.'<input type="submit" name="reviewagrading" value="'.
 	    &mt("Select an entry from the grading queue:").'" /> ';
 
-	$result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' </td></tr>'."\n";
+	$result.= "\n\t\t\t\t".&mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n";
 
 	($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
-	$result.='<tr><td>'.
-	    ' <input type="submit" name="reviewasubmission" value="'.
+	$result.="\n\t\t".'<tr>'.
+	    "\n\t\t\t".'<td>'.
+	    "\n\t\t\t\t".'<input type="submit" name="reviewasubmission" value="'.
 	    &mt("Select an entry from the review queue:").'" /> ';
 	$result.=&mt("[_1] entries, [_2] ready, [_3] being graded",
-		     $entries,$ready,$locks).'</td></tr>'."\n";
-	$result.='<tr><td> <input type="submit" name="regradeasubmission" value="'.
-	    &mt("List of user's grade status").'" /> </td></tr></table>'."\n";
-	$result.='<p> <input type="submit" name="regradeaspecificsubmission" value="'.
-	    &mt("Regrade specific user:").'" />'."\n";
-	$result.='<input type="text" size="12" name="gradinguser" />';
+		     $entries,$ready,$locks).'</td>'."\n\t\t".'</tr>'."\n";
+	$result.="\n\t\t".'<tr>'.
+	    "\n\t\t\t".'<td>'.
+	    "\n\t\t\t\t".'<input type="submit" name="regradeasubmission" value="'.
+	    &mt("List of user's grade status").'" /> </td>'
+	    ."\n\t\t".'</tr>'
+	    ."\n\t".'</table>'."\n";
+	$result.="\n\t".'<p>'.
+	    "\n\t\t".'<input type="submit" name="regradeaspecificsubmission" value="'.
+	    &mt("Regrade specific user:").'" />';
+	$result.= "\n\t\t".'<input type="text" size="12" name="gradinguser" />';
 	$result.=&Apache::loncommon::select_dom_form($env{'user.domain'},
 						     'gradingdomain');
 	$result.=' '.
@@ -234,14 +338,49 @@ sub add_grading_button {
 						   'gradinguser',
 						   'gradingdomain');
 	$result.=&Apache::loncommon::studentbrowser_javascript();
-	$result.= '</p>';
+	$result.= '</p>'."\n";
+    }
+    $result .= '</form>'."\n";
+    return $result;
+}
+
+sub add_slotlist_button {
+    my (undef,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        return;
+    }
+    my $symb=&Apache::lonnet::symbread();
+    my $result;
+    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'}) ||
+        &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+        $result = '<form method="post" name="slotrequest" action="/adm/slotrequest">'.
+                  '<input type="hidden" name="symb" value="'.$symb.'" />'.
+                  '<input type="hidden" name="command" value="showslots" />'.
+                  '<input type="submit" name="requestattempt" value="'.
+                  &mt('Show Slot list').'" />'.
+                  '</form>';
+        my $target_id =
+               &Apache::lonstathelpers::make_target_id({symb => $symb,
+                                                             part => '0'});
+        if (!&section_restricted()) {
+            $result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
+                     '<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
+                     '<input type="hidden" name="reportSelected" value="grading_analysis" />'.
+                     '<input type="submit" name="grading" value="'.
+                     &mt('Show Grading Status').'" />'.
+                     '</form>';
+        }
     }
     return $result;
 }
 
 sub add_request_another_attempt_button {
     my ($text)=@_;
-    if (!$text) { $text="Request another attempt"; }
+    my (undef,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
+    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+        return;
+    }
+    if (!$text) { $text=&mt('Request another attempt'); }
     my $result;
     my $symb=&Apache::lonnet::symbread();
     # not a slot access based resource
@@ -253,23 +392,25 @@ sub add_request_another_attempt_button {
     my ($slot_name,$slot)=&Apache::slotrequest::check_for_reservation($symb);
     my $action='get_reservation';
     if ($slot_name) {
-	$text="Change reservation.";
+	$text=&mt('Change reservation');
 	$action='change_reservation';
 	my $description=&Apache::slotrequest::get_description($slot_name,
 							      $slot);
-	$result.=(<<STUFF);
-<p> Will be next available: $description </p>
-STUFF
+	$result.='<p>'
+                .&mt('Will be next available:')
+                .' '.$description
+                .'</p>';
     }
     
     if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
-    $symb=&Apache::lonnet::escape($symb);
-    $result.='<form method="post" action="/adm/slotrequest">'.
-	'<input type="hidden" name="symb" value="'.$symb.'" />'.
-	'<input type="hidden" name="command" value="'.$action.'" />'.
+    $symb=&escape($symb);
+    $result.=
+        "\n\t".'<form method="post" action="/adm/slotrequest">'."\n\t\t".
+	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n\t\t".
+	'<input type="hidden" name="command" value="'.$action.'" />'."\n\t\t".
 	'<input type="submit" name="requestattempt" value="'.
-	&mt($text).'" />'.
-	'</form>';
+	$text.'" />'."\n\t".
+	'</form>'."\n";
     return $result;
 }
 
@@ -289,9 +430,22 @@ sub style {
     my ($target) = @_;
     if ($target eq 'web'
 	|| $target eq 'webgrade') {
-	return (<<STYLE);
+	my $style = (<<STYLE);
 <link rel="stylesheet" type="text/css" href="/res/adm/includes/task.css" />
 STYLE
+        if ($env{'browser.type'} eq 'explorer'
+	    && $env{'browser.os'} eq 'win' ) {
+	    if ($env{'browser.version'} < 7) {
+		$style .= (<<STYLE);
+<link rel="stylesheet" type="text/css" href="/res/adm/includes/task_ie.css" />
+STYLE
+            } else {
+		$style .= (<<STYLE);
+<link rel="stylesheet" type="text/css" href="/res/adm/includes/task_ie7.css" />
+STYLE
+	    }
+	}
+	return $style;
     }
     return;
 }
@@ -303,6 +457,7 @@ sub show_task {
 		       ( $status eq 'BANNED') ||
 		       ( $status eq 'UNAVAILABLE') ||
 		       ( $status eq 'NOT_IN_A_SLOT') ||
+                       ( $status eq 'NOT_YET_VIEWED') ||
 		       ( $status eq 'NEEDS_CHECKIN') ||
 		       ( $status eq 'WAITING_FOR_GRADE') ||
 		       ( $status eq 'INVALID_ACCESS') ||
@@ -313,18 +468,59 @@ sub show_task {
     return 1;
 }
 
+my @delay;
+sub nest { 
+    if (@delay) {
+	return $delay[-1];
+    } else {
+	return;
+    }
+}
+
+sub start_delay {
+    push(@delay,1);
+}
+sub end_delay {
+    pop(@delay);
+}
+
+sub nested_parse {
+    my ($str,$env,$args) = @_;
+    my @old_env = @Apache::scripttag::parser_env;
+    @Apache::scripttag::parser_env = @$env;
+    if (exists($args->{'set_dim_id'})) {
+	&enable_dimension_parsing($args->{'set_dim_id'});
+    }
+    push(@delay,(($args->{'delayed_dim_results'})? 1 : 0));
+    my $result = &Apache::scripttag::xmlparse($$str);
+    pop(@delay);
+    if (exists($args->{'set_dim_id'})) {
+	&disable_dimension_parsing();
+    }
+    @Apache::scripttag::parser_env = @old_env;
+    if ($args->{'delayed_dim_results'}) {
+	my $dim = &get_dim_id();
+	&Apache::lonxml::debug(" tossing out $result ");
+	&Apache::lonxml::debug(" usining out $dim 's  ". $dimension{$dim}{'result'});
+	return $dimension{$dim}{'result'};
+    }
+    return $result;
+}
+
 sub internal_location {
     my ($id)=@_;
     return '<!-- LONCAPA_INTERNAL_ADD_TASK_STATUS'.$id.' -->';
 }
 
 sub submission_time_stamp {
-    my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+    my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
     my $submissiontime;
     my $version=$Apache::lonhomework::history{'resource.0.version'};
     for (my $v=$Apache::lonhomework::history{'version'};$v>0;$v--) {
-	if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})) {
+	if (defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.bridgetask.portfiles'})
+	    && defined($Apache::lonhomework::history{$v.':resource.'.$version.'.0.tries'})) {
 	    $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
+	    last;
 	}
     }
     my $result;
@@ -335,16 +531,18 @@ sub submission_time_stamp {
 	my ($color,$when)=('#FF6666','after');
 	if ($diff > 0) { ($color,$when)=('#336600','before'); }
 	my $info;
+	$diff = abs($diff);
 	if ($diff%60) { $info=($diff%60).' seconds'; }
 	$diff=int($diff/60);
 	if ($diff%60) { $info=($diff%60).' minutes '.$info; }
 	$diff=int($diff/60);
 	if ($diff) {    $info=$diff.' hours '.$info; }
 	$result='<p><font color="'.$color.'">'.
-	    &mt('Student submitted [_1] [_2] the deadline. 
-                 (Submission was at [_3], end of period was [_4].)',
-		$info,$when,scalar(localtime($submissiontime)),
-		scalar(localtime($slot{'endtime'}))).
+	    &mt('Student submitted [_1] [_2] the deadline. '.
+		'(Submission was at [_3], end of period was [_4].)',
+		$info,$when,
+		&Apache::lonlocal::locallocaltime($submissiontime),
+		&Apache::lonlocal::locallocaltime($slot{'endtime'})).
 		'</font></p>';
     }
     return $result;
@@ -353,7 +551,7 @@ sub submission_time_stamp {
 sub file_list {
     my ($files,$uname,$udom) = @_;
     if (!defined($uname) || !defined($udom)) {
-	(undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
+	(undef,undef,$udom,$uname) = &Apache::lonnet::whichuser();
     }
     my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
 
@@ -362,42 +560,130 @@ sub file_list {
 	my $file=$file_url.$partial_file;
 	$file=~s|/+|/|g;
 	&Apache::lonnet::allowuploaded('/adm/bridgetask',$file);
-	$file_list.='<li><nobr><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
-	    &Apache::loncommon::icon($file).'" border="0"> '.$file.
-	    '</a></nobr></li>'."\n";
+	$file_list.='<li><span class="LC_nobreak"><a href="'.$file.'?rawmode=1" target="lonGRDs"><img src="'.
+	    &Apache::loncommon::icon($file).'" alt="file icon" border="0" /> '.$file.
+	    '</a></span></li>'."\n";
     }
     $file_list.="</ul>\n";
     return $file_list;
 }
 
+sub grade_mode {
+    if ($env{'form.regrade'} || $env{'form.regradeaspecificsubmission'}) {
+	return 'regrade';
+    }
+    return 'queue_grade';
+}
+
 sub webgrade_standard_info {
     my ($version)=&get_version();
 
     my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"});
 
-    my %lt=&Apache::lonlocal::texthash('done' => 'Next Item',
-				       'stop' => 'Quit Grading',
-				       'fail' => 'Fail Rest',
-				       );
-				       
+    my %lt = &Apache::lonlocal::texthash(
+        'done'   => 'Next Item',
+        'stop'   => 'Quit Grading',
+        'fail'   => 'Fail Rest',
+        'cancel' => 'Cancel',
+        'submit' => 'Submit Grades',
+    );
+
     my $result=<<INFO;
   <div class="LC_GRADING_maincontrols">
+INFO
+
+    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;
     <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($env{'request.uri'});
+    my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
+    my (undef,undef,$domain,$user)= &Apache::lonnet::whichuser();
+    my ($msg,$files,$shown);
+    if (@files > 0) {
+        $files = '<ul>';
+        foreach my $file (@files) {
+	    my $url="/uploaded/$domain/$user/portfolio$file";
+	    if (! &Apache::lonnet::stat_file($url)) {
+	        $file = '<span class="LC_error">'
+                       .&mt('[_1]Nonexistent file:[_2]'
+                           ,'<span class="LC_error"> '
+                           ,'</span> <span class="LC_filename">'.$file.'</span>');
+	        $msg .= "<p>".&mt('Submitted non-existent file [_1]',$file)."</p>\n";
+	    } else {
+	        $file = '<span class="LC_filename">'.$file.'</span>';
+	        $msg .= "<p>".&mt('Submitted file [_1]',$file)."</p>\n";
+	    }
+	    $files .= '<li>'.$file.'</li>';
+        }
+        $files.='</ul>';
+        $shown = '<p>'.&mt('Files submitted: [_1]',$files).'</p>'
+                .'<p>'.&mt('You are now done with this Bridge Task').'</p>'
+                .'<hr />'
+                .'<p><a href="/adm/logout">'.&mt('Logout').'</a></p>'
+                .'<p><a href="/adm/roles">'.&mt('Change to a different course').'</a></p>';
+    } else {
+        $msg = &mt("Submission status: no files currently submitted, when 'Done' was indicated.");
+        $shown = '<p class="LC_error">'.
+                 &mt('You did not submit any files.  Please try again.').'</span>'.
+                 '</p><p><a href="javascript:history.go(-1);">'.&mt('Back to Bridge Task').'</a></p><hr />';
+    }
+    my $subject = &mt('Submission message for [_1]',$title);
+    my ($message_status,$comment_status);
+    my $setting = $env{'course.'.$env{'request.course.id'}.'.task_messages'};
+    $setting =~ s/^\s*(\S*)\s*$/$1/;
+    $setting = lc($setting);
+    if ($setting eq 'only_student'
+	|| $setting eq 'student_and_user_notes_screen') {
+	$message_status =
+	    &Apache::lonmsg::user_normal_msg($user,$domain,$subject,$msg);
+	$message_status = '<p>'.&mt('Message sent to user: [_1]',
+				    $message_status).' </p>';
+    }
+    if ($setting eq 'student_and_user_notes_screen') {
+	$comment_status = 
+	    &Apache::lonmsg::store_instructor_comment($subject.'<br />'.
+						      $msg,$user,$domain);
+	$comment_status = '<p>'.&mt('Message sent to instructor: [_1]',
+				    $comment_status).' </p>';
+    }
+ 
+    return "<h2>$title</h2>"
+          .$shown
+          .$message_status
+          .$comment_status;
 }
 
 sub start_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     my ($status,$accessmsg,$slot);
+    &Apache::structuretags::init_problem_globals('Task');
     if ($target ne 'webgrade') {
-	&Apache::structuretags::init_problem_globals('Task');
 	&Apache::structuretags::initialize_storage();
 	&Apache::lonhomework::showhash(%Apache::lonhomework::history);
 	if ($env{'request.state'} eq 'construct') {
@@ -419,51 +705,71 @@ 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' || $target eq 'grade' || $target eq 'answer' ||
+        $target eq 'tex') {
+        if ($env{'form.markaccess'}) {
+            my @interval=&Apache::lonnet::EXT("resource.0.interval");
+            my ($timelimit) = ($interval[0] =~ /^(\d+)/);
+            &Apache::lonnet::set_first_access($interval[1],$timelimit);
+        }
     }
 
     if ($target eq 'web' && $env{'request.state'} ne 'construct') {
 	if ($Apache::lonhomework::queuegrade
 	    || $Apache::lonhomework::modifygrades) {
-	    $result.='<form name="gradesubmission" method="post" action="';
-	    my $uri=$env{'request.uri'};
-	    if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
-	    $result.=$uri.'">'.&add_grading_button()."</form>";
+	    $result .= &add_grading_button();
 	    my $symb=&Apache::lonnet::symbread();
-	    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
-		$result.='<form method="post" name="slotrequest" action="/adm/slotrequest">'.
-		    '<input type="hidden" name="symb" value="'.$symb.'" />'.
-		    '<input type="hidden" name="command" value="showslots" />'.
-		    '<input type="submit" name="requestattempt" value="'.
-		    &mt('Show Slot list').'" />'.
-		    '</form>';
-		my $target_id = 
-		    &Apache::lonstathelpers::make_target_id({symb => $symb,
-							     part => '0'});
-		$result.='<form method="post" name="gradingstatus" action="/adm/statistics">'.
-		    '<input type="hidden" name="problemchoice" value="'.$target_id.'" />'.
-		    '<input type="hidden" name="reportSelected" value="grading_analysis" />'.
-		    '<input type="submit" name="grading" value="'.
-		    &mt('Show Grading Status').'" />'.
-		    '</form>';
+	    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})
+		|| &Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+                $result .= &add_slotlist_button(); 
 	    }
 	}
     }
-    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' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' ||
-	$target eq 'tex') {
+    if ($target eq 'web' 
+	|| ($target eq 'grade' && !$env{'form.webgrade'}) 
+	|| $target eq 'answer' 
+	|| $target eq 'tex') {
 	my ($version,$previous)=&get_version();
 	($status,$accessmsg,my $slot_name,$slot) = 
 	    &Apache::lonhomework::check_slot_access('0','Task');
-	if ($status eq 'CAN_ANSWER' && $version eq '') {
-	    &create_new_version('Task',undef,undef,$slot_name);
+	if ((($status eq 'CAN_ANSWER') || ($status eq 'NOT_YET_VIEWED')) && ($version eq '')) {
+	    # CAN_ANSWER or NOT_YET_VIEWED mode, and no current version, unproctored access
+	    # thus self-checkedin
+            my $needsiptied;
+            if (ref($slot)) {
+                $needsiptied = $slot->{'iptied'};
+            }
+	    my $check = &check_in('Task',undef,undef,$slot_name,$needsiptied);
+            if ($check =~ /^error:\s+(.*)$/) {
+                my $symb=&Apache::lonnet::symbread();
+                &Apache::lonnet::logthis("Error: $1 during self-checkin of version $version of Task (symb: $symb) using slot: $slot_name");   
+            }
 	    &add_to_queue('gradingqueue',{'type' => 'Task',
 					  'time' => time,
 					  'slot' => $slot_name});
 	    ($version,$previous)=&get_version();
 	}
+        if (($target eq 'web') && ($version ne '') && ($slot_name ne '')) {
+            if (ref($slot) eq 'HASH') {
+                if ($slot->{'endtime'} > time()) {
+                    $result .=
+                        &Apache::lonhtmlcommon::set_due_date($slot->{'endtime'});
+                }
+            }
+	}
+
+	my $status_id = 'LC_task_take';
+        if ($previous && $target eq 'answer') {
+            $status_id = 'LC_task_answer';
+        } elsif ($previous || $status eq 'SHOW_ANSWER') {
+	    $status_id = 'LC_task_feedback';
+        }
+	$result .= '<div class="LC_task" id="'.$status_id.'">'."\n";
 
 	push(@Apache::inputtags::status,$status);
 	$Apache::inputtags::slot_name=$slot_name;
@@ -480,49 +786,31 @@ sub start_Task {
 		}
 		my $msg;
 		if ($status eq 'UNAVAILABLE') {
-		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+		    $msg.='<p class="LC_error">'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</p>';
 		} elsif ($status eq 'NOT_IN_A_SLOT') {
-		    $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
-		    $msg.=&add_request_another_attempt_button("Sign up for time to work.");
+		    $msg.='<p class="LC_warning">'.&mt('You are not currently signed up to work at this time and/or place.').'</p>';
+		    $msg.=&add_request_another_attempt_button("Sign up for time to work");
 		} elsif ($status eq 'NEEDS_CHECKIN') {
-		    $msg.='<h1>'.&mt('You need the Proctor to validate you.').
-			'</h1>'.&proctor_validation_screen($slot);
+		    $msg.='<p class="LC_warning">'.&mt('You need the Proctor to validate you.').
+			'</p>'.&proctor_validation_screen($slot);
 		} elsif ($status eq 'WAITING_FOR_GRADE') {
-		    $msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>';
+		    $msg.='<p class="LC_info">'.&mt('Your submission is in the grading queue.').'</p>';
 		} elsif ($env{'form.donescreen'}) {
-		    my $title=&Apache::lonnet::gettitle();
-		    my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
-		    my (undef,undef,$domain,$user)=
-			&Apache::lonxml::whichuser();
-		    my $files = '<ul>';
-		    foreach my $file (@files) {
-			my $url="/uploaded/$domain/$user/portfolio$file";
-			if (! &Apache::lonnet::stat_file($url)) {
-			    $file = &mt('<font color="red"> Nonexistant file:</font> <tt>[_1]</tt>',$file);
-			} else {
-			    $file = '<tt>'.$file.'</tt>';
-			}
-			$files .= '<li>'.$file.'</li>';
-		    }
-		    $files.='</ul>';
-
-		    $result.=<<DONESCREEN;
-<h2>$title</h2>
-<p> Files submitted: $files </p>
-<p> You are now done with this Bridge Task </p>
-<hr />
-<p> <a href="/adm/logout">Logout</a> </p>
-<p> <a href="/adm/roles">Change to a different course</a> </p>
-DONESCREEN
-		} elsif ($status ne 'NOT_YET_VIEWED') {
-		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
+		    $result .= &done_screen($version);
+		} elsif ($status eq 'NOT_YET_VIEWED') {
+                    my $symb=&Apache::lonnet::symbread();
+                    $msg.=&Apache::structuretags::firstaccess_msg($accessmsg,$symb);
+                } elsif ($status eq 'NEED_DIFFERENT_IP') {
+#FIXME
+		} else {
+		    $msg.='<p class="LC_warning">'.&mt('Not open to be viewed').'</p>';
 		}
 		if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
 		    $msg.='The problem '.$accessmsg;
 		}
 		$result.=$msg.'<br />';
 	    } elsif ($target eq 'tex') {
-		$result.='\begin{document}\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';
+		$result.='\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';
 		if ($status eq 'UNAVAILABLE') {
 		    $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
 		} else {
@@ -545,8 +833,8 @@ DONESCREEN
 	} elsif ($target eq 'web') {
 
 	    $result.=&preserve_grade_info();
-	    $result.=&internal_location();
-	    $result.=$form_tag_start.
+	    $result.=&internal_location(); 
+	    $result.=$form_tag_start."\t".
 		'<input type="hidden" name="submitted" value="yes" />';
 	    &Apache::lonxml::startredirection();
 	}
@@ -554,27 +842,28 @@ DONESCREEN
 	      $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>';
 	    #$result.='<br />Review'.&show_queue('reviewqueue');
 	    #$result.='<br />Grade'.&show_queue('gradingqueue');
 	}
-	# FIXME Blast! still need to reorg this, need to reshow the
-        #       queue being reviewed once done with the grade pass...
-        #       Hrrm, vaildation pass should perhaps say 'not_locked'
-        #       perhaps do a search if there is a key that is mine and if
-        #       there isn't reshow the queue....
+
 	my ($todo,$status_code,$msg)=&get_key_todo($target);
 
 	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="'.
-		&Apache::lonnet::escape($todo).'" />';
+		&escape($todo).'" />';
 	    $Apache::bridgetask::queue_key=$todo;
 	    &Apache::structuretags::initialize_storage();
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
@@ -589,6 +878,22 @@ DONESCREEN
 		    &mt('Return to resource').'</a></p>';
 		if      ($status_code eq 'stop') {
 		    $result.='<b>'.&mt("Stopped grading.").'</b>'.$back;
+		} elsif ($status_code eq 'cancel') {
+		    $result.='<b>'.&mt("Cancelled grading.").'</b>'.$back;
+                } elsif ($status_code eq 'terminated') {
+                    $result.= '<b>'.&mt('Terminated grading').'</b><br />'.
+                              '<span class="LC_error">'.
+                              &mt('Grading for [_1] has not been saved because of a grading key mismatch.',
+                              '<tt>'.$env{'form.terminated'}.'</tt>').'</span><br />'.$back;
+		} elsif ($status_code eq 'never_versioned') {
+		    $result.='<b>'.
+			&mt("Requested user has never accessed the task.").
+			'</b>'.$back;
+		} elsif ($status_code =~ /still_open:(.*)/) {
+		    my $date = &Apache::lonlocal::locallocaltime($1);
+		    $result.='<b>'.
+			&mt("Task is still open, will close at [_1].",$date).
+			'</b>'.$back;
 		} elsif ($status_code eq 'lock_failed') {
 		    $result.='<b>'.&mt("Failed to lock the requested record.")
 			.'</b>'.$back;
@@ -609,6 +914,8 @@ DONESCREEN
 		}
 	    }
 	    $webgrade='no';
+	}
+	if (!$todo || $env{'form.cancel'}) {
 	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
 	}
 	if ($target eq 'webgrade' && defined($env{'form.queue'})) {
@@ -624,26 +931,42 @@ DONESCREEN
 		$result.='<input type="hidden" name="regrade" value="'.
 		    $env{'form.regrade'}.'" />';
 	    }
-	    if ($env{'form.chosensections'}) {
-		my @chosen_sections=
-		    &Apache::loncommon::get_env_multiple('form.chosensections');
+	    if ($env{'form.chosensections'} || &section_restricted()) {
+		my @chosen_sections = &get_allowed_sections();
 		foreach my $sec (@chosen_sections) {
 		    $result.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';
 		}
 	    }
 	    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">';
+	    &Apache::lonxml::startredirection();
+	    &start_delay();
+	    $dimension{$top}{'result'}=$result;
+	    undef($result);
 	}
     } elsif ($target eq 'edit') {
 	$result.=$form_tag_start.
 	    &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 = '';
@@ -651,10 +974,30 @@ DONESCREEN
     return $result;
 }
 
+sub get_task_end_time {
+    my ($queue_entry,$symb,$udom,$uname) = @_;
+
+    my $end_time;
+    if (my $slot = &slotted_access($queue_entry)) {
+	my %slot_data=&Apache::lonnet::get_slot($slot);
+	$end_time = $slot_data{'endtime'};
+    } else {
+	$end_time = &Apache::lonhomework::due_date('0',$symb,
+						   $udom,$uname);
+    }
+    return $end_time;
+}
+
 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';
@@ -680,12 +1023,19 @@ sub get_key_todo {
     if (defined($env{'form.regradeaspecificsubmission'}) &&
 	defined($env{'form.gradinguser'})               &&
 	defined($env{'form.gradingdomain'})               ) {
-	my ($symb,$cid)=&Apache::lonxml::whichuser();
+	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'});
+	
+	if (&section_restricted()) {
+	    my $classlist=&get_limited_classlist();
+	    if (!&allow_grade_user($classlist->{$uname.':'.$udom})) {
+		return (undef,'not_allowed',
+			&mt("Requested student ([_1]) is in a section you aren't allowed to grade.",$uname.':'.$udom));
+	    }
+	}
 	my $gradingkey=&encode_queue_key($symb,$udom,$uname);
 
 	my $queue;
@@ -699,18 +1049,34 @@ sub get_key_todo {
 	if (!$queue) {
 	    $env{'form.queue'} = $queue = 'none';
 	    #not queued so doing either a re or pre grade
+	    my %status = &Apache::lonnet::restore($symb,$cid,$udom,$uname);
+	    if ($status{'resource.0.version'} < 1) {
+		return (undef,'never_versioned');
+	    }
 	    return ($gradingkey);
 	}
 
+	if ($queue) {
+	    my $queue_entry = &get_queue_data($queue,$udom,$uname);
+	
+	    my $end_time = &get_task_end_time($queue_entry,$symb,
+					      $udom,$uname);
+	    if ($end_time > time) {
+		return (undef,"still_open:$end_time");
+	    }
+	}
+
 	my $who=&queue_key_locked($queue,$gradingkey);
 	if ($who eq $me) {
 	    #already have the lock
-	    $env{'form.gradingkey'}=&Apache::lonnet::escape($gradingkey);
+	    $env{'form.gradingkey'}=&escape($gradingkey);
+	    &Apache::lonxml::debug("already locked");
 	    return ($gradingkey);
 	}
 	
 	if (!defined($who)) {
 	    if (&lock_key($queue,$gradingkey)) {
+		&Apache::lonxml::debug("newly locked");
 		return ($gradingkey);
 	    } else {
 		return (undef,'lock_failed');
@@ -730,13 +1096,17 @@ sub get_key_todo {
 	$env{'form.queue'}=$queue='gradingqueue';
     }
 
-    my $gradingkey=&Apache::lonnet::unescape($env{'form.gradingkey'});
+    my $gradingkey=&unescape($env{'form.gradingkey'});
 
     if ($env{'form.queue'} eq 'none') {
 	if (defined($env{'form.gradingkey'})) {
 	    if ($target eq 'webgrade') {
 		if ($env{'form.stop'}) {
 		    return (undef,'stop');
+		} elsif ($env{'form.cancel'}) {
+		    return (undef,'cancel');
+                } elsif ($env{'form.terminated'}) {
+                    return (undef, 'terminated');
 		} elsif ($env{'form.next'}) {
 		    return (undef,'select_user');
 		}
@@ -782,12 +1152,17 @@ sub get_key_todo {
 
     if ($env{'form.queuemode'} ne 'selected') {
 	# don't get something new from the queue if they hit the stop button
-    	if (!($env{'form.stop'} && $target eq 'webgrade') 
+    	if (!(($env{'form.cancel'} || $env{'form.stop'} || $env{'form.terminated'}) 
+	      && $target eq 'webgrade') 
 	    && !$env{'form.gradingaction'}) {
 	    &Apache::lonxml::debug("Getting anew $queue");
 	    return (&get_from_queue($queue));
 	} else {
-	    return (undef,'stop');
+            if ($env{'form.terminated'}) {
+                return (undef,'terminated');
+            } else {
+                return (undef,'stop');
+            }
 	}
     }
     return (undef,undef)
@@ -817,32 +1192,44 @@ sub end_Task {
 		}
 		if ($status eq 'CAN_ANSWER' && !$previous && 
 		    !$env{'form.donescreen'}) {
-		    $result.="\n".'<table border="1">'.
+                    my ($portheader,$porttext);
+                    if ($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"}) {
+                        $portheader = &mt('Submit Additional Portfolio Files for Grading');
+                        $porttext = &mt('Indicate which additional files from your portfolio are to be evaluated in grading this task.');
+                    } else {
+                        $portheader = &mt('Submit Portfolio Files for Grading');
+                        $porttext = &mt('Indicate the files from your portfolio to be evaluated in grading this task.');
+                    }
+		    $result.="\n".'<div>'.&Apache::lonhtmlcommon::start_pick_box().
 			&Apache::inputtags::file_selector("$version.0",
 							  "bridgetask","*",
 							  'portfolioonly',
-							  '
-<h2>'.&mt('Submit Portfolio Files for Grading').'</h2>
-<p>'.&mt('Indicate the files from your portfolio to be evaluated in grading this task.').'</p>').
-							  "</table>";
+                                                          '<h3>'.$portheader.'</h3><br />'.
+                                                          $porttext.'<br />').
+			&Apache::lonhtmlcommon::end_pick_box().'</div>';
+		}
+		if (!$previous && $status ne 'SHOW_ANSWER' &&
+		    &show_task($status,$previous)) {
+		    $result.=&Apache::inputtags::gradestatus('0',$target,1);
 		}
+		
+		$result.='</form>';
+
 		if (!$previous && $status ne 'SHOW_ANSWER' &&
 		    &show_task($status,$previous)) {
-		    $result.=&Apache::inputtags::gradestatus('0');
-		    $result.='</form>';
 		    my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
+                    my $donetext = &mt('Done');
 		    $result.=<<DONEBUTTON;
 <form name="done" method="post" action="$action">
    <input type="hidden" name="donescreen" value="1" />
-   <input type="submit" value="Done" />
+   <input type="submit" value="$donetext" />
 </form>
 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=
@@ -857,50 +1244,74 @@ DONEBUTTON
 		    }
 		    $start_time=&Apache::lonlocal::locallocaltime($start_time);
 
-		    my $status = "\n<div class='LC_$bt_status LC_criteria'>\n";
+		    my $status = 
+			"\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'>\n\t";
 		    
+		    my $dim = $top;
+		    my %counts = &get_counts($dim,undef,$parstack,
+					     $safeeval);
+		    my $question_status ="\n\t<p>".
+			&question_status_message(\%counts,-1).
+			"</p>\n";
+
 		    if ($bt_status eq 'pass')  {
-			$status.='<h2>You passed the '.$title.' given on '.
-			    $start_time.'</h2>';
+			$status.='<h2>'
+                                .&mt('You passed the [_1] given on [_2].',$title,$start_time)
+                                .'</h2>';
+			$status.=$question_status;
 		    }
 		    if ($bt_status eq 'fail')  {
-			$status.='<h2>You did not pass the '.$title.' given on '.
-			    $start_time.'</h2>';
+			$status.='<h2>'
+                                .&mt('You did not pass the [_1] given on [_2].',$title,$start_time)
+                                .'</h2>';
+			$status.=$question_status;
 			if (!$previous) {
 			    $status.=&add_request_another_attempt_button();
 			}
 		    }
-		    my $man_count=0;
-		    my $opt_count=0;
-		    my $opt_passed=0;
-		    foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
-			if ($Apache::bridgetask::dimensionmandatory{$dim_id}
-			    eq 'N') {
-			    $opt_count++;
-			    if ($Apache::lonhomework::history{"resource.$version.0.$dim_id.status"} eq 'pass') {
-				$opt_passed++;
-			    }
-			} else {
-			    $man_count++;
+		    
+		    $status.="\n".'</div>'."\n";
+
+		    foreach my $id (@{$dimension{$dim}{'criterias'}}) {
+			my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+			if ($type eq 'dimension') {
+			    $result.=$dimension{$id}{'result'};
+			    next;
 			}
+			my $criteria = 
+			    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+					  [@_]);
+			$status .= &layout_web_Criteria($dim,$id,$criteria);
 		    }
-		    
-		    my $opt_req=&Apache::lonxml::get_param('OptionalRequired',
-							 $parstack,$safeeval);
-		    if ($opt_req !~ /\S/) { $opt_req='0'; }
-		    $status.="\n<p>".&mt('You needed to pass all of the [_1]  mandatory components and [_2] of the [_3] optional components, of which you passed [_4].',$man_count,$opt_req,$opt_count,$opt_passed)."</p></div>\n";
 
 		    my $internal_location=&internal_location();
 		    $result=~s/\Q$internal_location\E/$status/;
 		}
 		$result.="\n</div>\n".
 		    &Apache::loncommon::end_page({'discussion' => 1});
-	    }
+	    } elsif ($target eq 'answer') {
+                $result.="\n</div>\n";
+            }
+	}
+
+	my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
+	my %queue_data = ('type' => 'Task',
+			  'time' => time,);
+	if (defined($Apache::inputtags::slot_name)) {
+	    $queue_data{'slot'} = $Apache::inputtags::slot_name;
+	} elsif (defined($Apache::lonhomework::history{"resource.$version.0.checkedin.slot"})) {
+	    $queue_data{'slot'} = $Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
 	}
-	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) {
+
+
+	if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous
+	    && $status eq 'CAN_ANSWER') {
 	    my $award='SUBMITTED';
+            my $uploadedflag=0;
+            my $totalsize=0;
+            my @deletions = &Apache::loncommon::get_env_multiple('form.HWFILE'.$version.'_0_bridgetask_delete');
 	    &Apache::essayresponse::file_submission("$version.0",'bridgetask',
-						    'portfiles',\$award);
+						    \$award,\$uploadedflag,\$totalsize,\@deletions);
 	    if ($award eq 'SUBMITTED' &&
 		$Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) {
 		$Apache::lonhomework::results{"resource.0.tries"}=
@@ -913,28 +1324,23 @@ DONEBUTTON
 		$Apache::lonhomework::results{"resource.0.submission"}=
 		    $Apache::lonhomework::results{"resource.$version.0.submission"}='';
 	    } else {
-		delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
+                unless($uploadedflag) {
+                    delete($Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"});
+                }
 		$award = '';
 	    }
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    &Apache::structuretags::finalize_storage();
 	    if ($award eq 'SUBMITTED') {
-		my $useslots = &Apache::lonnet::EXT("resource.0.useslots");
-		if ($useslots =~ /^\s*no\s*$/i) {
-		    &add_to_queue('gradingqueue',
-				  {'type' => 'Task',
-				   'time' => time});
-		} elsif (defined($Apache::inputtags::slot_name)) {
-		    &add_to_queue('gradingqueue',
-				  {'type' => 'Task',
-				   'time' => time,
-				   'slot' => $Apache::inputtags::slot_name});
-		}
+		&add_to_queue('gradingqueue',\%queue_data);
 	    }
-	} elsif ($Apache::lonhomework::results{'INTERNAL_store'}) {
-	    &Apache::structuretags::finalize_storage();
 	}
-	if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes') {
+	if ($target eq 'grade' && $env{'form.webgrade'} eq 'yes' 
+	    && exists($env{'form.cancel'})) {
+	    &check_queue_unlock($env{'form.queue'});
+	    &Apache::lonxml::debug(" cancelled grading .".$env{'form.queue'});
+	} elsif ($target eq 'grade' && $env{'form.webgrade'} eq 'yes' 
+		 && !exists($env{'form.cancel'})) {
 	    my $optional_required=
 		&Apache::lonxml::get_param('OptionalRequired',$parstack,
 					   $safeeval);
@@ -943,19 +1349,29 @@ DONEBUTTON
 	    my $ungraded=0;
 	    my $review=0;   
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
-	    foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
+	    my $dim = $top;
+	    foreach my $id (@{$dimension{$dim}{'criterias'}}) {
+		my $link=&link($id);
+
+		my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+
+		if ($type eq 'criteria') {
+		    # dimensional 'criteria' don't get assigned grades
+		    $Apache::lonhomework::results{"resource.$version.0.$id.status"}=$env{'form.HWVAL_'.$link};
+		    $Apache::lonhomework::results{"resource.$version.0.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
+		} 
 		my $status=
-		    $Apache::lonhomework::results{"resource.$version.0.$dim_id.status"};
-		my $mandatory=
-		    ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
+		    $Apache::lonhomework::results{"resource.$version.0.$id.status"};
+		my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');
+
 		if ($status eq 'pass') {
 		    if (!$mandatory) { $optional_passed++; }
 		} elsif ($status eq 'fail') {
 		    if ($mandatory) { $mandatory_failed++; }
-		} elsif ($status eq 'ungraded') {
-		    $ungraded++;
 		} elsif ($status eq 'review') {
 		    $review++;
+		} elsif ($status eq 'ungraded') {
+		    $ungraded++;
 		} else {
 		    $ungraded++;
 		}
@@ -963,34 +1379,19 @@ DONEBUTTON
 	    if ($optional_passed < $optional_required) {
 		$mandatory_failed++;
 	    }
-	    &Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
+	    &Apache::lonxml::debug(" task results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
 	    $Apache::lonhomework::results{'resource.0.regrader'}=
 		$env{'user.name'}.':'.$env{'user.domain'};
 	    if ($review) {
 		$Apache::lonhomework::results{"resource.$version.0.status"}='review';
-		if ($env{'form.queue'} eq 'reviewqueue') {
-		    &check_queue_unlock($env{'form.queue'});
-		    &Apache::lonxml::debug(" still needs review not changing status.");
-		} else {
-		    &move_between_queues($env{'form.queue'},'reviewqueue');
-		}
 	    } elsif ($ungraded) {
 		$Apache::lonhomework::results{"resource.$version.0.status"}='ungraded';
-		if ($env{'form.queue'} eq 'reviewqueue' ||
-		    $env{'form.queue'} eq 'none' ) {
-		    &Apache::lonxml::debug("moving back.");
-		    &move_between_queues($env{'form.queue'},'gradingqueue');
-		} else {
-		    &check_queue_unlock($env{'form.queue'});
-		}
 	    } elsif ($mandatory_failed) {
 		$Apache::lonhomework::results{"resource.$version.0.status"}='fail';
 		$Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override';
 		$Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT';
 		$Apache::lonhomework::results{"resource.$version.0.awarded"}='0';
-		&remove_from_queue($env{'form.queue'}); 
-
-		my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+		my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
 		
 		if ($env{'form.regrade'} ne 'yes') {
 		    $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
@@ -1006,9 +1407,7 @@ DONEBUTTON
 		$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override';
 		$Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS';
 		$Apache::lonhomework::results{"resource.$version.0.awarded"}='1';
-		&remove_from_queue($env{'form.queue'});
-
-		my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
+		my ($symb,$courseid,$udom,$uname)=&Apache::lonnet::whichuser();
 		if ($env{'form.regrade'} ne 'yes') {
 		    $Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}=
 			$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"};
@@ -1030,10 +1429,94 @@ DONEBUTTON
 		    $Apache::lonhomework::results{"resource.$version.0.solved"};
 	    }
 	    &minimize_storage();
+            my ($canstore,$domain,$name,$symb,$courseid);
+            ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
+
+            if ($env{'form.gradingkey'}) {
+                my $todo=&unescape($env{'form.gradingkey'});
+                my ($keysymb,$uname,$udom)=&decode_queue_key($todo);
+                if ($symb eq $keysymb) {
+                    if (($domain eq $udom) && ($name eq $uname)) {
+                        $canstore = 1;           
+                    }
+                }
+            }
+            if ($canstore) {
+	        &Apache::structuretags::finalize_storage();
+                my @interval = &Apache::lonnet::EXT("resource.0.interval");
+                if ($interval[0] =~ /^\d+/ && $interval[1] eq 'resource') {
+                    my $key=$courseid."\0".$symb;
+                    my %times=&Apache::lonnet::get('firstaccesstimes',
+                                                   [$key],$domain,$name);
+                    if ($times{$key}) {
+                        my $delresult.=&Apache::lonnet::del('firstaccesstimes',
+                                                            [$key],$domain,$name);
+                    }
+                }
+	        # data stored, now handle queue
+	        if ($review) {
+		    if ($env{'form.queue'} eq 'reviewqueue') {
+		        &check_queue_unlock($env{'form.queue'});
+		        &Apache::lonxml::debug(" still needs review not changing status.");
+		    } else {
+		        if ($env{'form.queue'} ne 'none') {
+			    &move_between_queues($env{'form.queue'},'reviewqueue');
+		        } else {
+			    &add_to_queue('reviewqueue',\%queue_data);
+		        }
+		    }
+	        } elsif ($ungraded) {
+		    if ($env{'form.queue'} eq 'reviewqueue') {
+		        &Apache::lonxml::debug("moving back.");
+		        &move_between_queues($env{'form.queue'},
+					     'gradingqueue');
+		    } elsif ($env{'form.queue'} eq 'none' ) {
+		        &add_to_queue('gradingqueue',\%queue_data);	
+		    } else {
+		        &check_queue_unlock($env{'form.queue'});
+		    }
+	        } elsif ($mandatory_failed) {
+		    &remove_from_queue($env{'form.queue'}); 
+	        } else {
+		    &remove_from_queue($env{'form.queue'});
+	        }
+            } else {
+                &check_queue_unlock($env{'form.queue'});
+                $env{'form.terminated'} = $name.':'.$domain;
+            }
+        }
+	if (exists($Apache::lonhomework::results{'INTERNAL_store'})) {
+	    # instance generation occurred and hasn't yet been stored
 	    &Apache::structuretags::finalize_storage();
 	}
     } elsif ($target eq 'webgrade') {
-	$result.="</div>";
+	if (&nest()) {
+	    &Apache::lonxml::endredirection();
+	    &end_delay();
+	    $result.=$dimension{$top}{'result'};
+	} else {
+	    $result.=&Apache::lonxml::endredirection();
+	}
+	my $dim = $top;
+	foreach my $id (@{$dimension{$dim}{'criterias'}} ) {
+	    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+	    if ($type eq 'dimension') {
+		# dimensional 'criteria' don't get assigned grades
+		next;
+	    } else {
+		my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id},
+					     [@_]);
+		$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
+		my $internal_location=&internal_location($id);
+		if ($result =~ m/\Q$internal_location\E/) {
+		    $result=~s/\Q$internal_location\E/$criteria/;
+		} else {
+		    $result.=$criteria;
+		}
+
+	    }
+	}
+        $result.="</div>";
 	#$result.='<input type="submit" name="next" value="'.
 	#    &mt('Save &amp; Next').'" /> ';
 	#$result.='<input type="submit" name="end" value="'.
@@ -1054,8 +1537,18 @@ DONEBUTTON
 						      'Partial Credit Factor');
 	$result.=&Apache::response::meta_stores_write('status','string',
 						      'Bridge Task Status');
+    } elsif ($target eq 'edit') {
+	$result.= &Apache::structuretags::problem_edit_footer();
     }
+    &Apache::structuretags::reset_problem_globals('Task');
     undef($Apache::lonhomework::parsing_a_task);
+    if ( ($target eq 'grade' && $env{'form.webgrade'}) ||
+          $target eq 'webgrade') {
+        delete($env{'form.grade_symb'});
+        delete($env{'form.grade_domain'});
+        delete($env{'form.grade_username'});
+        delete($env{'form.grade_courseid'});
+    }
     return $result;
 }
 
@@ -1079,7 +1572,7 @@ sub move_between_queues {
 sub check_queue_unlock {
     my ($queue,$key,$allow_not_me)=@_;
     if ($queue eq 'none') { return 'ok'; }
-    my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+    my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
     if (!defined($key)) {
 	$key="$symb\0queue\0$uname:$udom";
     }
@@ -1088,6 +1581,7 @@ sub check_queue_unlock {
     my $me=$env{'user.name'}.':'.$env{'user.domain'};
     my $who=&queue_key_locked($queue,$key,$cdom,$cnum);
     if  ($who eq $me) {
+	&Apache::lonxml::debug("unlocking my own $who");
 	return &Apache::lonnet::del($queue,["$key\0locked"],$cdom,$cnum);
     } elsif ($allow_not_me) {
 	&Apache::lonxml::debug("unlocking $who by $me");
@@ -1101,7 +1595,7 @@ sub in_queue {
     if ($queue eq 'none') { return 0; }
     if (!defined($symb) || !defined($cdom) || !defined($cnum)
 	|| !defined($udom) || !defined($uname)) {
-	($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();
+	($symb,my $cid,$udom,$uname)=&Apache::lonnet::whichuser();
 	$cnum=$env{'course.'.$cid.'.num'};
 	$cdom=$env{'course.'.$cid.'.domain'};
     }
@@ -1120,7 +1614,7 @@ sub remove_from_queue {
     if ($queue eq 'none') { return 'ok'; }
     if (!defined($symb) || !defined($cdom) || !defined($cnum)
 	|| !defined($udom) || !defined($uname)) {
-	($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();
+	($symb,my $cid,$udom,$uname)=&Apache::lonnet::whichuser();
 	$cnum=$env{'course.'.$cid.'.num'};
 	$cdom=$env{'course.'.$cid.'.domain'};
     }
@@ -1144,8 +1638,12 @@ sub setup_env_for_other_user {
 }
 
 sub get_queue_data {
-    my ($queue)=@_;
-    my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+    my ($queue,$udom,$uname)=@_;
+    my ($symb,$cid,$other_udom,$other_uname)=&Apache::lonnet::whichuser();
+    if (!$uname || !$udom) {
+	$uname=$other_uname;
+	$udom =$other_udom;
+    }
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
     my $todo="$symb\0queue\0$uname:$udom";
@@ -1187,7 +1685,7 @@ sub check_queue_for_key {
 sub add_to_queue {
     my ($queue,$user_data)=@_;
     if ($queue eq 'none') { return 'ok'; }
-    my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+    my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
     if (!$cid || $env{'request.state'} eq 'construct') {
 	return 'no_queue';
     }
@@ -1198,45 +1696,106 @@ sub add_to_queue {
     return &Apache::lonnet::cput($queue,\%data,$cdom,$cnum);
 }
 
+sub get_limited_classlist {
+    my ($sections) = @_;
+
+    my $classlist = &Apache::loncoursedata::get_classlist();
+    foreach my $student (keys(%$classlist)) {
+	if ( $classlist->{$student}[&Apache::loncoursedata::CL_STATUS()]
+	     ne 'Active') {
+	    delete($classlist->{$student});
+       	}
+    }
+
+    if (ref($sections) && !grep {$_ eq 'all'} (@{ $sections })) {
+	foreach my $student (keys(%$classlist)) {
+	    my $section  = 
+		$classlist->{$student}[&Apache::loncoursedata::CL_SECTION()];
+	    if (! grep {$_ eq $section} (@{ $sections })) {
+		delete($classlist->{$student});
+	    }
+	}
+    }
+    return $classlist;
+}
+
+
 sub show_queue {
     my ($queue,$with_selects)=@_;
     my $result;
-    my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+    my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
 
-    my @chosen_sections=
-	&Apache::loncommon::get_env_multiple('form.chosensections');
-    &Apache::grades::init_perm();
-    my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
-    &Apache::grades::reset_perm();
+    my @chosen_sections = &get_allowed_sections();
+
+    my $classlist = &get_limited_classlist(\@chosen_sections);
+
     if (!(grep(/^all$/,@chosen_sections))) {
-	$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
-	    '</tt>.</p> '."\n";
+	$result.='<p>'
+                .&mt('Showing only sections [_1].'
+                    ,'<tt>'.join(', ',@chosen_sections).'</tt>')
+                ."</p>\n";
+    }
+
+    my ($view,$view_section);
+    my $scope = $env{'request.course.id'};
+    if (!($view=&Apache::lonnet::allowed('vgr',$scope))) {
+	$scope .= '/'.$env{'request.course.sec'};
+	if ( $view = &Apache::lonnet::allowed('vgr',$scope)) {
+	    $view_section=$env{'request.course.sec'};
+	} else {
+	    undef($view);
+	}
     }
 
+    $result .= 
+	'<p><a href="/adm/flip?postdata=return:">'.
+	&mt('Return to resource').'</a></p><hr />'.
+	"\n<h3>".&mt('Current Queue - [_1]',$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><table border='1'><tr><td>Empty</td></tr></table>";
+	$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><table border='1'><tr>";
-    if ($with_selects) { $result.="<th>Status</th><th></th>"; }
-    $result.="<th>user</th><th>data</th></tr>";
+    $result.=
+	&Apache::loncommon::start_data_table().
+	&Apache::loncommon::start_data_table_header_row();
+    if ($with_selects) { $result.='<th>'.&mt('Status').'</th><th></th>'; }
+    $result.='<th>'.&mt('User').'</th><th>'.&mt('Data').'</th>'.
+	&Apache::loncommon::end_data_table_header_row();
     foreach my $key (sort(keys(%queue))) {
 	my ($symb,$uname,$udom) = &decode_queue_key($key);
-	if (!defined($classlist->{$uname.':'.$udom})) { next; }
+	next if (!defined($classlist->{$uname.':'.$udom}));
+	next if (!&allow_grade_user($classlist->{$uname.':'.$udom}));
+	
+	my $section = $classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];
+
+	my $can_view=1;
+	if (!$view
+	    || ($view_section && !$section)
+	    || ($view_section && $section && ($view_section ne $section))) {
+	    $can_view=0;
+	}
+
 	if ($key=~/locked$/ && !$with_selects) {
-	    $result.="<tr><td>$uname</td>";
+	    $result.= &Apache::loncommon::start_data_table_row().
+		"<td>$uname</td>";
 	    $result.='<td>'.$queue{$key}.'</td></tr>';
 	} elsif ($key=~/timestamp$/ && !$with_selects) {
-	    $result.="<tr><td></td>";
+	    $result.=&Apache::loncommon::start_data_table_row()."<td></td>";
 	    $result.='<td>'.
 		&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
 	} elsif ($key!~/(timestamp|locked)$/) {
-	    $result.="<tr>";
+	    $result.= &Apache::loncommon::start_data_table_row();
 	    my ($end_time,$slot_text);
 	    if (my $slot=&slotted_access($queue{$key})) {
 		my %slot_data=&Apache::lonnet::get_slot($slot);
@@ -1247,12 +1806,19 @@ sub show_queue {
 		$slot_text = '';
 	    }
 	    if ($with_selects) {
-		my $ekey=&Apache::lonnet::escape($key);
+		my $ekey=&escape($key);
 		my ($action,$description,$status)=('select',&mt('Select'));
 		if (exists($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>',$queue{"$key\0locked"});
-		    if ($me eq $queue{"$key\0locked"}) {
+		    $status=&mt('Locked by [_1] [_2]','<tt>'.$locker.'</tt>',$time);
+		    if ($me eq $locker) {
 			($action,$description)=('resume',&mt('Resume'));
 		    } else {
 			($action,$description)=('unlock',&mt('Unlock'));
@@ -1263,11 +1829,11 @@ sub show_queue {
 		    $seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';
 		}
-		if ($end_time ne '' && time > $end_time) {
+		if ($can_view && ($end_time ne '' && time > $end_time)) {
 		    $result.=(<<FORM);
 <td>$status</td>
 <td>
-<form style="display: inline" method="post">
+<form style="display: inline" method="post" action="">
  <input type="hidden" name="gradingkey" value="$ekey" />
  <input type="hidden" name="queue" value="$queue" />
  <input type="hidden" name="gradingaction" value="$action" />
@@ -1278,43 +1844,82 @@ sub show_queue {
 </form>
 </td>
 FORM
-
+                } elsif (!$can_view && ($end_time ne '' && time > $end_time)) {
+		    $result.='<td>'.&mt("Not gradable").'</td><td>&nbsp;</td>'
                 } else {
 		    $result.='<td>'.&mt("In Progress").'</td><td>&nbsp;</td>'
 		}
 	    }
-	    $result.= "<td>".$fullname->{$uname.':'.$udom}.
+	    $result.= "<td>".$classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_FULLNAME()].
 		" <tt>($uname:$udom)</tt> </td>";
-	    $result.='<td>'.$slot_text.' End time: '.
-		&Apache::lonlocal::locallocaltime($end_time).
-		"</td></tr>";
+            $result.='<td>'.$slot_text.' '
+                    .&mt('End time: [_1]'
+                        ,&Apache::lonlocal::locallocaltime($end_time))
+                    .'</td>'
+                    .&Apache::loncommon::end_data_table_row();
 	}
     }
-    $result.="</table><hr />\n";
+    $result.= &Apache::loncommon::end_data_table()."<hr />\n";
     return $result;
 }
 
+sub get_allowed_sections {
+    my @chosen_sections;
+    if (&section_restricted()) {
+	@chosen_sections = ($env{'request.course.sec'});
+    } else {
+	@chosen_sections =
+	    &Apache::loncommon::get_env_multiple('form.chosensections');
+    }
+
+    return @chosen_sections;
+}
+
+sub section_restricted {
+    my $cid =(&Apache::lonnet::whichuser())[1];
+    return (lc($env{'course.'.$cid.'.task_grading'}) eq 'section'
+	    && $env{'request.course.sec'} ne '' );
+}
+
+sub allow_grade_user {
+    my ($classlist_entry) = @_;
+
+    if (&section_restricted()
+	&& $env{'request.course.sec'} ne
+	      $classlist_entry->[&Apache::loncoursedata::CL_SECTION()]) {
+	return 0;
+    }
+    return 1;
+}
+
 sub get_queue_counts {
     my ($queue)=@_;
     my $result;
-    my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+    my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
+
+    my $classlist=&get_limited_classlist();
+
     my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     my ($tmp)=%queue;
     if ($tmp=~/^error: 2 /) {
 	return (0,0,0);
     }
+
     my ($entries,$ready_to_grade,$locks)=(0,0,0);
     my %slot_cache;
     foreach my $key (sort(keys(%queue))) {
+	my ($symb,$uname,$udom) = &decode_queue_key($key);
+	next if (!defined($classlist->{$uname.':'.$udom}));
+	next if (!&allow_grade_user($classlist->{$uname.':'.$udom}));
+
 	if ($key=~/locked$/) {
 	    $locks++;
 	} elsif ($key=~/timestamp$/) {
 	    #ignore
 	} elsif ($key!~/(timestamp|locked)$/) {
-	    my ($symb,$uname,$udom) = &decode_queue_key($key);
 	    $entries++;
 	    if (my $slot=&slotted_access($queue{$key})) {
 		if (!exists($slot_cache{$slot})) {
@@ -1350,14 +1955,14 @@ sub decode_queue_key {
 sub queue_key_locked {
     my ($queue,$key,$cdom,$cnum)=@_;
     if (!defined($cdom) || !defined($cnum)) {
-	my (undef,$cid)=&Apache::lonxml::whichuser();
+	my (undef,$cid)=&Apache::lonnet::whichuser();
 	$cnum=$env{'course.'.$cid.'.num'};
 	$cdom=$env{'course.'.$cid.'.domain'};
     }
     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;
 }
@@ -1379,14 +1984,19 @@ sub slotted_access {
 }
 
 sub pick_from_queue_data {
-    my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
+    my ($queue,$check_section,$queuedata,$cdom,$cnum,$classlist)=@_;
     my @possible; # will hold queue entries that are valid to be selected
     foreach my $key (keys(%$queuedata)) {
 	if ($key =~ /\0locked$/) { next; }
 	if ($key =~ /\0timestamp$/) { next; }
+
 	my ($symb,$uname,$udom)=&decode_queue_key($key);
+	next if (!defined($classlist->{$uname.':'.$udom}));
+	next if (!&allow_grade_user($classlist->{$uname.':'.$udom}));
+
 	if ($check_section) {
-	    my $section=&Apache::lonnet::getsection($uname,$udom);
+	    my $section =
+		$classlist->{$uname.':'.$udom}[&Apache::loncoursedata::CL_SECTION()];
 	    if ($section eq $check_section) {
 		&Apache::lonxml::debug("my sec");
 		next;
@@ -1394,20 +2004,23 @@ sub pick_from_queue_data {
 	}
 	my $end_time;
 	if (my $slot=&slotted_access($queuedata->{$key})) {
+	    &Apache::lonxml::debug("looking at slot $slot");
 	    my %slot_data=&Apache::lonnet::get_slot($slot);
 	    if ($slot_data{'endtime'} < time) { 
 		$end_time = $slot_data{'endtime'};
+	    } else {
+		&Apache::lonxml::debug("not time ".$slot_data{'endtime'});
+		next;
 	    }
 	} else {
 	    my $due_date = &Apache::lonhomework::due_date('0',$symb);
-	    if ($due_date > time) {
+	    if ($due_date < time) {
 		$end_time = $due_date;
+	    } else {
+		&Apache::lonxml::debug("not time $due_date");
+		next;
 	    }
 	}
-	if ($end_time ne '') {
-	    &Apache::lonxml::debug("not time");
-	    next;
-	}
 	
 	if (exists($queuedata->{"$key\0locked"})) {
 	    &Apache::lonxml::debug("someone already has um.");
@@ -1431,9 +2044,27 @@ 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=&Apache::lonnet::unescape($env{'form.gradingkey'});
+    my $todo=&unescape($env{'form.gradingkey'});
     my $me=$env{'user.name'}.':'.$env{'user.domain'};
     if ($todo) {
 	my $who=&queue_key_locked($queue,$todo,$cdom,$cnum);
@@ -1442,7 +2073,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$//;
@@ -1455,10 +2086,10 @@ sub find_mid_grade {
 sub lock_key {
     my ($queue,$todo)=@_;
     my $me=$env{'user.name'}.':'.$env{'user.domain'};
-    my (undef,$cid)=&Apache::lonxml::whichuser();
+    my (undef,$cid)=&Apache::lonnet::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
-    my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},
+    my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> [$me,time]},
 					$cdom,$cnum);
     &Apache::lonxml::debug("success $success $todo");
     if ($success eq 'ok') {
@@ -1470,10 +2101,12 @@ sub lock_key {
 sub get_queue_symb_status {
     my ($queue,$symb,$cdom,$cnum) = @_;
     if (!defined($cdom) || !defined($cnum)) {
-	my (undef,$cid)=&Apache::lonxml::whichuser();
+	my (undef,$cid) =&Apache::lonnet::whichuser();
 	$cnum=$env{'course.'.$cid.'.num'};
 	$cdom=$env{'course.'.$cid.'.domain'};
     }
+    my $classlist=&get_limited_classlist();
+
     my $regexp="^$symb\0";
     my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
     my ($tmp)=%queue;
@@ -1483,6 +2116,8 @@ sub get_queue_symb_status {
 	next if ($key=~/locked$/);
 	next if ($key=~/timestamp$/);
 	my ($symb,$uname,$udom) = &decode_queue_key($key);
+	next if (!defined($classlist->{$uname.':'.$udom}));
+	next if (!&allow_grade_user($classlist->{$uname.':'.$udom}));
 	push(@users,"$uname:$udom");
     }
     return @users;
@@ -1491,13 +2126,16 @@ sub get_queue_symb_status {
 sub get_from_queue {
     my ($queue)=@_;
     my $result;
-    my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
+    my ($symb,$cid,$udom,$uname)=&Apache::lonnet::whichuser();
     my $cnum=$env{'course.'.$cid.'.num'};
     my $cdom=$env{'course.'.$cid.'.domain'};
     my $todo=&find_mid_grade($queue,$symb,$cdom,$cnum);
     &Apache::lonxml::debug("found ".join(':',&decode_queue_key($todo)));
     if ($todo) { return $todo; }
     my $attempts=0;
+
+    my $classlist=&get_limited_classlist();
+
     while (1) {
 	if ($attempts > 2) {
 	    # tried twice to get a queue entry, giving up
@@ -1508,21 +2146,22 @@ sub get_from_queue {
 			      $cdom,$cnum);
 	&Apache::lonxml::debug("$starttime");
 	my $regexp="^$symb\0queue\0";
-	my $range= ($attempts < 1 ) ? '0-100' : '0-400';
+	#my $range= ($attempts < 1 ) ? '0-100' : '0-400';
 
 	my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
 	#make a pass looking for a user _not_ in my section
 	if ($env{'request.course.sec'}) {
 	    &Apache::lonxml::debug("sce");
 	    $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
-					\%queue,$cdom,$cnum);
+					\%queue,$cdom,$cnum,$classlist);
 	    &Apache::lonxml::debug("sce $todo");
 	}
 	# no one _not_ in our section so look for any user that is
 	# ready for grading
 	if (!$todo) {
 	    &Apache::lonxml::debug("no sce");
-	    $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum);
+	    $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum,
+					$classlist);
 	    &Apache::lonxml::debug("no sce $todo");
 	}
 	# no user to grade 
@@ -1563,22 +2202,21 @@ sub get_from_queue {
 }
 
 sub select_user {
-    my ($symb,$cid)=&Apache::lonxml::whichuser();
+    my ($symb,$cid)=&Apache::lonnet::whichuser();
 
-    my @chosen_sections=
-	&Apache::loncommon::get_env_multiple('form.chosensections');
-    &Apache::grades::init_perm();
-    my ($classlist,$section,$fullname)=&Apache::grades::getclasslist(\@chosen_sections,);
-    &Apache::grades::reset_perm();
+    my @chosen_sections = &get_allowed_sections();
+    my $classlist = &get_limited_classlist(\@chosen_sections);
     
     my $result;
     if (!(grep(/^all$/,@chosen_sections))) {
-	$result.='<p> Showing only sections <tt>'.join(', ',@chosen_sections).
-	    '</tt>.</p> '."\n";
+        $result.='<p>'
+                .&mt('Showing only sections [_1].'
+                    ,'<tt>'.join(', ',@chosen_sections).'</tt>')
+                .'</p> '."\n";
     }
-    $result.='<table border="1">';
+    $result.=&Apache::loncommon::start_data_table();
 
-    foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
+    foreach my $student (sort {lc($classlist->{$a}[&Apache::loncoursedata::CL_FULLNAME()]) cmp lc($classlist->{$b}[&Apache::loncoursedata::CL_FULLNAME()]) } (keys(%$classlist))) {
 	my ($uname,$udom) = split(/:/,$student);
 	
 	my $cnum=$env{'course.'.$cid.'.num'};
@@ -1599,9 +2237,10 @@ sub select_user {
 	    }
 	}
 	my $todo = 
-	    &Apache::lonnet::escape(&encode_queue_key($symb,$udom,$uname));
+	    &escape(&encode_queue_key($symb,$udom,$uname));
 	if ($cannot_grade) {
-	    $result.='<tr><td>&nbsp;</td><td>'.$fullname->{$student}.
+	    $result.=&Apache::loncommon::start_data_table_row().
+		'<td>&nbsp;</td><td>'.$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()].
 		'</td><td>';
 	} else {
 	    my $seclist;
@@ -1609,20 +2248,19 @@ sub select_user {
 		$seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';
 	    }
-	    my $studentdis = $student;
-	    $studentdis =~ tr/:/@/;
+            my $buttontext=&mt('Regrade');
+	    $result.=&Apache::loncommon::start_data_table_row();
 	    $result.=<<RESULT;
-<tr>
   <td>
-    <form style="display: inline" method="post">
+    <form style="display: inline" method="post" action="">
       <input type="hidden" name="gradingkey" value="$todo" />
       <input type="hidden" name="queue" value="$queue" />
       <input type="hidden" name="webgrade" value="no" />
       <input type="hidden" name="regrade" value="yes" />
-      <input type="submit" name="submit" value="Regrade" />
+      <input type="submit" name="submit" value="$buttontext" />
       $seclist
     </form>
-  <td>$fullname->{$student} <tt>($studentdis)</tt></td>
+  <td>$classlist->{$student}[&Apache::loncoursedata::CL_FULLNAME()] <tt>($student)</tt> Sec: $classlist->{$student}[&Apache::loncoursedata::CL_SECTION()]</td>
   <td>
 RESULT
         }
@@ -1661,9 +2299,9 @@ RESULT
 	} else {
 	    $result.="&nbsp;";
 	}
-	$result.= '</td></tr>';
+	$result.= '</td>'.&Apache::loncommon::end_data_table_row();
     }
-    $result.='</table>';
+    $result.=&Apache::loncommon::end_data_table();
     return $result;
 }
 
@@ -1694,6 +2332,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;
 }
@@ -1708,26 +2349,154 @@ 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];
+    } else {
+	return $top;
+    }
+}
+
 sub get_id {
     my ($parstack,$safeeval)=@_;
-    my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval);
-    if (!$id) { $id=$Apache::lonxml::curdepth; }
-    return $id;
+    return &Apache::lonxml::get_id($parstack,$safeeval);
+}
+
+sub start_Setup {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    my $dim = &get_id($parstack,$safeeval);
+    push(@Apache::bridgetask::dimension,$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;
+}
+
+{
+    my @allowed;
+    sub enable_dimension_parsing {
+	my ($id) = @_;
+	push(@allowed,$id);
+    }
+    sub disable_dimension_parsing {
+	pop(@allowed);
+    }
+    sub skip_dimension_parsing {
+	my ($check) = @_;
+	if (!@allowed) { return 0;}
+	# if unspecified allow any id
+	if ($allowed[-1] eq undef) { return 0;}
+
+	return ($check ne $allowed[-1]);
+    }
 }
 
-my %dimension;
 sub start_Question { return &start_Dimension(@_); }
 sub start_Dimension {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    undef(%dimension);
-    my $dim_id=&get_id($parstack,$safeeval);
-    $Apache::bridgetask::dimension=$dim_id;
-    push(@Apache::bridgetask::dimensionlist,$dim_id);
-    undef(@Apache::bridgetask::instance);
-    $Apache::bridgetask::dimensionmandatory{$dim_id}=
-	&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
-    &Apache::lonxml::startredirection();
-    return &internal_location($dim_id);
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+    my $dim = &get_id($parstack,$safeeval);
+    my $previous_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 $result;# &internal_location($dim);
+}
+
+sub start_QuestionText {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$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 $result;
+}
+
+sub end_QuestionText {
+    return '';
+}
+
+sub insert_QuestionText {
+    return '
+<QuestionText>
+    <startouttext />
+    <endouttext />
+</QuestionText>';
 }
 
 sub get_instance {
@@ -1737,7 +2506,7 @@ sub get_instance {
 	$rand_alg eq '64bit2' || $rand_alg eq '64bit3' ||
 	$rand_alg eq '64bit4' ) {
 	&Apache::response::pushrandomnumber();
-	my @order=&Math::Random::random_permutation(@{$dimension{'instances'}});
+	my @order=&Math::Random::random_permutation(@{$dimension{$dim}{'instances'}});
 	my $num=@order;
 	my $version=&get_version();
 	my $which=($version-1)%$num;
@@ -1749,229 +2518,415 @@ sub get_instance {
 	if (defined($instance)) { return $instance; }
 
 	&Apache::response::pushrandomnumber();
-	my @instances = @{$dimension{'instances'}};
-	# remove disabled instances
-	for (my $i=0; $i < $#instances; $i++) {
-	    if ($dimension{$instances[$i].'.disabled'}) {
-		splice(@instances,$i,1);
-		$i--;
+	if (ref($dimension{$dim}{'instances'}) eq 'ARRAY') {
+	    my @instances = @{$dimension{$dim}{'instances'}};
+	    # remove disabled instances
+	    for (my $i=0; $i < $#instances; $i++) {
+		if ($dimension{$dim}{$instances[$i].'.disabled'}) {
+		    splice(@instances,$i,1);
+		    $i--;
+		}
+	    }
+	    @instances = &Math::Random::random_permutation(@instances);
+	    $instance  = $instances[($version-1)%scalar(@instances)];
+	    if ($version =~ /^\d$/) {
+		$Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = 
+		    $instance;
+		$Apache::lonhomework::results{'INTERNAL_store'} = 1; 
 	    }
-	}
-	@instances = &Math::Random::random_permutation(@instances);
-	$instance  = $instances[($version-1)%scalar(@instances)];
-	if ($version =~ /^\d$/) {
-	    $Apache::lonhomework::results{"resource.$version.0.$dim.instance"} = 
-		$instance;
-	    $Apache::lonhomework::results{'INTERNAL_store'} = 1; 
 	}
 	&Apache::response::poprandomnumber();
 	return $instance;
     }
 }
 
-{
-    my $last_link;
-    sub link {
-	my ($id) = @_;
-	$id =~ s/\./_/g;
-	return 'LC_GRADING_criteria_'.$id;
+sub get_criteria {
+    my ($what,$version,$dim,$id) = @_;
+    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+    my $prefix = ($type eq 'criteria' && $dim ne $top) ? "$dim.$id"
+	                                               : "$id";
+    my $entry = "resource.$version.0.$prefix.$what";
+    if (exists($Apache::lonhomework::results{$entry})) {
+	return $Apache::lonhomework::results{$entry};
+    }
+    return $Apache::lonhomework::history{$entry};
+}
+
+sub link {
+    my ($id) = @_;
+    $id =~ s/\./_/g;
+    return 'LC_GRADING_criteria_'.$id;
+}
+sub end_Question { return &end_Dimension(@_); }
+sub end_Dimension {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my $result;
+    my $dim=&get_id($parstack,$safeeval);
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+	$result=&Apache::lonxml::endredirection();
+	if (&skip_dimension_parsing($dim)) {
+	    pop(@Apache::bridgetask::dimension);
+	    return;
+	}
     }
-    sub end_Question { return &end_Dimension(@_); }
-    sub end_Dimension {
-	my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-	my $result=&Apache::lonxml::endredirection();
-	my $dim=&get_id($parstack,$safeeval);
-	my $instance=&get_instance($dim);
-	my $version=&get_version();
-	if ($target eq 'web') {
-	    @Apache::scripttag::parser_env = @_;
-	    $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
-	    my @instances = $instance;
-	    if (&Apache::response::showallfoils()) {
-		@instances = @{$dimension{'instances'}};
-	    }
-	    foreach my $instance (@instances) {
-		@Apache::scripttag::parser_env = @_;
-		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
-		if ($Apache::lonhomework::history{"resource.$version.0.status"} eq 'pass' ||
-		    $Apache::lonhomework::history{"resource.$version.0.status"} eq 'fail') {
-
-		    my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
-		    my $mandatory='Mandatory';
-		    if ($Apache::bridgetask::dimensionmandatory{$dim} eq 'N') {
-			$mandatory='Optional';
-		    }
-		    my $dim_info="<div class='LC_$dim_status LC_question_grade'>\n";
-		    if ($dim_status eq 'pass') {
-			$dim_info.='<h3>Question : you passed this '.$mandatory.' question</h3>';
-		    }
-		    if ($dim_status eq 'fail') {
-			$dim_info.='<h3>Question : you did not pass this '.$mandatory.' question</h3>';
-		    }
-		    my $man_count=0;
-		    my $man_passed=0;
-		    my $opt_count=0;
-		    my $opt_passed=0;
-		    foreach my $id ( @{$dimension{$instance.'.criterias'}},
-				     @{$dimension{'criterias'}} ) {
-			if ($dimension{'criteria.'.$id.'.mandatory'} 
-			    eq 'N') {
-			    $opt_count++;
-			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"} eq 'pass') {
-				$opt_passed++;
-			    }
-			} else {
-			    $man_count++;
-			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
-				$man_passed++;
-			    }
-			}
-		    }
-		    if ($man_passed eq $man_count) { $man_passed='all'; }
-
-		    my $opt_req=$dimension{$instance.'.optionalrequired'};
-		    if ($opt_req !~ /\S/) {
-			$opt_req=
-			    &Apache::lonxml::get_param('OptionalRequired',
-						       $parstack,$safeeval);
-			if ($opt_req !~ /\S/) { $opt_req = 0; }
+    my $instance=&get_instance($dim);
+    my $version=&get_version();
+    if ($target eq 'web') {
+	$result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
+	my @instances = $instance;
+	if (&Apache::response::showallfoils()) {
+	    @instances = @{$dimension{$dim}{'instances'}};
+	}
+	my $shown_question_text;
+	foreach my $instance (@instances) {
+	    $result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},
+				     [@_]);
+	    $result .= &nested_parse(\$dimension{$dim}{'questiontext'},
+				     [@_],{'set_dim_id' => undef});
+	    my $task_status = 
+		$Apache::lonhomework::history{"resource.$version.0.status"};
+	    if ($task_status ne 'pass' && $task_status ne 'fail') {
+		
+		foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
+				@{$dimension{$dim}{'criterias'}}) {
+		    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+		    &Apache::lonxml::debug("$id is $type");
+		    if ($type eq 'dimension') {
+			$result.=
+			    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+					  [@_],{'set_dim_id' => $id});
 		    }
-		    $dim_info.="\n<p>".&mt('You passed [_1] of the [_2] mandatory components and [_3] of the [_4] optional components, of which you were required to pass [_5].',$man_passed,$man_count,$opt_passed,$opt_count,$opt_req)."</p>\n</div>";
-
-		    my $internal_location=&internal_location($dim);
-		    $result=~s/\Q$internal_location\E/$dim_info/;
-
-		    foreach my $id (@{$dimension{$instance.'.criterias'}},
-				    @{$dimension{'criterias'}}) {
-			my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"};
-			my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"};
-			my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N');
-			if ($mandatory) {
-			    $mandatory='Mandatory';
-			} else {
-			    $mandatory='Optional';
-			}
-			if ($status eq 'fail') {
-			} elsif ($status eq 'pass') {
+		}
+	    } else {
+		my $dim_status=$Apache::lonhomework::history{"resource.$version.0.$dim.status"};
+		my $mandatory='Mandatory';
+		if (&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval) eq 'N') {
+		    $mandatory='Optional';
+		}
+		my $dim_info=
+		    "\n<div class='LC_$dim_status LC_question_grade'>\n\t";
+		my $ucquestion = 
+		    my $question = 
+		    ('sub' x $dimension{$dim}{'depth'}).'question';
+		$ucquestion =~ s/^(.)/uc($1)/e;
+		if ($dim_status eq 'pass') {
+                    $dim_info.='<h3>'.$ucquestion.' : '
+                              .&mt('you passed this [_1] [_2]',$mandatory,$question)
+                              .'</h3>';
+		}
+		if ($dim_status eq 'fail') {
+                    $dim_info.='<h3>'.$ucquestion.' : '
+                              .&mt('you did not pass this [_1] [_2]',$mandatory,$question)
+                              .'</h3>';
+		}
+		my %counts = &get_counts($dim,$instance,$parstack,
+					 $safeeval);
+
+		$dim_info.="\n\t<p>"
+		    .&question_status_message(\%counts,
+					      $dimension{$dim}{'depth'})
+		    ."</p>\n</div>\n";
+		
+		foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
+				@{$dimension{$dim}{'criterias'}}) {
+		    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+		    if ($type eq 'dimension') {
+			if (defined($dimension{$id}{'result'})) {
+			    $result.=$dimension{$id}{'result'};
+			    next;
 			} else {
-			    &Apache::lonxml::error("Student viewing a graded bridgetask was shown a status of $status");
-			}
-			my $status_display=$status;
-			$status_display=~s/^([a-z])/uc($1)/e;
-			$result.=
-			    '<div class="LC_'.$status.' LC_criteria"><h4>'
-			    .$mandatory.' Criteria</h4><p>';
-			@Apache::scripttag::parser_env = @_;
-			$result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id});
-			$result.='</p><p class="LC_grade">'.$status_display.'</p>';
-			if ($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}) {
-			    $result.='<p class="LC_comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'</p>';
+			    $dim_info .=
+				&nested_parse(\$dimension{$dim}{'criteria.'.$id},
+					      [@_],{'set_dim_id' => $id});
 			}
-			$result.='</div>';
+		    } else {
+			my $criteria =
+			    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+					  [@_]);
+			$dim_info .= &layout_web_Criteria($dim,$id,$criteria);
 		    }
 		}
-	    }
-	} elsif ($target eq 'webgrade') {
-	    # in case of any side effects that we need
-	    @Apache::scripttag::parser_env = @_;
-	    &Apache::scripttag::xmlparse($dimension{'intro'});
-	    @Apache::scripttag::parser_env = @_;
-	    &Apache::scripttag::xmlparse($dimension{$instance.'.text'});
-	    foreach my $id (@{$dimension{$instance.'.criterias'}},
-			    @{$dimension{'criterias'}} ) {
-		my $link=&link($id);
-		my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$id.status"};
-		$result.='<div class="LC_GRADING_criteria" id="'.$link.'">'."\n".
-		    '<div class="LC_GRADING_criteriatext" id="next_'.$last_link.'">'."\n";
-		@Apache::scripttag::parser_env = @_;
-		$result.=&Apache::scripttag::xmlparse($dimension{'criteria.'.$id});
-		$result.='</div>'."\n".
-		    #$dimension{'criteria.'.$id}.
-		    '<div class="LC_GRADING_grade">'."\n".
-		    '<label class="LC_GRADING_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
-		    '<label class="LC_GRADING_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
-		    '<label class="LC_GRADING_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
-		    '<label class="LC_GRADING_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
-		    '</div>'."\n".
-		    '<label class="LC_GRADING_comment">'.&mt('Additional Comment for Student')."\n".
-		    '<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$id.comment"}).'</textarea>'."\n".
-		    '</label>'."\n".
-		    '<ul class="LC_GRADING_navbuttons">'."\n".
-		    '<li><a href="#'.$last_link.'">Prev</a></li>'."\n".
-		    '<li><a href="#next_'.$link.'">Next</a></li>'."\n".
-		    '</ul>'."\n".
-                    '</div>'."\n";
-		$result.=&grading_history($version,$dim,$id);
-		$last_link=$link;
-	    }
-	} elsif ($target eq 'grade' && $env{'form.webgrade'}) {
-	    my $optional_passed=0;
-	    my $mandatory_failed=0;
-	    my $ungraded=0;
-	    my $review=0;
-
-	    @Apache::scripttag::parser_env = @_;
-	    $result.=&Apache::scripttag::xmlparse($dimension{'intro'});
-	    foreach my $id (@{$dimension{$instance.'.criterias'}},
-			    @{$dimension{'criterias'}}) {
-		my $link=&link($id);
-		@Apache::scripttag::parser_env = @_;
-		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
-		my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link};
-		$Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
-		my $mandatory=($dimension{'criteria.'.$id.'.mandatory'} ne 'N');
-		if ($status eq 'pass') {
-		    if (!$mandatory) { $optional_passed++; }
-		} elsif ($status eq 'fail') {
-		    if ($mandatory) { $mandatory_failed++; }
-		} elsif ($status eq 'review') {
-		    $review++;
-		} elsif ($status eq 'ungraded') {
-		    $ungraded++;
+		# puts the results at the end of the dimension
+		if ($result =~m{<QuestionGradeInfo\s*/>}) {
+		    $result=~s{<QuestionGradeInfo\s*/>}{$dim_info};
 		} else {
-		    $ungraded++;
+		    $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/;
+	    }
+	}
+	if ($result !~ /^\s*$/s) {
+	    # FIXME? this maybe unneccssary in the future, (CSE101 BT
+	    # from Fall 2006 geenrate a div that attempts to hide some
+	    # of the output in an odd way, this is a workaround so
+	    # those old ones will continue to work.  # It puts the
+	    # LC_question div to come after any starting closie div
+	    # that the dimension produces
+	    if ($result =~ m{^\s*</div>}) {
+		$result =~ s{^(\s*</div>)}
+		            {$1\n<div id="$dim" class="LC_question">};
+	    } else {
+		$result = "\n".'<div id="'.$dim.'" class="LC_question">'.
+		    "\n".$result;
 	    }
-	    # FIXME optional required can apply to only <instance> right now...
-	    my $opt_req=$dimension{$instance.'.optionalrequired'};
-	    if ($opt_req !~ /\S/) {
-		$opt_req=
-		    &Apache::lonxml::get_param('OptionalRequired',
-					       $parstack,$safeeval);
-		if ($opt_req !~ /\S/) { $opt_req = 0; }
-	    }
-	    if ($optional_passed < $opt_req) {
-		$mandatory_failed++;
+	    $result .= "\n</div>\n";
+	}
+    } elsif ($target eq 'webgrade') {
+	# in case of any side effects that we need
+	&nested_parse(\$dimension{$dim}{'intro'},[@_]);
+	&nested_parse(\$dimension{$dim}{$instance.'.text'},[@_]);
+	$result.=
+	    &nested_parse(\$dimension{$dim}{'questiontext'},[@_],
+			  {'set_dim_id'          => undef,
+			   'delayed_dim_results' => 1});
+	foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
+			@{$dimension{$dim}{'criterias'}} ) {
+	    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+	    if ($type eq 'dimension') {
+		# dimensional 'criteria' don't get assigned grades
+		$result.=
+		    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+				  [@_],{'set_dim_id' => $id});
+		next;
+	    } else {
+		my $criteria =&nested_parse(\$dimension{$dim}{'criteria.'.$id},
+					     [@_]);
+		$criteria = &layout_webgrade_Criteria($dim,$id,$criteria);
+		my $internal_location=&internal_location($id);
+		if ($result =~ m/\Q$internal_location\E/) {
+		    $result =~ s/\Q$internal_location\E/$criteria/;
+		} else {
+		    $result.=$criteria ;
+		}
 	    }
-	    &Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
-	    if ($review) {
-		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
-		    'review';
-	    } elsif ($ungraded) {
-		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
-		    'ungraded';
-	    } elsif ($mandatory_failed) {
-		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
-		    'fail';
+	}
+	if (&nest()) {
+	    &Apache::lonxml::debug(" for $dim stashing results into ".$dimension{$dim}{'nested'});
+	    $dimension{$dimension{$dim}{'nested'}}{'result'}.=$result;
+	    undef($result);
+	}
+    } elsif ($target eq 'grade' && $env{'form.webgrade'}) {
+	my $optional_passed=0;
+	my $mandatory_failed=0;
+	my $ungraded=0;
+	my $review=0;
+	
+	$result .= &nested_parse(\$dimension{$dim}{'intro'},[@_]);
+	$result .= &nested_parse(\$dimension{$dim}{$instance.'.text'},
+				 [@_]);
+	$result .= &nested_parse(\$dimension{$dim}{'questiontext'},
+				 [@_],{'set_dim_id' => undef});
+	
+	foreach my $id (@{$dimension{$dim}{$instance.'.criterias'}},
+			@{$dimension{$dim}{'criterias'}}) {
+	    my $link=&link($id);
+	    
+	    my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
+	    if ($type eq 'criteria') {
+		# dimensional 'criteria' don't get assigned grades
+		$Apache::lonhomework::results{"resource.$version.0.$dim.$id.status"}=$env{'form.HWVAL_'.$link};
+		$Apache::lonhomework::results{"resource.$version.0.$dim.$id.comment"}=$env{'form.HWVAL_comment_'.$link};
 	    } else {
-		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
-		    'pass';
+		$result .=
+		    &nested_parse(\$dimension{$dim}{'criteria.'.$id},
+				  [@_],{'set_dim_id' => $id});
+	    }
+	    my $status= &get_criteria('status',$version,$dim,$id);
+	    
+	    my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');
+	    if ($status eq 'pass') {
+		if (!$mandatory) { $optional_passed++; }
+	    } elsif ($status eq 'fail') {
+		if ($mandatory) { $mandatory_failed++; }
+	    } elsif ($status eq 'review') {
+		$review++;
+	    } elsif ($status eq 'ungraded') {
+		$ungraded++;
+	    } else {
+		$ungraded++;
 	    }
+	}
+
+	my $opt_req=$dimension{$dim}{$instance.'.optionalrequired'};
+	if ($opt_req !~ /\S/) {
+	    $opt_req=
+		&Apache::lonxml::get_param('OptionalRequired',
+					   $parstack,$safeeval);
+	    if ($opt_req !~ /\S/) { $opt_req = 0; }
+	}
+	if ($optional_passed < $opt_req) {
+	    $mandatory_failed++;
+	}
+	&Apache::lonxml::debug("all instance ".join(':',@{$dimension{$dim}{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review");
+	if ($review) {
+	    $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
+		'review';
+	} elsif ($ungraded) {
+	    $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
+		'ungraded';
+	} elsif ($mandatory_failed) {
+	    $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
+		'fail';
 	} else {
-	    # any other targets no output
-	    undef($result);
+	    $Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
+		'pass';
 	}
-	return $result;
+    } elsif ($target eq 'edit') {
+    } elsif ($target eq 'modified') {
+    } else {
+	# any other targets no output
+	undef($result);
+    }
+    if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
+	&disable_dimension_parsing();
+	pop(@Apache::bridgetask::dimension);
     }
+    return $result;
+}
+
+sub question_status_message {
+    my ($counts,$depth) = @_;
+    my %req  = ('man' => 'mandatory',
+		'opt' => 'optional',);
+    my %type = ('cri' => 'criteria',
+		'dim' => ('sub'x($depth+1)).'questions',);
+    my @sections;
+    foreach my $req ('man','opt') {
+	foreach my $type ('cri','dim') {
+	    if ($counts->{$req.'_'.$type}) {
+		push(@sections,
+		     $counts->{$req.'_'.$type.'_passed'}.' of the '.
+		     $counts->{$req.'_'.$type}.' '.
+		     $req{$req}.' '.$type{$type});
+	    }
+	}
+    }
+
+    my $status = 'You passed ';
+    if (@sections == -1) {
+    } elsif (@sections == 1) {
+	$status .= $sections[0];
+    } elsif (@sections == 2) {
+	$status .= $sections[0].' and '.$sections[1];
+    } else {
+	my $last = pop(@sections);
+	$status .= join(', ',@sections).', and '.$last;
+    }
+    $status .= '.';
+    if ($counts->{'opt'}) {
+        if ($counts->{'opt_dim'} + $counts->{'man_dim'} < 1) {
+            $status .= ' '.&mt('You were required to pass [quant,_1,optional criterion,optional criteria].',$counts->{'opt_req'});
+        } else { 
+            $status .= ' '.&mt('You were required to pass [quant,_1,optional component].',$counts->{'opt_req'});
+        }
+    }
+    return $status;
+}
+
+sub get_counts {
+    my ($dim,$instance,$parstack,$safeeval) = @_;
+    my %counts;
+    my @possible = ('man_cri','man_dim',
+		    'opt_cri','opt_dim',
+		    'man_cri_passed', 'man_dim_passed',
+		    'opt_cri_passed', 'opt_dim_passed',
+		    'man_passed',
+		    'opt_passed',
+		    'opt_req');
+    foreach my $which (@possible) { $counts{$which} = 0; }
+
+    my $version = &get_version();
+
+    foreach my $id ( @{$dimension{$dim}{$instance.'.criterias'}},
+		     @{$dimension{$dim}{'criterias'}} ) {
+	my $status = &get_criteria('status',$version,$dim,$id);
+	my $which;
+	if ($dimension{$dim}{'criteria.'.$id.'.mandatory'} 
+	    eq 'N') {
+	    $which = 'opt';
+	} else {
+	    $which = 'man';
+	}
+	$counts{$which}++;
+	if ($status eq 'pass') { $counts{$which.'_passed'}++; }
+	if ($dimension{$dim}{'criteria.'.$id.'.type'}
+	    eq 'dimension') {
+	    $which .= '_dim';
+	} else {
+	    $which .= '_cri';
+	}
+	$counts{$which}++;
+	if ($status eq 'pass') { $counts{$which.'_passed'}++; }
+
+
+    }
+    if ($counts{'man_dim_passed'} eq $counts{'man_dim'}) {
+	$counts{'man_dim_passed'}='all';
+    }
+    if ($counts{'man_cri_passed'} eq $counts{'man_cri'}) {
+	$counts{'man_cri_passed'}='all';
+    }
+    
+    $counts{'opt_req'}=$dimension{$dim}{$instance.'.optionalrequired'};
+    if ($counts{'opt_req'} !~ /\S/) {
+	$counts{'opt_req'}= &Apache::lonxml::get_param('OptionalRequired',
+						       $parstack,$safeeval);
+	if ($counts{'opt_req'} !~ /\S/) { $counts{'opt_req'} = 0; }
+    }
+    return %counts;
+}
+
+sub end_Setup {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    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'});
+	my @instances = $instance;
+	if (&Apache::response::showallfoils()) {
+	    @instances = @{$dimension{$dim}{'instances'}};
+	}
+	foreach my $instance (@instances) {
+	    @Apache::scripttag::parser_env = @_;
+	    $result.=&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'});
+	    @Apache::scripttag::parser_env = @_;
+	    $result.=&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'});
+	}
+    } elsif ($target eq 'webgrade' 
+	     || $target eq 'grade' && $env{'form.webgrade'}) {
+	# in case of any side effects that we need
+	@Apache::scripttag::parser_env = @_;
+	&Apache::scripttag::xmlparse($dimension{$dim}{'intro'});
+	@Apache::scripttag::parser_env = @_;
+	&Apache::scripttag::xmlparse($dimension{$dim}{$instance.'.text'});
+	@Apache::scripttag::parser_env = @_;
+	&Apache::scripttag::xmlparse($dimension{$dim}{'questiontext'});
+    } else {
+	# any other targets no output
+	undef($result);
+    }
+    pop(@Apache::bridgetask::dimension);
+    return $result;
 }
 
 sub grading_history {
     my ($version,$dim,$id) = @_;
-    if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
+    if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})
+	&& !&Apache::lonnet::allowed('mgq',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
 	return '';
     }
     my ($result,$grader);
-    my $scope="resource.$version.0.$dim.$id";
+    my $scope="resource.$version.0.";
+    $scope .= ($dim ne $top) ? "$dim.$id"
+	                     : "$id";
     foreach my $t (1..$Apache::lonhomework::history{'version'}) {
 	if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) {
 	    my ($gname,$gdom) = 
@@ -1988,11 +2943,12 @@ sub grading_history {
 	    $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
 	}
 	if ($entry) {
-	    $result.= "<li>$grader : $entry </li>";
+	    $result.= "\n\t\t<li>\n\t\t\t$grader :\n\t\t\t $entry \n\t\t</li>";
 	}
     }
     if ($result) {
-	return '<ul class="LC_GRADING_pastgrading">'.$result.'</ul>';
+	return "\n\t".'<ul class="LC_GRADING_pastgrading">'.$result.
+	    "\n\t".'</ul>'."\n";
     }
     return '';
 }
@@ -2000,15 +2956,19 @@ sub grading_history {
 sub start_IntroParagraph {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
+    my $dim = &get_dim_id();
     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
 	if ($tagstack->[-2] eq 'Dimension' || $tagstack->[-2] eq 'Question' ) {
-	    $dimension{'intro'}=
+	    $dimension{$dim}{'intro'}=
 		&Apache::lonxml::get_all_text('/introparagraph',
 					      $parser,$style);
        	} elsif ($tagstack->[-2] eq 'Task' && $target eq 'webgrade') {
 	    &Apache::lonxml::startredirection();
 	}
 	
+    } elsif ($target eq 'edit') {
+	$result = &Apache::edit::tag_start($target,$token);
+    } elsif ($target eq 'modified') {
     }
     return $result;
 }
@@ -2020,100 +2980,367 @@ sub end_IntroParagraph {
     }
 }
 
+sub insert_IntroParagraph {
+    return '
+<IntroParagraph>
+    <startouttext />
+    <endouttext />
+</IntroParagraph>';
+}
+
 sub start_Instance {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    my $id=&get_id($parstack,$safeeval);
-    push(@{$dimension{'instances'}},$id);
-    push(@Apache::bridgetask::instance,$id);
+    my $dim = &get_dim_id();
+    my $id  = &get_id($parstack,$safeeval);
+    push(@{$dimension{$dim}{'instances'}},$id);
+    push(@{$Apache::bridgetask::instance{$dim}},$id);
     push(@Apache::bridgetask::instancelist,$id);
-    $dimension{$id.'.optionalrequired'}=
+    $dimension{$dim}{$id.'.optionalrequired'}=
 	&Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval);
     my $disabled = &Apache::lonxml::get_param('Disabled',$parstack,$safeeval);
     if (lc($disabled) eq 'yes') {
-	$dimension{$id.'.disabled'}='1';
+	$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 $instance_id=$Apache::bridgetask::instance[-1];
-    my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
+    my $result;
     if ($target eq 'grade' || $target eq 'web' || $target eq 'webgrade') {
-	$dimension{$instance_id.'.text'}=$text;
+	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') {
+	    if ($target eq 'webgrade') {
+		&Apache::lonxml::debug(" for $dim $id stashing results into $dim ");
+		$dimension{$dim}{'result'} .= &internal_location($id);
+	    } else {
+		&Apache::lonxml::debug(" not stashing $dim $id");
+		#$result .= &internal_location($id);
+	    }
+	}
+	&Apache::lonxml::debug("Criteria $id with $dim");
 	if (&Apache::londefdef::is_inside_of($tagstack,'Instance')) {
-	    my $instance_id=$Apache::bridgetask::instance[-1];
-	    $dimension{"criteria.$instance_id.$id"}=$criteria;
-	    $dimension{"criteria.$instance_id.$id.mandatory"}=
+	    my $instance_id=$Apache::bridgetask::instance{$dim}[-1];
+	    $dimension{$dim}{"criteria.$instance_id.$id"}=$criteria;
+	    $dimension{$dim}{"criteria.$instance_id.$id.type"}='criteria';
+	    $dimension{$dim}{"criteria.$instance_id.$id.mandatory"}=
 		&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
-	    push(@{$dimension{$instance_id.'.criterias'}},"$instance_id.$id");
+	    push(@{$dimension{$dim}{$instance_id.'.criterias'}},"$instance_id.$id");
 	} else {
-	    $dimension{'criteria.'.$id}=$criteria;
-	    $dimension{'criteria.'.$id.'.mandatory'}=
+	    $dimension{$dim}{'criteria.'.$id}=$criteria;
+	    $dimension{$dim}{'criteria.'.$id.'.type'}='criteria';
+	    $dimension{$dim}{'criteria.'.$id.'.mandatory'}=
 		&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval);
-	    push(@{$dimension{'criterias'}},$id);
+	    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 '';
+    return $result;
+}
+
+sub layout_web_Criteria {
+    my ($dim,$id,$criteria) = @_;
+
+    my $version = &get_version();
+    my $status= &get_criteria('status', $version,$dim,$id);
+    my $comment=&get_criteria('comment',$version,$dim,$id);
+    my $mandatory=($dimension{$dim}{'criteria.'.$id.'.mandatory'} ne 'N');
+    if ($mandatory) {
+	$mandatory='Mandatory';
+    } else {
+	$mandatory='Optional';
+    }
+    my $status_display=$status;
+    $status_display=~s/^([a-z])/uc($1)/e;
+    my $criteria_info.=
+	'<div class="LC_'.$status.' LC_criteria">'."\n\t".'<h4>'
+	.$mandatory.' Criteria</h4>'."\n\t".'<p class="LC_criteria_text">'
+	."\n";
+    $criteria =~ s/^\s*//s;
+    $criteria =~ s/\s*$//s;
+    $criteria_info.= $criteria;
+    $criteria_info.="\n\t".'</p>'.
+	"\n\t".'<p class="LC_grade">'.$status_display.'</p>';
+    if ($comment =~ /\w/) {
+	$criteria_info.=
+	    "\n\t".
+	    '<p class="LC_comment">'.&mt('Comment: [_1]',$comment).'</p>';
+    }
+    $criteria_info.="\n".'</div>'."\n";
+    
+    return $criteria_info;
+}
+
+sub layout_webgrade_Criteria {
+    my ($dim,$id,$criteria) = @_;
+    my $link=&link($id);
+    my $version = &get_version();
+    my $status  = &get_criteria('status',$version,$dim,$id);
+    my %lt = &Apache::lonlocal::texthash(
+        'ungraded' => 'Ungraded',
+        'fail'     => 'Fail',
+        'pass'     => 'Pass',
+        'review'   => 'Review',
+        'comment'  => 'Additional Comment for Student',
+    );
+    my $comment = &get_criteria('comment',$version,$dim,$id);
+    $comment = &HTML::Entities::encode($comment,'<>"&');
+    my %checked;
+    foreach my $which ('ungraded','fail','pass','review') {
+	if ($status eq $which) { $checked{$which} = ' checked="checked"'; }
+    }
+    if (!%checked) { $checked{'ungraded'} = ' checked="checked"'; }
+    my $buttons;
+    foreach my $which  ('ungraded','fail','pass','review') {
+	$buttons .= <<END_BUTTON;
+		<label class="LC_GRADING_$which">
+			<input type="radio" name="HWVAL_$link" value="$which"$checked{$which} />
+			$lt{$which}
+		</label>
+END_BUTTON
+    }
+    $criteria =~ s/^\s*//s;
+    $criteria =~ s/\s*$//s;
+    my $result = <<END_CRITERIA;
+<div class="LC_GRADING_criteria">
+	<div class="LC_GRADING_criteriatext">
+		$criteria
+	</div>
+	<div class="LC_GRADING_grade">
+$buttons
+	</div>
+	<label class="LC_GRADING_comment">
+		$lt{'comment'}
+		<textarea class="LC_GRADING_comment_area" name="HWVAL_comment_$link">$comment</textarea>
+	</label>
+</div>
+END_CRITERIA
+    $result .= &grading_history($version,$dim,$id);
+    return $result;
 }
 
 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') {
+	$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); 
+    }
+    return $result;
+}
+
+sub end_GraderNote {
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+
+    if ($target eq 'webgrade') {
+	return '</div>';
+    }
+    return;
+}
+
+sub insert_GraderNote {
+    return '
+<GraderNote>
+    <startouttext />
+    <endouttext />
+</GraderNote>';
+}
+
+
 sub proctor_validation_screen {
     my ($slot) = @_;
-    my (undef,undef,$domain,$user) = &Apache::lonxml::whichuser();
+    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 proctors 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 %lt = &Apache::lonlocal::texthash(
+                            'prva' => "Proctor Validation",
+                            'yoro' => "Your room's proctor needs to validate your access to this resource.",
+                            'prus'  => "Proctor's Username:",
+                            'pasw'  => "Password:",
+                            'prdo'  => "Proctor's Domain:",
+                            'vali'  => 'Validate',
+                            'stui'  => "Student who should be logged in is:",
+                            'name'  => "Name:",
+                            'sid'   => "Student/Employee ID",
+                            'unam'  => "Username:",
+                           );
     my $result= (<<ENDCHECKOUT);
-<h2>Proctor Validation</h2>
-    <p>Your room's proctor needs to validate your access to this resource.</p>
+<h2>$lt{'prva'}</h2>
+    <p>$lt{'yoro'}</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>
-  <tr><td>Proctor's Username:</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
-  <tr><td>Password:</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
-  <tr><td>Proctor's Domain:</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
+  <tr><td>$lt{'prus'}</td><td><input type="string" name="proctorname" value="$env{'form.proctorname'}" /></td></tr>
+  <tr><td>$lt{'pasw'}</td><td><input type="password" name="proctorpassword" value="" /></td></tr>
+  <tr><td>$lt{'prdo'}</td><td><input type="string" name="proctordomain" value="$env{'form.proctordomain'}" /></td></tr>
 </table>
-<input type="submit" name="checkoutbutton" value="Validate"  /><br />
+<input type="submit" name="checkoutbutton" value="$lt{'vali'}"  /><br />
 <table border="1">
   <tr><td>
     <table>
-      <tr><td colspan="2">Student who should be logged in is:</td></tr>
-      <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>
+      <tr><td colspan="2">$lt{'stui'}</td></tr>
+      <tr><td>$lt{'name'}</td><td>$name</td></tr>
+      <tr><td>$lt{'sid'}</td><td>$env{'environment.id'}</td></tr>
+      <tr><td>$lt{'unam'}</td><td>$user:$domain</td></tr>
+      $url
     </table>
   </tr></td>
 </table>
 </form>
 ENDCHECKOUT
+
     return $result;
 }