--- loncom/homework/inputtags.pm	2012/06/12 22:02:24	1.304
+++ loncom/homework/inputtags.pm	2012/09/14 11:23:58	1.309
@@ -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.309 2012/09/14 11:23:58 goltermann Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -197,9 +197,11 @@ sub start_textfield {
 	    if ($addchars) {
 		$result.=&addchars('HWVAL_'.$resid,$addchars);
 	    }
-            my $textareaclass = 'class="LC_richDetectHtml"';
-	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" '.
-		      'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass.'>'.
+            my $textareaclass = 'class="LC_richDetectHtml spellchecked"';
+	    $result.= '<textarea wrap="hard" name="HWVAL_'.$resid.'" id="HWVAL_'.$resid.'" ' .
+		      'rows="'.$rows.'" cols="'.$cols.'" '.$textareaclass
+		      . "onblur='\$(this).spellchecker(\"check\")'"
+		      .'>'.
                       &HTML::Entities::encode($oldresponse,'<>&"');
 	    if ($oldresponse ne '') {
 
@@ -251,10 +253,12 @@ sub start_textfield {
 	    for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
 	    $result.='\strut \\\\\strut \\\\\strut \\\\\strut \\\\}}}';
 	} else {
-	    my $TeXwidth=$width_of_box/80;
-	    $result = '\vskip 1 mm \fbox{\fbox{\parbox{'.$TeXwidth.'\textwidth-5mm}{';
-	    for (my $i=0;$i<int $number_of_lines*2;$i++) {$result.='\strut \\\\ ';}
-	    $result.='}}}\vskip 2 mm ';
+	    my $fieldname = $env{'request.symb'}.
+                    '&part_'. $Apache::inputtags::part.
+                    '&textresponse'.
+                    '&HWVAL_' . $Apache::inputtags::response['-1'];
+            $result.='\TextField[name='.$fieldname.',multiline=true,height=6\baselineskip,width=270,borderwidth=0,backgroundcolor={.85
+                .85 .85}]\\';
 	}
     }
     return $result;
@@ -381,7 +385,8 @@ sub start_textline {
 		    $name = "none";
 		}
 		$result.= '<input onkeydown="javascript:setSubmittedPart(\''.$partid.'\');" type="text" '.$readonly.' name="'.$name.'" value="'.
-		    $oldresponse.'" size="'.$size.'"'.$maxlength.' />';
+		    $oldresponse.'" class="spellchecked"  size="'.$size.'"'.$maxlength.'
+                    onblur=' . "'\$(this).spellchecker(\"check\")'"  . '/>';
 	    }
 	    if ($Apache::lonhomework::type eq 'exam'
 		&& &needs_exam_box($tagstack)) {
@@ -589,7 +594,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 +693,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">'.
@@ -1522,10 +1529,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') {