--- loncom/homework/bridgetask.pm	2006/11/27 23:33:01	1.210
+++ loncom/homework/bridgetask.pm	2006/12/07 20:44:55	1.214
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.210 2006/11/27 23:33:01 albertel Exp $
+# $Id: bridgetask.pm,v 1.214 2006/12/07 20:44:55 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1061,27 +1061,30 @@ DONEBUTTON
 		    $start_time=&Apache::lonlocal::locallocaltime($start_time);
 
 		    my $status = 
-			"\n<div class='LC_$bt_status LC_criteria'>\n\t";
+			"\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.=$question_status;
 		    }
 		    if ($bt_status eq 'fail')  {
 			$status.='<h2>You did not pass the '.$title.' given on '.
 			    $start_time.'</h2>';
+			$status.=$question_status;
 			if (!$previous) {
 			    $status.=&add_request_another_attempt_button();
 			}
 		    }
-		    $status.="\n".'</div>'."\n";
-		    my $dim = $top;
-		    my %counts = &get_counts($dim,undef,$parstack,
-					     $safeeval);
-		    $status.="\n<div class='LC_$bt_status LC_criteria LC_task_overall_status'>\n\t<p>".
-			&question_status_message(\%counts,-1).
-			"</p>\n</div>\n";
 		    
+		    $status.="\n".'</div>'."\n";
 
 		    foreach my $id (@{$dimension{$dim}{'criterias'}}) {
 			my $type = $dimension{$dim}{'criteria.'.$id.'.type'};
@@ -1574,8 +1577,16 @@ sub show_queue {
 		my $ekey=&escape($key);
 		my ($action,$description,$status)=('select',&mt('Select'));
 		if (exists($queue{"$key\0locked"})) {
+		    my $locker = $queue{"$key\0locked"};
+		    my $time;
+		    if (ref($queue{"$key\0locked"}) eq 'ARRAY') {
+			($locker, $time) = @{$queue{"$key\0locked"}};
+			$time = 
+			    &Apache::lonnavmaps::timeToHumanString($time,
+								   'start');
+		    }
 		    my $me=$env{'user.name'}.':'.$env{'user.domain'};
-		    $status=&mt('Locked by <tt>[_1]</tt>',$queue{"$key\0locked"});
+		    $status=&mt('Locked by <tt>[_1]</tt> [_2]',$locker,$time);
 		    if ($me eq $queue{"$key\0locked"}) {
 			($action,$description)=('resume',&mt('Resume'));
 		    } else {
@@ -1794,7 +1805,7 @@ sub lock_key {
     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') {
@@ -2250,13 +2261,15 @@ sub end_Dimension {
 		}
 		my $dim_info=
 		    "\n<div class='LC_$dim_status LC_question_grade'>\n\t";
-		my $question = ('sub' x $dimension{$dim}{'depth'}).'question';
-		$question =~ s/^(.)/uc($1)/e;
+		my $ucquestion = 
+		    my $question = 
+		    ('sub' x $dimension{$dim}{'depth'}).'question';
+		$ucquestion =~ s/^(.)/uc($1)/e;
 		if ($dim_status eq 'pass') {
-		    $dim_info.='<h3>'.$question.' : you passed the above '.$mandatory.' question</h3>';
+		    $dim_info.='<h3>'.$ucquestion.' : you passed the above '.$mandatory.' '.$question.'</h3>';
 		}
 		if ($dim_status eq 'fail') {
-		    $dim_info.='<h3>'.$question.' : you did not pass the above '.$mandatory.' question</h3>';
+		    $dim_info.='<h3>'.$ucquestion.' : you did not pass the above '.$mandatory.' '.$question.'</h3>';
 		}
 		my %counts = &get_counts($dim,$instance,$parstack,
 					 $safeeval);
@@ -2300,8 +2313,8 @@ sub end_Dimension {
 	    # 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>)}
+	    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">'.
@@ -2429,7 +2442,7 @@ sub question_status_message {
 	foreach my $type ('cri','dim') {
 	    if ($counts->{$req.'_'.$type}) {
 		push(@sections,
-		     $counts->{$req.'_'.$type.'_passed'}.' of '.
+		     $counts->{$req.'_'.$type.'_passed'}.' of the '.
 		     $counts->{$req.'_'.$type}.' '.
 		     $req{$req}.' '.$type{$type});
 	    }