--- loncom/homework/chemresponse.pm 2004/06/07 21:56:24 1.34
+++ loncom/homework/chemresponse.pm 2004/09/27 20:59:21 1.39
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# chemical equation style response
#
-# $Id: chemresponse.pm,v 1.34 2004/06/07 21:56:24 albertel Exp $
+# $Id: chemresponse.pm,v 1.39 2004/09/27 20:59:21 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -121,8 +121,9 @@ $molecule
CHEMPAGE
$body=&HTML::Entities::encode($body,'<>&"');
$body=~s/\n/ /g;
+ my $nothing= &Apache::lonhtmlcommon::javascript_nothing();
my $result=<
+
CHEMINPUT
return $result;
}
@@ -245,7 +246,7 @@ sub start_organicstructure {
'cgi.'.$id.'.PNG' => 1,
'cgi.'.$id.'.WIDTH' => $width );
} elsif ($target eq 'tex') {
- my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,1);
+ my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
if (!$texwidth) { $texwidth='90'; }
my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
@@ -308,15 +309,16 @@ sub edit_reaction_button {
my $id_es=&Apache::lonnet::escape($id);
my $field_es=&Apache::lonnet::escape($field);
my $reaction_es=&Apache::lonnet::escape($reaction);
+ my $nothing= &Apache::lonhtmlcommon::javascript_nothing();
my $result=<
function create_reaction_window_${id}_${field} () {
editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
- editor.document.open('text/html','replace');
- editor.document.writeln(' LON-CAPA Reaction Editor ');
+ editor.document.open($nothing,'replace');
+ editor.document.writeln(' LON-CAPA Reaction Editor ');
}
-
+
EDITREACTION
return $result;
}
@@ -331,6 +333,7 @@ sub start_reactionresponse {
my $partid = $Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"};
+ if ($reaction eq '') { $reaction=&Apache::lonxml::get_param('initial',$parstack,$safeeval); }
my $status=$Apache::inputtags::status['-1'];
if ($status eq 'CAN_ANSWER') {
$result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);
@@ -347,11 +350,16 @@ sub start_reactionresponse {
$result .=''.
&Apache::edit::text_arg('Answer:','answer',$token,40);
$result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'';
+ my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval);
+ $result.=''.
+ &Apache::edit::text_arg('Initial Reation:','initial',$token,40);
+ $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).'';
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args($token,$parstack,
- $safeeval,'answer');
+ $safeeval,'answer',
+ 'initial');
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
}
return $result;