[LON-CAPA-cvs] cvs: loncom /homework chemresponse.pm

[albertel]

albertel		Mon Jun 30 16:41:12 2003 EDT

  Modified files:              
    /loncom/homework	chemresponse.pm 
  Log:
  - organicresponse looks better when editing
  - reaction response loads up correct file
  
  
Index: loncom/homework/chemresponse.pm
diff -u loncom/homework/chemresponse.pm:1.6 loncom/homework/chemresponse.pm:1.7
--- loncom/homework/chemresponse.pm:1.6	Mon Jun 30 14:00:18 2003
+++ loncom/homework/chemresponse.pm	Mon Jun 30 16:41:12 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # chemical equation style response
 #
-# $Id: chemresponse.pm,v 1.6 2003/06/30 18:00:18 albertel Exp $
+# $Id: chemresponse.pm,v 1.7 2003/06/30 20:41:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -123,16 +123,15 @@
 	$result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
     } elsif ($target eq 'edit') {
 	$result .=&Apache::edit::tag_start($target,$token);
-	$result .=&Apache::edit::text_arg('Starting Molecule:','molecule',
-					  $token,40);
-	$result .=&Apache::edit::select_arg('Multipart:','multipart',
-					    ['yes','no'],$token);
+	$result .='<nobr>'.
+	    &Apache::edit::text_arg('Starting Molecule:','molecule',
+				    $token,40);
 	my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
 						$safeeval);
 	$result .=&seperate_jme_window(undef,
 		      &Apache::edit::html_element_name('molecule'),
 		      $molecule,'multipart');
-	$result .='<br />';
+	$result .='</nobr><br /><nobr>';
 	$result .=&Apache::edit::text_arg('Correct Answer:','answer',
 					  $token,40);
 	$result .=&Apache::edit::hidden_arg('jmeanswer',$token);
@@ -142,6 +141,9 @@
                       &Apache::edit::html_element_name('answer'),
                       &Apache::edit::html_element_name('jmeanswer'),
 		      $jmeanswer,'multipart');
+	$result .='</nobr>'.
+	    &Apache::edit::select_arg('Multipart:','multipart',
+				      ['no','yes'],$token);
 	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {
 	my $constructtag=&Apache::edit::get_new_args($token,$parstack,
@@ -422,7 +424,7 @@
     my $id = &Apache::response::start_response($parstack,$safeeval);
     if ($target eq 'web') {
 	$result.=<<EDITREACTION;
-<input type='button' value='Edit Reaction' onClick="javascript:editor=window.open('/adm/jme/reaction_window.html','','width=500,height=270,scrollbars=no,resizable=yes'); document.cookie='problem=$id';"/>'
+<input type='button' value='Edit Reaction' onClick="javascript:editor=window.open('/res/adm/reactionresponse/reaction_window.html','','width=500,height=270,scrollbars=no,resizable=yes'); document.cookie='problem=$id';" />
 EDITREACTION
 
 #	$result.=&reaction_javascript();