--- loncom/homework/chemresponse.pm	2005/05/26 20:59:47	1.55
+++ loncom/homework/chemresponse.pm	2005/06/26 22:18:32	1.57
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # chemical equation style response
 #
-# $Id: chemresponse.pm,v 1.55 2005/05/26 20:59:47 albertel Exp $
+# $Id: chemresponse.pm,v 1.57 2005/06/26 22:18:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -81,6 +81,12 @@ JMESECTION
     }
 
     if ($molecule) { $molecule='<param name="jme" value="'.$molecule.'" />'; }
+    my $insert_answer;
+    if ($shown_text ne '') { 
+	$insert_answer=
+	    '<input type="button" name="submit" value="Insert Answer" onclick="javascript:submitSmiles();" />';
+    }
+
     my $body=<<CHEMPAGE;
 <html>
 <head>
@@ -110,11 +116,11 @@ $molecule
 </applet><br />
 <font face="arial,helvetica,sans-serif" size="-1"><a href="http://www.molinspiration.com/jme/index.html">JME Editor</a> courtesy of Peter Ertl, Novartis</font>
 <form>
-<input type="button" name="submit" value="Insert Answer" onclick = "submitSmiles();" />
+$insert_answer
 <br />
-<input type="button" value="  Close  " onclick = "window.close()" />
+<input type="button" value="  Close  " onclick = "javascript:window.close()" />
 &nbsp;&nbsp;
-<input type="button" value="  Help  " onclick = "openHelpWindow()" />
+<input type="button" value="  Help  " onclick = "javascript:openHelpWindow()" />
 </form>
 </center>
 </body>
@@ -132,6 +138,19 @@ CHEMINPUT
     return $result;
 }
 
+sub jme_img {
+    my ($jme,$smile,$width,$options)=@_;
+    my $id=&Apache::loncommon::get_cgi_id();
+    my $result='<img alt="'.$smile.'" src="/cgi-bin/convertjme.pl?'.$id.'"';
+    if ($options =~ /border/) { $result.= ' border="1"'; }
+    $result.=' />';
+    &Apache::lonnet::appenv('cgi.'.$id.'.JME'   =>
+			    &Apache::lonnet::escape($jme),
+			    'cgi.'.$id.'.PNG'   => 1,
+			    'cgi.'.$id.'.WIDTH' => $width);
+    return $result;
+}
+
 sub start_organicresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
@@ -147,14 +166,9 @@ sub start_organicresponse {
 						   $safeeval);
 	    my $width=&Apache::lonxml::get_param('width',$parstack,
 						   $safeeval);
-	    my $id=&Apache::loncommon::get_cgi_id();
-	    $result="<img src='/cgi-bin/convertjme.pl?$id'";
-	    if ($options =~ /border/) { $result.= ' border="1"'; }
-	    $result.=' />';
-	    &Apache::lonnet::appenv('cgi.'.$id.'.JME'   =>
-				           &Apache::lonnet::escape($jmeanswer),
-				    'cgi.'.$id.'.PNG'   => 1,
-				    'cgi.'.$id.'.WIDTH' => $width);
+	    my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
+							 $safeeval);
+	    $result.=&jme_img($jmeanswer,$answers[0],$width,$options);
 	} else {
 	    my $molecule;
 	    if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {
