--- loncom/homework/bridgetask.pm	2006/01/30 21:01:46	1.99
+++ loncom/homework/bridgetask.pm	2006/02/08 22:44:14	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.99 2006/01/30 21:01:46 albertel Exp $
+# $Id: bridgetask.pm,v 1.104 2006/02/08 22:44:14 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1101,32 +1101,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 - $symb $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 {
@@ -1140,8 +1138,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" />
@@ -1157,8 +1156,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>";
 	}
@@ -1443,10 +1443,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" />
@@ -1454,7 +1456,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
         }
@@ -1474,6 +1476,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');
@@ -1677,7 +1682,7 @@ sub get_instance {
 			$result.=&Apache::scripttag::xmlparse($dimension{$instance.'.criteria.'.$id});
 			$result.='</p><p class="grade">'.$status_display.'</p>';
 			if ($Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}) {
-			    $result.='<p class="comment">'.$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}.'</p>';
+			    $result.='<p class="comment">'.&mt('Comment: [_1]',$Apache::lonhomework::history{"resource.$version.0.$dim.$instance.$id.comment"}).'</p>';
 			}
 			$result.='</div>';
 		    }