--- loncom/homework/grades.pm	2006/04/11 20:51:46	1.351
+++ loncom/homework/grades.pm	2006/05/18 21:39:27	1.354
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.351 2006/04/11 20:51:46 albertel Exp $
+# $Id: grades.pm,v 1.354 2006/05/18 21:39:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2458,7 +2458,7 @@ sub handback_files {
                     # $request->print(&done('Back'));
                     }
                     $request->print("<br />".$fname." will be the uploaded file name");
-                    $request->print("<font color=\"red\">Will upload document </font>".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
+                    $request->print(" ".$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$file_counter});
                     $file_counter++;
                 }
             }
@@ -4831,7 +4831,7 @@ $warning
 <input type="hidden" name="command" value="scantron_validate" />
 STUFF
     }
-    $r->print("</form><br />".&show_grading_menu_form($symb)."</body></html>");
+    $r->print("</form><br />".&show_grading_menu_form($symb));
     return '';
 }
 
@@ -4932,8 +4932,7 @@ STUFF
 	    $r->print(" this scanline saving it for later.");
 	}
     }
-    $r->print(" </form><br />".&show_grading_menu_form($symb).
-	      "</body></html>");
+    $r->print(" </form><br />".&show_grading_menu_form($symb));
     return '';
 }
 
@@ -5936,7 +5935,7 @@ sub handler {
     if ($#commands > 0) {
 	&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
     }
-    &send_header($request);
+    $request->print(&Apache::loncommon::start_page('Grading'));
     if ($symb eq '' && $command eq '') {
 	if ($env{'user.adv'}) {
 	    if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
@@ -6027,20 +6026,8 @@ sub handler {
 	    $request->print("Access Denied ($command)");
 	}
     }
-    &send_footer($request);
-    return '';
-}
-
-sub send_header {
-    my ($request)= @_;
-    &Apache::lontexconvert::init_tth();
-    $request->print(&Apache::loncommon::start_page('Grading'));
-    $request->rflush();
-}
-
-sub send_footer {
-    my ($request)= @_;
     $request->print(&Apache::loncommon::end_page());
+    return '';
 }
 
 1;