--- loncom/homework/grades.pm	2011/10/11 00:25:45	1.596.2.8
+++ loncom/homework/grades.pm	2011/12/01 00:36:59	1.596.2.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.596.2.8 2011/10/11 00:25:45 raeburn Exp $
+# $Id: grades.pm,v 1.596.2.12 2011/12/01 00:36:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2106,7 +2106,7 @@ sub submission {
                           keyw => 'Keyword Options',
                           list => 'List',
                           past => 'Paste Selection to List',
-                          high => 'Hightlight Attribute',
+                          high => 'Highlight Attribute',
                      );
 #
 # Print out the keyword options line
@@ -7051,7 +7051,7 @@ sub scantron_get_correction {
        .&mt('The ID on the form is [_1]',
             "<tt>$$scan_record{'scantron.ID'}</tt>")
        .'<br />'
-       .&mt('The name on the paper is [_2], [_3]',
+       .&mt('The name on the paper is [_1], [_2]',
             $$scan_record{'scantron.LastName'},
             $$scan_record{'scantron.FirstName'})
        .'</p>';
@@ -7176,7 +7176,7 @@ ENDSCRIPT
 	}
         $r->print(&verify_bubbles_checked(@lines_to_correct));
     } elsif ($error eq 'missingbubble') {
-	$r->print('<p class="LC_warning">.&mt("There have been [_1]no[_2] bubbles scanned for some question(s)",'<b>','</b>')."</p>\n");
+	$r->print('<p class="LC_warning">'.&mt("There have been [_1]no[_2] bubbles scanned for some question(s)",'<b>','</b>')."</p>\n");
 	$r->print($message);
 	$r->print("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");
 	$r->print(&mt("Some questions have no scanned bubbles.")."\n");
@@ -9382,9 +9382,10 @@ sub assign_clicker_grades {
 # FIXME: This should probably look for the first handgradeable part
     my $part=$$partlist[0];
 # Start screen output
-    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'}).'<br />';
+    my ($result) = &showResourceInfo($symb,$env{'form.probTitle'});
 
-    $result .= &Apache::loncommon::start_data_table().
+    $result .= '<br />'.
+               &Apache::loncommon::start_data_table().
                &Apache::loncommon::start_data_table_header_row().
                '<th>'.&mt('Assigning grades based on clicker file').'</th>'.
                &Apache::loncommon::end_data_table_header_row().
@@ -9572,9 +9573,12 @@ sub handler {
     } else {
         &init_perm();
         if (!$env{'request.course.id'}) {
-            # Not in a course.
-            $env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";
-            return HTTP_NOT_ACCEPTABLE;
+            unless ((&Apache::lonnet::allowed('usc',$env{'request.role.domain'})) &&
+                    ($command =~ /^scantronupload/)) {
+                # Not in a course.
+                $env{'user.error.msg'}="/adm/grades::vgr:0:0:Cannot display grades page outside course context";
+                return HTTP_NOT_ACCEPTABLE;
+            }
         } elsif (!%perm) {
             $request->internal_redirect('/adm/quickgrades');
         }