--- loncom/homework/inputtags.pm	2011/06/06 23:28:42	1.290
+++ loncom/homework/inputtags.pm	2012/01/29 03:02:52	1.301
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.290 2011/06/06 23:28:42 www Exp $
+# $Id: inputtags.pm,v 1.301 2012/01/29 03:02:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -571,7 +571,7 @@ sub file_selector {
     if ($which eq 'uploadonly' || $which eq 'both') { 
 	$result.=&mt('Submit a file: (only one file per submission)').
 	    ' <br /><input type="file" size="50" name="HWFILE'.
-	    $jspart.'_'.$id.'" /><br />';
+	    $jspart.'_'.$id.'" id="HWFILE'.$jspart.'_'.$id.'" /><br />';
     }
     if ( $which eq 'both') {
 	$result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
@@ -885,8 +885,8 @@ sub decideoutput {
 	    $message=&mt('Incorrect.');
 	    $css_class=$possible_class{'charged_try'};
 	}
-	if ($env{'request.filename'} =~ 
-	    m|/res/lib/templates/examupload.problem$|) {
+	if ($handgrade || 
+            ($env{'request.filename'}=~/\/res\/lib\/templates\/(examupload|DropBox).problem$/)) {
 	    $message = &mt("A score has been assigned.");
 	    $added_computer_text=1;
 	} else {
@@ -911,7 +911,13 @@ sub decideoutput {
 		}
 	    }
 	}
-        if ($awarded==1) { $button=0; } else { $button=1; }
+        if ($awarded >= 1) {
+            $button=0;
+        } elsif (&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/i) {
+            $button=0;
+        } else {
+            $button=1;
+        }
 	$previousmsg='';
     } elsif ($solved =~ /^excused/) {
 	if ($target eq 'tex') {
@@ -1070,6 +1076,7 @@ sub decideoutput {
     } elsif ($award eq 'ANONYMOUS_CREDIT') {
         $message = &mt("Your anonymous submission has been recorded, and credit awarded.");
         $css_class=$possible_class{'correct'};
+        $button=1;
     } elsif ($award eq 'DRAFT') {
 	$message = &mt("Copy saved but not submitted.");
 	$css_class=$possible_class{'not_charged_try'};
@@ -1436,28 +1443,30 @@ sub get_grade_messages {
     if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; } 
-    my $tries_text= &get_tries_text();;
+    my $tries_text= &get_tries_text();
     if ($showbutton) {
 	if ($target eq 'tex') {
 	    if ($env{'request.state'} ne "construct"
 		&& $Apache::lonhomework::type ne 'exam'
 		&& $env{'form.suppress_tries'} ne 'yes') {
-		$trystr = ' {\vskip 1 mm \small \textit{'.$tries_text.'} '.
-		    $tries.'/'.$maxtries.'} \vskip 2 mm ';
+		$trystr ='{\vskip 1 mm \small '
+                        .&mt('[_1]'.$tries_text.'[_2] [_3]'
+				,'\textit{','}',$tries.'/'.$maxtries ) 
+                        .'} \vskip 2 mm';
 	    } else {
 		$trystr = '\vskip 0 mm ';
 	    }
 	} else {
-	    $trystr = '<td><span class="LC_nobreak">'.&mt($tries_text)." $tries";
+	    my $trial =$tries;
 	    if ($Apache::lonhomework::parsing_a_task) {
 	    } elsif($env{'request.state'} ne 'construct') {
-		$trystr.="/".&Apache::lonhtmlcommon::direct_parm_link($maxtries,$env{'request.symb'},'maxtries',$id,$target);
+		$trial.="/".&Apache::lonhtmlcommon::direct_parm_link($maxtries,$env{'request.symb'},'maxtries',$id,$target);
 	    } else {
 		if (defined($Apache::inputtags::params{'maxtries'})) {
-		    $trystr.="/".$Apache::inputtags::params{'maxtries'};
+		    $trial.="/".$Apache::inputtags::params{'maxtries'};
 		}
 	    }
-	    $trystr.="</span></td>";
+	    $trystr = '<td><span class="LC_nobreak">'.&mt($tries_text.' [_1]',$trial).'</span></td>';
 	}
     }
 
@@ -1486,7 +1495,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,
@@ -1578,7 +1590,7 @@ sub previous_tries {
                              {$1 <strong>$txt_correct</strong>. $3}s;
 	    }
             my $trystr = "(".&mt('Try [_1]',$Apache::lonhomework::history{"$prefix.tries"}).")";
-            if ($curr_rndseed || $lastrndseed) {
+            if (($curr_rndseed || $lastrndseed) && ($i > 1)) {
                 if ($curr_rndseed ne $lastrndseed) {
                     $trystr .= '<br /><span style="color: green; white-space: nowrap; font-style: italic; font-weight: bold; font-size: 80%;">'.&mt('New problem variation this try.').'</span>';
                 }
@@ -1620,31 +1632,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;
 }