--- loncom/homework/inputtags.pm	2012/06/08 12:25:54	1.303
+++ loncom/homework/inputtags.pm	2012/08/21 18:24:28	1.307
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.303 2012/06/08 12:25:54 raeburn Exp $
+# $Id: inputtags.pm,v 1.307 2012/08/21 18:24:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -589,7 +589,7 @@ sub file_selector {
                 $showsymb = $symb;
             }
         }
-	$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'&symb='.$showsymb.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
+	$result.=$extratext.'<a href='."'".'javascript:void(window.open("/adm/portfolio?mode=selectfile&amp;fieldname='.$env{'form.request.prefix'}.'HWPORT'.$jspart.'_'.$id.'&amp;symb='.$showsymb.'","cat","height=600,width=800,scrollbars=1,resizable=1,menubar=2,location=1"))'."'".'>'.
 	    &mt('Select Portfolio Files: (one or more files per submission)').'</a><br />'.
 	    '<input type="text" size="50" name="HWPORT'.$jspart.'_'.$id.'" value="" />'.
 	    '<br />';
@@ -688,9 +688,11 @@ sub current_file_submissions {
         }
     }
     if ($header_shown) {
-        $result .= &Apache::loncommon::end_data_table().
-                   '<br /><span class="LC_warning">'.
-                   &mt('Exclude existing file(s) from grading by checking the "Delete?" checkbox(es) and clicking "Submit Answer"').'</span>';
+        $result .= &Apache::loncommon::end_data_table();
+        if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+            $result .= '<br /><span class="LC_warning">'.
+                       &mt('Exclude existing file(s) from grading by checking the "Delete?" checkbox(es) and clicking "Submit Answer"').'</span>';
+        }
     }
     if (@bad_file_list) {
         my $bad_files = '<span class="LC_filename">'.
@@ -1139,7 +1141,17 @@ sub decideoutput {
     if (&Apache::lonhomework::hide_problem_status()
 	&& $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
 	&& &hide_award($award)) {
-	$message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+        $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
+        my @interval= &Apache::lonnet::EXT("resource.$part.interval");
+        if ($interval[0] =~ /\d+/) {
+            my $first_access=&Apache::lonnet::get_first_access($interval[1]);
+            if (defined($first_access)) {
+                my $due_date= &Apache::lonnet::EXT("resource.$part.duedate");
+                unless (($due_date) && ($due_date < $first_access + $interval[0])) { 
+                    $message = &mt("Answer Submitted: Your final submission will be graded when the time limit is reached.");
+                }
+            }
+        }
 	$css_class=$possible_class{'no_grade'};
 	$button=1;
     }
@@ -1512,10 +1524,14 @@ sub gradestatus {
          && $status ne 'RESERVABLE_LATER'
          && $status ne 'NOTRESERVABLE') {
 
+	if ($status eq 'SHOW_ANSWER') {
+            $showbutton = 0;
+        }
+
 	($previousmsg,$latemessage,$message,$trystr) =
 	    &get_grade_messages($id,"resource.$id",$target,$status,
 				$showbutton);
-	if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
+	if ($status eq 'CANNOT_ANSWER') {
 	    $showbutton = 0;
 	}
 	if ( $status eq 'SHOW_ANSWER') {