--- loncom/homework/structuretags.pm	2002/04/11 17:37:13	1.90
+++ loncom/homework/structuretags.pm	2002/04/25 18:58:04	1.91
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.90 2002/04/11 17:37:13 albertel Exp $
+# $Id: structuretags.pm,v 1.91 2002/04/25 18:58:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -150,11 +150,10 @@ permanent record is left in the system.<
 <font color=red>
 Checking out resources is subject to course policies, and may exclude future
 credit even if done erroneously.<p />
-</font>  
-<form method=post>
-<input type=button name="doescheckout" 
-value="Check out Exam for Viewing" 
-onClick="if (confirm('Check out Exam?')) { this.form.submit(); }" />
+</font>
+<form name="checkout" method="POST" action="$ENV{'request.uri'}">
+<input type="hidden" name="doescheckout" value="yes" />
+<input type="button" name="checkoutbutton" value="Check out Exam for Viewing" onClick="javascript:if (confirm('Check out Exam?')) { document.checkout.submit(); }" />
 </form>
 ENDCHECKOUT
 }
@@ -315,7 +314,8 @@ sub end_problem {
     if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
       # if part is zero, no <part>s existed, so we need to the grading
       &Apache::inputtags::grade;
-    } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') {
+    } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0' && 
+	      $status ne 'UNCHECKEDOUT') {
       # if part is zero, no <part>s existed, so we need show the current 
       # grading status
       $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part);
@@ -326,7 +326,8 @@ sub end_problem {
        ) {
       if ($status eq 'CAN_ANSWER') {
 	$result.="</form></body>\n"; 
-      } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
+      } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
+	       $status eq 'UNCHECKEDOUT' ) {
 	$result.="</body>\n";
       }
       $result.=&Apache::lonxml::xmlend();