--- loncom/homework/inputtags.pm 2012/06/12 22:02:24 1.304
+++ 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.304 2012/06/12 22:02:24 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.''.
+ $result.=$extratext.''.
&mt('Select Portfolio Files: (one or more files per submission)').'
'.
''.
'
';
@@ -688,9 +688,11 @@ sub current_file_submissions {
}
}
if ($header_shown) {
- $result .= &Apache::loncommon::end_data_table().
- '
'.
- &mt('Exclude existing file(s) from grading by checking the "Delete?" checkbox(es) and clicking "Submit Answer"').'';
+ $result .= &Apache::loncommon::end_data_table();
+ if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+ $result .= '
'.
+ &mt('Exclude existing file(s) from grading by checking the "Delete?" checkbox(es) and clicking "Submit Answer"').'';
+ }
}
if (@bad_file_list) {
my $bad_files = ''.
@@ -1522,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') {