[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /homework grades.pm

[raeburn]

raeburn		Tue Oct 11 00:25:46 2011 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/homework	grades.pm 
  Log:
  - Backport 1.660.
  - Backport parts of 1.630, 1.631 missed in earlier backport (in 1.596.2.4).
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.596.2.7 loncom/homework/grades.pm:1.596.2.8
--- loncom/homework/grades.pm:1.596.2.7	Mon Oct 10 22:45:20 2011
+++ loncom/homework/grades.pm	Tue Oct 11 00:25:45 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.596.2.7 2011/10/10 22:45:20 raeburn Exp $
+# $Id: grades.pm,v 1.596.2.8 2011/10/11 00:25:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -416,7 +416,7 @@
 	    '<tr valign="top"><td>'.$grayFont.&mt('Item ID').'</span></td>'.
 	    $middlerow.'</tr>'.
 	    '<tr valign="top"><td>'.$grayFont.&mt('Option ID').'</span></td>'.
-	    $bottomrow.'</tr>'.'</table></blockquote>';
+	    $bottomrow.'</tr></table></blockquote>';
     } elsif ($response eq 'radiobutton') {
 	my %answer=&Apache::lonnet::str2hash($answer);
 	my ($toprow,$bottomrow);
@@ -2468,7 +2468,7 @@
 	    (split(/[,;\s]+/,$record->{'resource.'.$part.'.collaborators'})) { 
 	    $possible_collaborator =~ s/[\$\^\(\)]//g;
 	    next if ($possible_collaborator eq '');
-	    my ($co_name,$co_dom) = split(/\@|:/,$possible_collaborator);
+	    my ($co_name,$co_dom) = split(/:/,$possible_collaborator);
 	    $co_dom = $udom if (! defined($co_dom) || $co_dom =~ /^domain$/i);
 	    next if ($co_name eq $uname && $co_dom eq $udom);
 	    # Doing this grep allows 'fuzzy' specification
@@ -2481,7 +2481,7 @@
 	    }
 	}
 	if (scalar(@good_collaborators) != 0) {
-	    $result.='<br />'.&mt('Collaborators: ').'<ol>';
+	    $result.='<br />'.&mt('Collaborators:').'<ol>';
 	    foreach my $name (@good_collaborators) {
 		my ($lastname,$givenn) = split(/,/,$$fullname{$name});
 		push(@col_fullnames, $givenn.' '.$lastname);
@@ -8464,7 +8464,7 @@
         }
     }
     $r->print('<p>'.
-              &mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3]  ([quant,_4,bubblesheet line] per student).',
+              &mt('Comparison of bubblesheet data (including corrections) with corresponding submission records (most recent submission) for [_1][quant,_2,student][_3] ([quant,_4,bubblesheet line] per student).',
                   '<b>',
                   $numstudents,
                   '</b>',