[LON-CAPA-cvs] cvs: loncom /homework response.pm /homework/caparesponse caparesponse.pm /publisher packages.tab

[riegler]

riegler		Mon Sep  8 12:08:39 2008 EDT

  Modified files:              
    /loncom/homework	response.pm 
    /loncom/homework/caparesponse	caparesponse.pm 
    /loncom/publisher	packages.tab 
  Log:
  Moved the pencilicon behind the textfield for mathresponse.
  Fixed bugzilla #5772: Implemented turnoneditor as an attribute for formular- and mathresponse.
  
  
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.201 loncom/homework/response.pm:1.202
--- loncom/homework/response.pm:1.201	Fri Sep  5 17:32:56 2008
+++ loncom/homework/response.pm	Mon Sep  8 12:08:36 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.201 2008/09/05 21:32:56 riegler Exp $
+# $Id: response.pm,v 1.202 2008/09/08 16:08:36 riegler Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -486,9 +486,6 @@
 						   $safeeval);
 	    $Apache::inputtags::answertxt{$id}=[$answer];
 	}
-        if ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') {
-            $result.=&edit_mathresponse_button($id,"HWVAL_$id");
-        }
 
     } elsif ($target eq 'edit') {
 	$result.=&Apache::edit::tag_start($target,$token);
@@ -575,6 +572,9 @@
     }
     if ($target eq 'web') {
 	&setup_prior_tries_hash(\&format_prior_response_math);
+        if (($Apache::inputtags::status['-1'] eq 'CAN_ANSWER') &&  (&Apache::lonxml::get_param('turnoneditor',$parstack,$safeeval) ne 'no')) {
+            $result.=&edit_mathresponse_button($id,"HWVAL_$id");
+        }
     }
 
     pop(@Apache::lonxml::namespace);
Index: loncom/homework/caparesponse/caparesponse.pm
diff -u loncom/homework/caparesponse/caparesponse.pm:1.229 loncom/homework/caparesponse/caparesponse.pm:1.230
--- loncom/homework/caparesponse/caparesponse.pm:1.229	Thu Sep  4 18:47:19 2008
+++ loncom/homework/caparesponse/caparesponse.pm	Mon Sep  8 12:08:37 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.229 2008/09/04 22:47:19 riegler Exp $
+# $Id: caparesponse.pm,v 1.230 2008/09/08 16:08:37 riegler Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -606,7 +606,7 @@
 	    }
 	}
         if (($target eq 'web') && ($tag eq 'formularesponse')
-            && ($Apache::lonhomework::type ne 'exam') && ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')) {
+            && ($Apache::lonhomework::type ne 'exam') && ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')&&  (&Apache::lonxml::get_param('turnoneditor',$parstack,$safeeval) ne 'no')) {
            $result.=&Apache::response::edit_mathresponse_button($id,"HWVAL_$id");
         }
             
Index: loncom/publisher/packages.tab
diff -u loncom/publisher/packages.tab:1.55 loncom/publisher/packages.tab:1.56
--- loncom/publisher/packages.tab:1.55	Fri Sep  5 13:43:33 2008
+++ loncom/publisher/packages.tab	Mon Sep  8 12:08:37 2008
@@ -82,7 +82,12 @@
 essayresponse&maxcollaborators&display:Maximum Number of Collaborators
 essayresponse&uploadedfiletypes&type:string_fileext
 essayresponse&uploadedfiletypes&display:Allowed File Extensions for Uploaded Files
-
+formularesponse&turnoneditor&type:string_yesno
+formularesponse&turnoneditor&default:yes
+formularesponse&turnoneditor&display:Show the pencil icon to access the editor
+mathresponse&turnoneditor&type:string_yesno
+mathresponse&turnoneditor&default:yes
+mathresponse&turnoneditor&display:Show the pencil icon to access the editor
 
 #parameters for things by extension
 extension_sequence&encrypturl&type:string_yesno