--- loncom/homework/bridgetask.pm	2005/11/21 23:00:19	1.84
+++ loncom/homework/bridgetask.pm	2006/03/02 22:06:27	1.116
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.84 2005/11/21 23:00:19 albertel Exp $
+# $Id: bridgetask.pm,v 1.116 2006/03/02 22:06:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -80,21 +80,28 @@ sub proctor_check_auth {
 		}
 	    }
 	    if ($authenticated && $type eq 'Task') {
+		# increment version
 		my $version=
-		    $Apache::lonhomework::results{'resource.version'}=
-		    ++$Apache::lonhomework::history{'resource.version'};
-		$Apache::lonhomework::results{"resource.$version.checkedin"}=
-		    $user.'@'.$domain;
-		$Apache::lonhomework::results{"resource.$version.checkedin.slot"}=
-		    $slot_name;
+		    $Apache::lonhomework::history{'resource.0.version'};
+		$version++;
+
+		#clean out all current results
 		foreach my $key (keys(%Apache::lonhomework::history)) {
 		    if ($key=~/^resource\.0\./) {
 			$Apache::lonhomework::results{$key}='';
 		    }
 		}
+		
+		#setup new version and who did it
+		$Apache::lonhomework::results{'resource.0.version'}=$version;
+		$Apache::lonhomework::results{"resource.$version.0.checkedin"}=
+		    $user.'@'.$domain;
+		$Apache::lonhomework::results{"resource.$version.0.checkedin.slot"}=
+		    $slot_name;
+
 		return 1;
 	    } elsif ($authenticated && $type eq 'problem') {
-		&Apache::lonxml::debug("authed #slot_name");
+		&Apache::lonxml::debug("authed $slot_name");
 		$Apache::lonhomework::results{"resource.0.checkedin"}=
 		    $user.'@'.$domain;
 		$Apache::lonhomework::results{"resource.0.checkedin.slot"}=
@@ -109,11 +116,11 @@ sub get_version {
     my ($version,$previous);
     if ($env{'form.previousversion'} && 
 	$env{'form.previousversion'} ne 'current' &&
-	defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) {
+	defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.0.status'})) {
 	$version=$env{'form.previousversion'};
 	$previous=1;
     } else {
-	$version=$Apache::lonhomework::history{'resource.version'};
+	$version=$Apache::lonhomework::history{'resource.0.version'};
 	$previous=0;
     }
     if (wantarray) {
@@ -125,10 +132,10 @@ sub get_version {
 sub add_previous_version_button {
     my ($status)=@_;
     my $result;
-    if ($Apache::lonhomework::history{'resource.version'} eq '') {
+    if ($Apache::lonhomework::history{'resource.0.version'} eq '') {
 	return '';
     }
-    if ($Apache::lonhomework::history{'resource.version'} < 2 &&
+    if ($Apache::lonhomework::history{'resource.0.version'} < 2 &&
 	$status ne 'NEEDS_CHECKIN') {
 	return '';
     }
@@ -139,8 +146,8 @@ sub add_previous_version_button {
 	    "</h3>\n";
     }
     my @to_show;
-    foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) {
-	if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) {
+    foreach my $test_version (1..$Apache::lonhomework::history{'resource.0.version'}) {
+	if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.0.status'})) {
 	    push(@to_show,$test_version);
 	}
     }
@@ -148,7 +155,7 @@ sub add_previous_version_button {
 	join("</option>\n<option>",@to_show).
 	     "</option>\n";
     $list.='<option value="current">'.&mt('Current').'</option>';
-    $result.='<form name="getprevious" method="POST" action="';
+    $result.='<form name="getprevious" method="post" action="';
     my $uri=$env{'request.uri'};
     if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
     $result.=$uri.'">'.
@@ -181,19 +188,32 @@ sub add_grading_button {
     $result.='<input type="hidden" name="grade_target" value="webgrade" />';
     if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
 	my ($entries,$ready,$locks)=&get_queue_counts('gradingqueue');
-	$result.='<p>Specify a section: '.$sec_select.'</p>';
-	$result.='<p>'.&mt("Grading Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);
+	$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="'.
+	    &mt("Select an entry from the grading queue:").'" /> ';
 
-	$result.=' <input type="submit" name="reviewagrading" value="'.
-	    &mt("Select an entry from the grading queue").'" /> </p>'."\n";
+	$result.= &mt("[_1] entries, [_2] ready, [_3] being graded",$entries,$ready,$locks).' </td></tr>'."\n";
 
 	($entries,$ready,$locks)=&get_queue_counts('reviewqueue');
-	$result.='<p>'.&mt("Review Queue has [_1] entries. [_2] of them are ready to be graded and [_3] of them are currently being graded",$entries,$ready,$locks);
-	$result.=' <input type="submit" name="reviewasubmission" value="'.
-	    &mt("Select an entry from the review queue").'" /> </p>'."\n";
-	$result.=' <input type="submit" name="regradeasubmission" value="'.
-	    &mt("Select a user to regrade.").'" /> </p>'."\n";
-    }
+	$result.='<tr><td>'.
+	    ' <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" />';
+	$result.=&Apache::loncommon::select_dom_form($env{'user.domain'},
+						     'gradingdomain');
+	$result.=' '.
+	    &Apache::loncommon::selectstudent_link('gradesubmission',
+						   'gradinguser',
+						   'gradingdomain');
+	$result.=&Apache::loncommon::studentbrowser_javascript();
+  }
     return $result;
 }
 
@@ -216,7 +236,7 @@ STUFF
     
     if ($env{'request.enc'}) { $symb=&Apache::lonenc::encrypted($symb); }
     $symb=&Apache::lonnet::escape($symb);
-    $result.='<form method="POST" action="/adm/slotrequest">'.
+    $result.='<form method="post" action="/adm/slotrequest">'.
 	'<input type="hidden" name="symb" value="'.$symb.'" />'.
 	'<input type="hidden" name="command" value="'.$action.'" />'.
 	'<input type="submit" name="requestattempt" value="'.
@@ -240,7 +260,7 @@ sub preserve_grade_info {
 sub style {
     return (<<STYLE);
 <style type="text/css">
-.fail, .pass, .neutral {
+.LC_fail, .LC_pass, .LC_neutral {
     position: relative;
     margin : 5px;
     margin-bottom :10px;
@@ -253,7 +273,7 @@ sub style {
     background-color : rgb(255,240,225);
 }
 
-.fail h4, .pass h4 {
+.LC_fail h4, .LC_pass h4 {
 	position:absolute;
 	left: -4px;
 	top: -8px;
@@ -263,25 +283,25 @@ sub style {
 	border : thin solid;
 }
 
-.fail {
+.LC_fail {
 	color: red;
 }
 
-.pass {
+.LC_pass {
     color : green;
 }
 
-.neutral {
+.LC_neutral {
 	color : blue;
 }
 
-.question {
+.LC_question {
 	border : thin solid black;
 	padding : 4px;
 	margin-bottom : 1em;
 }
 
-.grade {
+.LC_grade {
 	font-size: x-large;
 	font-family: Arial;
 	position:absolute;
@@ -322,7 +342,7 @@ sub internal_location {
 sub submission_time_stamp {
     my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::whichuser();
     my $submissiontime;
-    my $version=$Apache::lonhomework::history{'resource.version'};
+    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'})) {
 	    $submissiontime=$Apache::lonhomework::history{$v.':timestamp'};
@@ -330,7 +350,7 @@ sub submission_time_stamp {
     }
     my $result;
     if ($submissiontime) {
-	my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.checkedin.slot'};
+	my $slot_name=$Apache::lonhomework::history{'resource.'.$version.'.0.checkedin.slot'};
 	my %slot=&Apache::lonnet::get_slot($slot_name);
 	my $diff = $slot{'endtime'} - $submissiontime;
 	my ($color,$when)=('#FF6666','after');
@@ -355,13 +375,13 @@ sub webgrade_standard_info {
     my ($version)=&get_version();
     my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser();
     my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio/';
-    my $file_list="<ul>\n";
+    my $file_list="<ul class=\"LC_GRADE_handininfo\">\n";
     foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"})) {
 	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.
+	    &Apache::loncommon::icon($file).'" border="0"> '.$file.
 	    '</a></nobr></li>'."\n";
     }
     $file_list.="</ul>\n";
@@ -371,17 +391,17 @@ sub webgrade_standard_info {
 				       );
 				       
     my $result=<<INFO;
-<div class="handininfo">
-  <input type="submit" name="next" value="$lt{'done'}" />
-  <input type="submit" name="stop" value="$lt{'stop'}" />
+  <div class="LC_GRADE_maincontrols">
+    <input type="submit" name="next" value="$lt{'done'}" />
+    <input type="submit" name="stop" value="$lt{'stop'}" />
+  </div>
   $file_list
-</div>
 INFO
     return $result;
 }
 
 sub start_Task {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
 
     my ($status,$accessmsg,$slot);
     if ($target ne 'webgrade') {
@@ -400,18 +420,27 @@ sub start_Task {
     
     if ($target eq 'web' && $env{'request.state'} ne 'construct') {
 	if ($Apache::lonhomework::modifygrades) {
-	    $body_tag_start.='<form name="gradesubmission" method="POST" action="';
+	    $body_tag_start.='<form name="gradesubmission" method="post" action="';
 	    my $uri=$env{'request.uri'};
 	    if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
 	    $body_tag_start.=$uri.'">'.&add_grading_button()."</form>";
 	    my $symb=&Apache::lonnet::symbread();
 	    if (&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
-		$body_tag_start.='<form method="POST" action="/adm/slotrequest">'.
+		$body_tag_start.='<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'});
+		$body_tag_start.='<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>';
 	    }
 	}
     }
@@ -426,12 +455,12 @@ sub start_Task {
 	push(@Apache::inputtags::status,$status);
 	$Apache::inputtags::slot_name=$slot_name;
 	my $expression='$external::datestatus="'.$status.'";';
-	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";';
+	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.0.solved"}.'";';
 	&Apache::run::run($expression,$safeeval);
 	&Apache::lonxml::debug("Got $status");
 	$body_tag_start.=&add_previous_version_button($status);
 	if (!&show_task($status,$previous)) {
-	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
+	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
 	    if ( $target eq "web" ) {
 		$result.= $head_tag_start.'</head>'.$body_tag_start;
 		if ($env{'request.state'} eq 'construct') {
@@ -451,7 +480,20 @@ sub start_Task {
 		} elsif ($env{'form.donescreen'}) {
 		    my $title=&Apache::lonnet::gettitle();
 		    my @files=split(',',$Apache::lonhomework::history{'resource.'.$version.'.0.bridgetask.portfiles'});
-		    my $files='<ul><li>'.join('</li><li>',@files).'</li></ul>';
+		    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>
@@ -499,7 +541,7 @@ DONESCREEN
 	      $target eq 'webgrade') {
 	my $webgrade='yes';
 	if ($target eq 'webgrade') {
-	    $result.=$head_tag_start.$body_tag_start;
+	    $result.=$head_tag_start.'</head>'.$body_tag_start;
 	    #$result.='<br />Review'.&show_queue('reviewqueue');
 	    #$result.='<br />Grade'.&show_queue('gradingqueue');
 	}
@@ -508,7 +550,7 @@ DONESCREEN
         #       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)=&get_key_todo($target);
+	my ($todo,$status_code,$msg)=&get_key_todo($target);
 
 	if ($todo) {
 	    &setup_env_for_other_user($todo,$safeeval);
@@ -521,13 +563,9 @@ DONESCREEN
 	    $Apache::bridgetask::queue_key=$todo;
 	    &Apache::structuretags::initialize_storage();
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
-	    if ($target eq 'webgrade') {
-		#$result.='<br />After -'.&show_queue($env{'form.queue'});
-		$result.="\n".'<table width="100%" style="width:100%" border="1">';
-		if ($status_code eq 'selected') {
-		    $form_tag_start.=
-			'<input type="hidden" name="queuemode" value="selected" />';
-		}
+	    if ($target eq 'webgrade' && $status_code eq 'selected') {
+		$form_tag_start.=
+		    '<input type="hidden" name="queuemode" value="selected" />';
 	    }
 	} else {
 	    if ($target eq 'webgrade') {
@@ -537,7 +575,7 @@ DONESCREEN
 		if      ($status_code eq 'stop') {
 		    $result.='<b>'.&mt("Stopped grading.").'</b>'.$back;
 		} elsif ($status_code eq 'lock_failed') {
-		    $result.='<b>'.&mt("Failed to lock the request record.")
+		    $result.='<b>'.&mt("Failed to lock the requested record.")
 			.'</b>'.$back;
 		} elsif ($status_code eq 'unlock') {
 		    $result.='<b>'.&mt("Unlocked the requested record.")
@@ -547,12 +585,16 @@ DONESCREEN
 		    $result.=&show_queue($env{'form.queue'},1);
 		} elsif ($status_code eq 'select_user') {
 		    $result.=&select_user();
+		} elsif ($status_code eq 'unable') {
+		    $result.='<b>'.&mt("Unable to aqcuire a user to grade.").'</b>'.$back;
+		} elsif ($status_code eq 'not_allowed') {
+		    $result.='<b>'.&mt('Not allowed to grade the requested user.').' '.$msg.'</b>'.$back;
 		} else {
 		    $result.='<b>'.&mt("No user to be graded.").'</b>'.$back;
 		}
 	    }
 	    $webgrade='no';
-	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser);
+	    my $bodytext=&Apache::lonxml::get_all_text("/task",$parser,$style);
 	}
 	if ($target eq 'webgrade' && defined($env{'form.queue'})) {
 	    if ($webgrade eq 'yes') {
@@ -577,6 +619,9 @@ DONESCREEN
 	    }
 	    if ($webgrade eq 'yes') { $result.=&webgrade_standard_info(); }
 	}
+	if ($target eq 'webgrade') {
+	    $result.="\n".'<div id="LC_GRADE_criterialist">';
+	}
     } elsif ($target eq 'edit') {
 	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
 	    &Apache::structuretags::problem_edit_header();
@@ -613,6 +658,57 @@ sub get_key_todo {
 	return (undef,'select_user');
     }
 
+
+    my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+
+    #need to try both queues..
+    if (defined($env{'form.regradeaspecificsubmission'}) &&
+	defined($env{'form.gradinguser'})               &&
+	defined($env{'form.gradingdomain'})               ) {
+	my ($symb,$cid)=&Apache::lonxml::whichuser();
+	my $cnum  = $env{'course.'.$cid.'.num'};
+	my $cdom  = $env{'course.'.$cid.'.domain'};
+	my $uname = $env{'form.gradinguser'};
+	my $udom  = $env{'form.gradingdomain'};
+
+	my $gradingkey=&encode_queue_key($symb,$udom,$uname);
+
+	my $queue;
+
+	if      (&in_queue('gradingqueue',$symb,$cdom,$cnum,$udom,$uname)) {
+	    $env{'form.queue'} = $queue = 'gradingqueue';
+	} elsif (&in_queue('reviewqueue' ,$symb,$cdom,$cnum,$udom,$uname)) {
+	    $env{'form.queue'} = $queue = 'reviewqueue';
+	}
+	
+	if (!$queue) {
+	    $env{'form.queue'} = $queue = 'none';
+	    #not queued so doing either a re or pre grade
+	    return ($gradingkey);
+	}
+
+	my $who=&queue_key_locked($queue,$gradingkey);
+	if ($who eq $me) {
+	    #already have the lock
+	    $env{'form.gradingkey'}=&Apache::lonnet::escape($gradingkey);
+	    return ($gradingkey);
+	}
+	
+	if (!defined($who)) {
+	    if (&lock_key($queue,$gradingkey)) {
+		return ($gradingkey);
+	    } else {
+		return (undef,'lock_failed');
+	    }
+	}
+
+	#otherwise (defined($who) && $who ne $me) some else has it...
+	return (undef,'not_allowed',
+		&mt('Another user ([_1]) currently has the record for [_2] locked.',
+		    $who,$env{'form.gradinguser'}.'@'.$env{'form.gradingdomain'}));
+    }
+
+
     my $queue=$env{'form.queue'};
 
     if (!defined($queue)) {
@@ -640,7 +736,6 @@ sub get_key_todo {
 	&& $env{'form.queuemode'} eq 'selected') {
 	
 	my $who=&queue_key_locked($queue,$gradingkey);
-	my $me=$env{'user.name'}.'@'.$env{'user.domain'};
 	if ($who eq $me) {
 	    &Apache::lonxml::debug("Found a key was given to me");
 	    return ($gradingkey,'selected');
@@ -682,6 +777,17 @@ sub get_key_todo {
     }
     return (undef,undef)
 }
+
+sub minimize_storage {
+    foreach my $key (keys(%Apache::lonhomework::results)) {
+	if ($key =~ /regrader$/) { next; }
+	if ($Apache::lonhomework::results{$key} eq
+	    $Apache::lonhomework::history{$key}) {
+	    delete($Apache::lonhomework::results{$key});
+	}
+    }
+}
+
 sub end_Task {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
@@ -709,25 +815,26 @@ sub end_Task {
 		    &show_task($status,$previous)) {
 		    $result.=&Apache::inputtags::gradestatus('0');
 		    $result.='</form>';
+		    my $action = &Apache::lonenc::check_encrypt($env{'request.uri'});
 		    $result.=<<DONEBUTTON;
-<form method="POST">
+<form name="done" method="post" action="$action">
    <input type="hidden" name="donescreen" value="1" />
    <input type="submit" value="Done" />
 </form>
 DONEBUTTON
                 }
 		if (&show_task($status,$previous) &&
-		    $Apache::lonhomework::history{"resource.$version.status"} =~ /^(pass|fail)$/) {
-		    my $bt_status=$Apache::lonhomework::history{"resource.$version.status"};
+		    $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 $slot_name=
-			$Apache::lonhomework::history{"resource.$version.checkedin.slot"};
+			$Apache::lonhomework::history{"resource.$version.0.checkedin.slot"};
 		    my %slot=&Apache::lonnet::get_slot($slot_name);
 		    my $start_time=
 			&Apache::lonlocal::locallocaltime($slot{'starttime'});
 
-		    my $status = "\n<div class='$bt_status'>\n";
+		    my $status = "\n<div class='LC_$bt_status LC_criteria'>\n";
 		    
 		    if ($bt_status eq 'pass')  {
 			$status.='<h2>You passed the '.$title.' given on '.
@@ -747,7 +854,7 @@ DONEBUTTON
 			if ($Apache::bridgetask::dimensionmandatory{$dim_id}
 			    eq 'N') {
 			    $opt_count++;
-			    if ($Apache::lonhomework::history{"resource.$version.$dim_id.status"} eq 'pass') {
+			    if ($Apache::lonhomework::history{"resource.$version.0.$dim_id.status"} eq 'pass') {
 				$opt_passed++;
 			    }
 			} else {
@@ -757,7 +864,7 @@ DONEBUTTON
 		    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 on the bridge task.',$man_count,$opt_req,$opt_count)."</p></div>\n";
+		    $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/;
@@ -806,7 +913,7 @@ DONEBUTTON
 	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
 	    foreach my $dim_id (@Apache::bridgetask::dimensionlist) {
 		my $status=
-		    $Apache::lonhomework::results{"resource.$version.$dim_id.status"};
+		    $Apache::lonhomework::results{"resource.$version.0.$dim_id.status"};
 		my $mandatory=
 		    ($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N');
 		if ($status eq 'pass') {
@@ -825,10 +932,10 @@ DONEBUTTON
 		$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::lonhomework::results{'resource.grader'}=
+	    $Apache::lonhomework::results{'resource.0.regrader'}=
 		$env{'user.name'}.'@'.$env{'user.domain'};
 	    if ($review) {
-		$Apache::lonhomework::results{"resource.$version.status"}='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.");
@@ -836,7 +943,7 @@ DONEBUTTON
 		    &move_between_queues($env{'form.queue'},'reviewqueue');
 		}
 	    } elsif ($ungraded) {
-		$Apache::lonhomework::results{"resource.$version.status"}='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.");
@@ -845,7 +952,7 @@ DONEBUTTON
 		    &check_queue_unlock($env{'form.queue'});
 		}
 	    } elsif ($mandatory_failed) {
-		$Apache::lonhomework::results{"resource.$version.status"}='fail';
+		$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';
@@ -863,7 +970,7 @@ DONEBUTTON
 						       ["$version.0.bridgetask"]);
 		}
 	    } else {
-		$Apache::lonhomework::results{"resource.$version.status"}='pass';
+		$Apache::lonhomework::results{"resource.$version.0.status"}='pass';
 		$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';
@@ -880,8 +987,8 @@ DONEBUTTON
 						       ["$version.0.bridgetask"]);
 		}
 	    }
-	    $Apache::lonhomework::results{"resource.status"}=
-		$Apache::lonhomework::results{"resource.$version.status"};
+	    $Apache::lonhomework::results{"resource.0.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.status"};
 	    if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) {
 		$Apache::lonhomework::results{"resource.0.award"}=
 		    $Apache::lonhomework::results{"resource.$version.0.award"};
@@ -890,10 +997,11 @@ DONEBUTTON
 		$Apache::lonhomework::results{"resource.0.solved"}=
 		    $Apache::lonhomework::results{"resource.$version.0.solved"};
 	    }
+	    &minimize_storage();
 	    &Apache::structuretags::finalize_storage();
 	}
     } elsif ($target eq 'webgrade') {
-	$result.="</table>\n<hr />";
+	$result.="</div>\n<hr />";
 	#$result.='<input type="submit" name="next" value="'.
 	#    &mt('Save &amp; Next').'" /> ';
 	#$result.='<input type="submit" name="end" value="'.
@@ -955,13 +1063,38 @@ sub check_queue_unlock {
     return 'not_owner';
 }
 
+sub in_queue {
+    my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
+    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();
+	$cnum=$env{'course.'.$cid.'.num'};
+	$cdom=$env{'course.'.$cid.'.domain'};
+    }
+
+    my $key=&encode_queue_key($symb,$udom,$uname);
+    my %results = &Apache::lonnet::get($queue,[$key],$cdom,$cnum);
+
+    if (defined($results{$key})) {
+	return 1;
+    }
+    return 0;
+}
+
 sub remove_from_queue {
-    my ($queue)=@_;
+    my ($queue,$symb,$cdom,$cnum,$udom,$uname)=@_;
     if ($queue eq 'none') { return 'ok'; }
-    my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser();
-    my $cnum=$env{'course.'.$cid.'.num'};
-    my $cdom=$env{'course.'.$cid.'.domain'};
-    my $key="$symb\0queue\0$uname\@$udom";
+    if (!defined($symb) || !defined($cdom) || !defined($cnum)
+	|| !defined($udom) || !defined($uname)) {
+	($symb,my $cid,$udom,$uname)=&Apache::lonxml::whichuser();
+	$cnum=$env{'course.'.$cid.'.num'};
+	$cdom=$env{'course.'.$cid.'.domain'};
+    }
+    if (!&in_queue($queue,$symb,$cdom,$cnum,$udom,$uname)) {
+	return 'ok';
+    }
+    my $key=&encode_queue_key($symb,$udom,$uname);
     my @keys=($key,"$key\0locked");
     return &Apache::lonnet::del($queue,\@keys,$cdom,$cnum);
 }
@@ -1001,10 +1134,17 @@ sub check_queue_for_key {
 	if (defined($results{"$todo\0locked"})) {
 	    return 'locked';
 	}
-	my $slot=$results{$todo}->[0];
-	my %slot_data=&Apache::lonnet::get_slot($slot);
-	if ($slot_data{'endtime'} > time) { 
-	    return 'in_progress';
+	my $slot;
+	if (ref($results{$todo}) eq 'ARRAY')  {
+	    $slot = $results{$todo}[0];
+	} elsif (ref($results{$todo}) eq 'HASH')  {
+	    $slot = $results{$todo}{'slot'};
+	}
+	if (defined($slot)) {
+	    my %slot_data=&Apache::lonnet::get_slot($slot);
+	    if ($slot_data{'endtime'} > time) { 
+		return 'in_progress';
+	    }
 	}
 	return 'enqueued';
     }
@@ -1048,32 +1188,30 @@ sub show_queue {
     if ($tmp=~/^error: 2 /) {
 	return "\n<h3>Current Queue - $queue</h3><table border='1'><tr><td>Empty</td></tr></table>";
     }
-    $result.="\n<h3>Current Queue - $queue </h3><table border='1'><tr>";
-    if ($with_selects) { $result.="<th></th>"; }
-    $result.="<th>resource</th><th>user</th><th>type</th><th>data</th></tr>";
+    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>";
     foreach my $key (sort(keys(%queue))) {
 	my ($symb,$uname,$udom) = &decode_queue_key($key);
 	if (!defined($classlist->{$uname.':'.$udom})) { next; }
 	if ($key=~/locked$/ && !$with_selects) {
-	    my $title=&Apache::lonnet::gettitle($symb);
-	    $result.="<tr><td>$title</td><td>$uname</td>";
-	    $result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>';
+	    $result.="<tr><td>$uname</td>";
+	    $result.='<td>'.$queue{$key}.'</td></tr>';
 	} elsif ($key=~/timestamp$/ && !$with_selects) {
-	    my ($symb,undef) = split("\0",$key);
-	    my $title=&Apache::lonnet::gettitle($symb);
-	    $result.="<tr><td>$title</td><td></td>";
-	    $result.='<td>last queue modification time</td><td>'.
+	    $result.="<tr><td></td>";
+	    $result.='<td>'.
 		&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>";
 	} elsif ($key!~/(timestamp|locked)$/) {
-	    my $title=&Apache::lonnet::gettitle($symb);
 	    $result.="<tr>";
 	    my $slot=$queue{$key}->[0];
 	    my %slot_data=&Apache::lonnet::get_slot($slot);
 	    if ($with_selects) {
 		my $ekey=&Apache::lonnet::escape($key);
-		my ($action,$description)=('select',&mt('Select'));
+		my ($action,$description,$status)=('select',&mt('Select'));
 		if (exists($queue{"$key\0locked"})) {
 		    my $me=$env{'user.name'}.'@'.$env{'user.domain'};
+		    $status=&mt('Locked by <tt>[_1]</tt>',$queue{"$key\0locked"});
 		    if ($me eq $queue{"$key\0locked"}) {
 			($action,$description)=('resume',&mt('Resume'));
 		    } else {
@@ -1087,8 +1225,9 @@ sub show_queue {
 		}
 		if (time > $slot_data{'endtime'}) {
 		    $result.=(<<FORM);
+<td>$status</td>
 <td>
-<form method="POST">
+<form style="display: inline" method="post">
  <input type="hidden" name="gradingkey" value="$ekey" />
  <input type="hidden" name="queue" value="$queue" />
  <input type="hidden" name="gradingaction" value="$action" />
@@ -1104,8 +1243,9 @@ FORM
 		    $result.='<td>'.&mt("In Progress").'</td>'
 		}
 	    }
-	    $result.="<td>$title</td><td>$uname</td>";
-	    $result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '.
+	    $result.= "<td>".$fullname->{$uname.':'.$udom}.
+		" <tt>($uname\@$udom)</tt> </td>";
+	    $result.='<td>Slot: '.$slot.' End time: '.
 		&Apache::lonlocal::locallocaltime($slot_data{'endtime'}).
 		"</td></tr>";
 	}
@@ -1127,6 +1267,7 @@ sub get_queue_counts {
 	return (0,0,0);
     }
     my ($entries,$ready_to_grade,$locks)=(0,0,0);
+    my %slot_cache;
     foreach my $key (sort(keys(%queue))) {
 	if ($key=~/locked$/) {
 	    $locks++;
@@ -1136,8 +1277,11 @@ sub get_queue_counts {
 	    my ($symb,$uname,$udom) = &decode_queue_key($key);
 	    $entries++;
 	    my $slot=$queue{$key}->[0];
-	    my %slot_data=&Apache::lonnet::get_slot($slot);
-	    if (time > $slot_data{'endtime'}) {
+	    if (!exists($slot_cache{$slot})) {
+		my %slot_data=&Apache::lonnet::get_slot($slot);
+		$slot_cache{$slot} = \%slot_data;
+	    }
+	    if (time > $slot_cache{$slot}{'endtime'}) {
 		$ready_to_grade++;
 	    }
 	}
@@ -1174,6 +1318,7 @@ sub queue_key_locked {
 
 sub pick_from_queue_data {
     my ($queue,$check_section,$queuedata,$cdom,$cnum)=@_;
+    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; }
@@ -1191,11 +1336,18 @@ sub pick_from_queue_data {
 	    &Apache::lonxml::debug("not time");
 	    next;
 	}
-	if (&queue_key_locked($queue,$key,$cdom,$cnum)) {
+	if (exists($queuedata->{"$key\0locked"})) {
 	    &Apache::lonxml::debug("someone already has um.");
 	    next;
 	}
-	return $key;
+	push(@possible,[$key,$slot_data{'endtime'}]);
+    }
+    if (@possible) {
+        # sort entries in order by slot end time
+	@possible = sort { $a->[1] <=> $b->[1] } @possible;
+	# pick one of the first ten entries
+	my $max=($#possible < 10) ? $#possible : 10;
+	return $possible[int(rand($max))][0];
     }
     return undef;
 }
@@ -1236,6 +1388,27 @@ sub lock_key {
     return 0;
 }
 
+sub get_queue_symb_status {
+    my ($queue,$symb,$cdom,$cnum) = @_;
+    if (!defined($cdom) || !defined($cnum)) {
+	my (undef,$cid)=&Apache::lonxml::whichuser();
+	$cnum=$env{'course.'.$cid.'.num'};
+	$cdom=$env{'course.'.$cid.'.domain'};
+    }
+    my $regexp="^$symb\0";
+    my %queue=&Apache::lonnet::dump($queue,$cdom,$cnum,$regexp);
+    my ($tmp)=%queue;
+    if ($tmp=~/^error: 2 /) { return; }
+    my @users;
+    foreach my $key (sort(keys(%queue))) {
+	next if ($key=~/locked$/);
+	next if ($key=~/timestamp$/);
+	my ($symb,$uname,$udom) = &decode_queue_key($key);
+	push(@users,"$uname:$udom");
+    }
+    return @users;
+}
+
 sub get_from_queue {
     my ($queue)=@_;
     my $result;
@@ -1245,12 +1418,19 @@ sub get_from_queue {
     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;
     while (1) {
+	if ($attempts > 2) {
+	    # tried twice to get a queue entry, giving up
+	    return (undef,'unable');
+	}
 	my $starttime=time;
 	&Apache::lonnet::cput($queue,{"$symb\0timestamp"=>$starttime},
 			      $cdom,$cnum);
 	&Apache::lonxml::debug("$starttime");
 	my $regexp="^$symb\0queue\0";
+	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'}) {
@@ -1263,8 +1443,7 @@ sub get_from_queue {
 	# ready for grading
 	if (!$todo) {
 	    &Apache::lonxml::debug("no sce");
-	    $todo=&pick_from_queue_data($queue,$env{'request.course.sec'},
-					\%queue,$cdom,$cnum);
+	    $todo=&pick_from_queue_data($queue,undef,\%queue,$cdom,$cnum);
 	    &Apache::lonxml::debug("no sce $todo");
 	}
 	# no user to grade 
@@ -1272,7 +1451,10 @@ sub get_from_queue {
 	&Apache::lonxml::debug("got $todo");
 	# otherwise found someone so lets try to lock them
 	# unless someone else already picked them
-	if (!&lock_key($queue,$todo)) { next; }
+	if (!&lock_key($queue,$todo)) {
+	    $attempts++;
+	    next;
+	}
 	my (undef,$endtime)=
 	    &Apache::lonnet::get($queue,["$symb\0timestamp"],
 				 $cdom,$cnum);
@@ -1291,6 +1473,7 @@ sub get_from_queue {
 		&Apache::lonnet::del($queue,["$todo\0locked"],
 				     $cdom,$cnum);
 		&Apache::lonxml::debug("del");
+		$attempts++;
 		next;
 	    }
 	}
@@ -1321,7 +1504,8 @@ sub select_user {
 	
 	my $cnum=$env{'course.'.$cid.'.num'};
 	my $cdom=$env{'course.'.$cid.'.domain'};
-	my %status = &get_student_status($symb,$cdom,$cnum,$udom,$uname);
+	my %status = &get_student_status($symb,$cdom,$cnum,$udom,$uname,
+					 'Task');
 	my $queue = 'none';
 	my $cannot_grade;
 	if ($status{'reviewqueue'} =~ /^(in_progress|enqueue)$/) {
@@ -1346,10 +1530,12 @@ sub select_user {
 		$seclist.='<input type="hidden" name="chosensections" 
                                value="'.$sec.'" />';
 	    }
+	    my $studentdis = $student;
+	    $studentdis =~ tr/:/@/;
 	    $result.=<<RESULT;
 <tr>
   <td>
-    <form method="POST">
+    <form style="display: inline" method="post">
       <input type="hidden" name="gradingkey" value="$todo" />
       <input type="hidden" name="queue" value="$queue" />
       <input type="hidden" name="webgrade" value="no" />
@@ -1357,7 +1543,7 @@ sub select_user {
       <input type="submit" name="submit" value="Regrade" />
       $seclist
     </form>
-  <td>$fullname->{$student}</td>
+  <td>$fullname->{$student} <tt>($studentdis)</tt></td>
   <td>
 RESULT
         }
@@ -1377,6 +1563,9 @@ RESULT
 	if ($status{'version'}) {
 	    $result .= ' '.&mt('Version').' '.$status{'version'};
 	}
+	if ($status{'grader'}) {
+	    $result .= ' '.&mt('(Graded by [_1])',$status{'grader'}).' ';
+	}
 	$result.= '</td><td>';
 	if ($status{'reviewqueue'} eq 'enqueued') {
 	    $result .= &mt('Awaiting Review');
@@ -1400,17 +1589,23 @@ RESULT
 }
 
 sub get_student_status {
-    my ($symb,$cdom,$cnum,$udom,$uname)=@_;
-    my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
-					  $udom,$uname);
+    my ($symb,$cdom,$cnum,$udom,$uname,$type)=@_;
+
     my %status;
-    $status{'status'}=$record{'resource.status'};
-    $status{'version'}=$record{'resource.version'};
-    $status{'grader'}=$record{'resource.grader'};
-    $status{'reviewqueue'}=&check_queue_for_key($cdom,$cnum,'reviewqueue',
-				       &encode_queue_key($symb,$udom,$uname));
-    $status{'gradingqueue'}=&check_queue_for_key($cdom,$cnum,'gradingqueue',
-				       &encode_queue_key($symb,$udom,$uname));
+
+    if ($type eq 'Task') {
+	my %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},
+					  $udom,$uname);
+	$status{'status'}=$record{'resource.0.status'};
+	$status{'version'}=$record{'resource.0.version'};
+	$status{'grader'}=$record{'resource.0.regrader'};
+    }
+    $status{'reviewqueue'}=
+	&check_queue_for_key($cdom,$cnum,'reviewqueue',
+			     &encode_queue_key($symb,$udom,$uname));
+    $status{'gradingqueue'}=
+	&check_queue_for_key($cdom,$cnum,'gradingqueue',
+			     &encode_queue_key($symb,$udom,$uname));
     return %status;
 }
 
@@ -1510,15 +1705,15 @@ sub get_instance {
 	    foreach my $instance (@instances) {
 		@Apache::scripttag::parser_env = @_;
 		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.text'});
-		if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' ||
-		    $Apache::lonhomework::history{"resource.$version.status"} eq 'fail') {
+		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.$dim.status"};
+		    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='$dim_status'>\n";
+		    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>';
 		    }
@@ -1533,12 +1728,12 @@ sub get_instance {
 			if ($dimension{$instance.'.criteria.'.$id.'.mandatory'} 
 			    eq 'N') {
 			    $opt_count++;
-			    if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
+			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
 				$opt_passed++;
 			    }
 			} else {
 			    $man_count++;
-			    if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"} eq 'pass') {
+			    if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"} eq 'pass') {
 				$man_passed++;
 			    }
 			}
@@ -1552,8 +1747,8 @@ sub get_instance {
 		    $result=~s/\Q$internal_location\E/$dim_info/;
 
 		    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-			my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
-			my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"};
+			my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
+			my $comment=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"};
 			my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
 			if ($mandatory) {
 			    $mandatory='Mandatory';
@@ -1568,13 +1763,14 @@ sub get_instance {
 			my $status_display=$status;
 			$status_display=~s/^([a-z])/uc($1)/e;
 			@Apache::scripttag::parser_env = @_;
-			$result.='<div class="'.$status.'"><h4>'.$mandatory.
-			    ' Criteria</h4><p>';
+			$result.=
+			    '<div class="LC_'.$status.' LC_criteria"><h4>'
+			    .$mandatory.' Criteria</h4><p>';
 			@Apache::scripttag::parser_env = @_;
 			$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
-			$result.='</p><p class="grade">'.$status_display.'</p>';
-			if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) {
-			    $result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</p>';
+			$result.='</p><p class="LC_grade">'.$status_display.'</p>';
+			if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}) {
+			    $result.='<p class="LC_comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</p>';
 			}
 			$result.='</div>';
 		    }
@@ -1587,30 +1783,31 @@ sub get_instance {
 	    @Apache::scripttag::parser_env = @_;
 	    &Apache::scripttag::xmlparse($dimension{$instance.'.text'});
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		my $link='criteria_'.$instance.'_'.$id;
-		my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"};
-		$result.='<tr><td width="100%" valign="top">'.
-		    '<a name="'.$link.'" />'.
-		    '<a name="next_'.$last_link.'" />'.
-		    '<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">';
+		my $link='LC_GRADE_criteria_'.$instance.'_'.$id;
+		my $status=$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.status"};
+		$result.='<div class="LC_GRADE_criteria" id="'.$link.'">'."\n".
+		    '<a name="'.$link.'" />'."\n".
+		    '<a name="next_'.$last_link.'" />'."\n".
+		    '<div class="LC_GRADE_criteriatext">'."\n";
 		@Apache::scripttag::parser_env = @_;
 		$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
-		$result.='</textarea>'.
+		$result.='</div>'."\n".
 		    #$dimension{$instance.'.criteria.'.$id}.
-		    '</td>'.
-		    '<td><nobr>Additional Comment for Student</nobr> <br />'.
-		    '<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'.
-		    '</td>'.
-		    '<td>'.
-		    '<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label></nobr><br />'.
-		    '<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label><br />'.
-		    '<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label><br />'.
-		    '<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label><br />'.
-		    '</td>'.
-		    '<td>'.
-		    '<a href="#'.$last_link.'">Prev</a><br />'.
-		    '<a href="#next_'.$link.'">Next</a><br /><br /><br />'.
-		    '</td></tr>';
+		    '<div class="LC_GRADE_grade">'."\n".
+		    '<label class="LC_GRADE_ungraded"><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').' />'.&mt('Ungraded').'</label>'."\n".
+		    '<label class="LC_GRADE_fail"><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />'.&mt('Fail').'</label>'."\n".
+		    '<label class="LC_GRADE_pass"><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />'.&mt('Pass').'</label>'."\n".
+		    '<label class="LC_GRADE_review"><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />'.&mt('Review').'</label>'."\n".
+		    '</div>'."\n".
+		    '<label class="LC_GRADE_comment">'.&mt('Additional Comment for Student')."\n".
+		    '<textarea class="LC_GRADE_comment_area" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</textarea>'."\n".
+		    '</label>'."\n".
+		    '<ul class="LC_GRADE_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,$instance,$id);
 		$last_link=$link;
 	    }
 	} elsif ($target eq 'grade' && $env{'form.webgrade'}) {
@@ -1619,8 +1816,8 @@ sub get_instance {
 	    my $ungraded=0;
 	    my $review=0;
 	    foreach my $id (@{$dimension{$instance.'.criterias'}}) {
-		my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
-		$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
+		my $status=$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id};
+		$Apache::lonhomework::results{"resource.$version.0.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id};
 		my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N');
 		if ($status eq 'pass') {
 		    if (!$mandatory) { $optional_passed++; }
@@ -1639,16 +1836,16 @@ sub get_instance {
 	    }
 	    &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.$dim.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		    'review';
 	    } elsif ($ungraded) {
-		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		    'ungraded';
 	    } elsif ($mandatory_failed) {
-		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		    'fail';
 	    } else {
-		$Apache::lonhomework::results{"resource.$version.$dim.status"}=
+		$Apache::lonhomework::results{"resource.$version.0.$dim.status"}=
 		    'pass';
 	    }
 	} else {
@@ -1659,15 +1856,47 @@ sub get_instance {
     }
 }
 
+sub grading_history {
+    my ($version,$dim,$instance,$criteria) = @_;
+    if (!&Apache::lonnet::allowed('mgq',$env{'request.course.id'})) {
+	return '';
+    }
+    my ($result,$grader);
+    my $scope="resource.$version.0.$dim.$instance.$criteria";
+    foreach my $t (1..$Apache::lonhomework::history{'version'}) {
+	if (exists($Apache::lonhomework::history{$t.':resource.0.regrader'})) {
+	    my ($gname,$gdom) = 
+		split('@',$Apache::lonhomework::history{$t.':resource.0.regrader'});
+	    my $fullname = &Apache::loncommon::plainname($gname,$gdom);
+	    $grader = &Apache::loncommon::aboutmewrapper($fullname,
+							 $gname,$gdom);
+	}
+	my $entry;
+	if (exists($Apache::lonhomework::history{"$t:$scope.status"})) {
+	    $entry.="<tt>".$Apache::lonhomework::history{"$t:$scope.status"}.'</tt>';
+	}
+	if (exists($Apache::lonhomework::history{"$t:$scope.comment"})) {
+	    $entry.=' comment: "'.$Apache::lonhomework::history{"$t:$scope.comment"}.'"';
+	}
+	if ($entry) {
+	    $result.= "<li>$grader : $entry </li>";
+	}
+    }
+    if ($result) {
+	return '<ul class="LC_pastgrading">'.$result.'</ul>';
+    }
+    return '';
+}
+
 sub start_IntroParagraph {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'web' || $target eq 'webgrade') {
 	if ($tagstack->[-2] eq 'Dimension') {
-	    $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser);
+	    $dimension{'intro'}=&Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
 	
 	} elsif ($target eq 'webgrade') {
-	    &Apache::lonxml::get_all_text('/introparagraph',$parser);
+	    &Apache::lonxml::get_all_text('/introparagraph',$parser,$style);
 	}
 	
     }
@@ -1696,9 +1925,9 @@ sub end_Instance {
 }
 
 sub start_InstanceText {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];
-    my $text=&Apache::lonxml::get_all_text('/instancetext',$parser);
+    my $text=&Apache::lonxml::get_all_text('/instancetext',$parser,$style);
     if ($target eq 'web' || $target eq 'webgrade') {
 	$dimension{$instance_id.'.text'}=$text;
     }
@@ -1710,9 +1939,9 @@ sub end_InstanceText {
 }
 
 sub start_Criteria {
-    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $instance_id=$Apache::bridgetask::instance[-1];
-    my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser);
+    my $criteria=&Apache::lonxml::get_all_text('/criteria',$parser,$style);
     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') {
 	my $id=&get_id($parstack,$safeeval);
 	$dimension{$instance_id.'.criteria.'.$id}=$criteria;
@@ -1742,7 +1971,7 @@ sub proctor_validation_screen {
 <h2>Proctor Validation</h2>
     <p>Your room's proctor needs to validate your access to this resource.</p>
     $msg
-<form name="checkout" method="POST" action="$env{'request.uri'}">
+<form name="checkout" method="post" action="$env{'request.uri'}">
 <input type="hidden" name="validate" value="yes" />
 <input type="hidden" name="submitted" value="yes" />
 <table>