--- loncom/homework/inputtags.pm	2011/11/29 13:24:38	1.296
+++ loncom/homework/inputtags.pm	2011/12/20 22:47:27	1.300
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.296 2011/11/29 13:24:38 raeburn Exp $
+# $Id: inputtags.pm,v 1.300 2011/12/20 22:47:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -843,26 +843,6 @@ sub finalizeawards {
 }
 }
 
-sub grading_is_nonlenient {
-    my ($part) = @_;
-# Web mode: we are non-lenient unless told otherwise
-    my $defaultparm = 'off';
-    my $nonlenient = 0;
-# Grading a bubblesheet exam: we are grading lenient unless told otherwise
-    if ($Apache::lonhomework::scantronmode) {
-        $defaultparm = 'on';
-        $nonlenient = 1;
-    }
-    my $lenientparm =
-        &Apache::response::get_response_param($part,'lenient',$defaultparm);
-    if ($lenientparm=~/^0|off|no$/i) {
-        $nonlenient = 1;
-    } elsif ($lenientparm=~/^1|on|yes$/i) {
-        $nonlenient = 0;
-    }
-    return $nonlenient;
-}
-
 sub decideoutput {
     my ($award,$awarded,$awardmsg,$solved,$previous,$target,$nocorrect)=@_;
 
@@ -931,11 +911,11 @@ sub decideoutput {
 		}
 	    }
 	}
-        if (&grading_is_nonlenient($part)) {
+        if ($awarded >= 1) {
             $button=0;
-        } elsif ($awarded==1) {
+        } elsif (&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/i) {
             $button=0;
-        } else { 
+        } else {
             $button=1;
         }
 	$previousmsg='';
@@ -1514,7 +1494,10 @@ sub gradestatus {
 	 && $status ne 'UNAVAILABLE' 
 	 && $status ne 'INVALID_ACCESS' 
 	 && $status ne 'NEEDS_CHECKIN' 
-	 && $status ne 'NOT_IN_A_SLOT') {  
+	 && $status ne 'NOT_IN_A_SLOT'
+         && $status ne 'RESERVABLE'
+         && $status ne 'RESERVABLE_LATER'
+         && $status ne 'NOTRESERVABLE') {
 
 	($previousmsg,$latemessage,$message,$trystr) =
 	    &get_grade_messages($id,"resource.$id",$target,$status,
@@ -1648,31 +1631,13 @@ sub previous_tries {
 	'</th><th colspan="'.scalar(@Apache::inputtags::response).'">'.
 	&mt('Submitted Answer').'</th>';
     $output ='<table class="LC_prior_tries">'.$headers.$output.'</table>';
-    #return $output;
-    $output = &Apache::loncommon::js_ready($output); 
-    $output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>';
 
-    my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
     my $tries_text = &get_tries_text('link');
-    my $start_page =
-	&Apache::loncommon::start_page($tries_text, undef,
-				       {'only_body'      => 1,
-					'bgcolor'        => '#FFFFFF',
-					'js_ready'       => 1,
-				        'inherit_jsmath' => 1, });
-    my $end_page =
-	&Apache::loncommon::end_page({'js_ready' => 1,});
     my $prefix = $env{'form.request.prefix'};
     $prefix =~ tr{.}{_};
     my $function_name = "LONCAPA_previous_tries_".$prefix.
 	$Apache::lonxml::curdepth.'_'.$env{'form.counter'};
-    my $result ="<script type=\"text/javascript\">
-// <![CDATA[
-    function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}
-// ]]>
-</script><a href=\"javascript:$function_name();void(0);\">".&mt($tries_text)."</a><br />";
-    #use Data::Dumper;
-    #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
+    my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />";
     return $result;
 }