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

[riegler]

riegler		Fri Sep  5 12:09:39 2008 EDT

  Modified files:              
    /loncom/homework	chemresponse.pm 
  Log:
  Replaced Draw Molecule button by pencil icon.
  
  
Index: loncom/homework/chemresponse.pm
diff -u loncom/homework/chemresponse.pm:1.78 loncom/homework/chemresponse.pm:1.79
--- loncom/homework/chemresponse.pm:1.78	Tue Mar 11 22:46:52 2008
+++ loncom/homework/chemresponse.pm	Fri Sep  5 12:09:39 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # chemical equation style response
 #
-# $Id: chemresponse.pm,v 1.78 2008/03/12 02:46:52 raeburn Exp $
+# $Id: chemresponse.pm,v 1.79 2008/09/05 16:09:39 riegler Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -163,6 +163,7 @@
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     my $display=&mt('Draw Molecule');
     if (defined($shown_text)) { $display=&mt($shown_text); }
+    my $iconpath=$Apache::lonnet::perlvar{'lonIconsURL'};
     my $function = 
 	'LONCAPA_draw_molecule_'.&Apache::lonhtmlcommon::get_uniq_name();
     my $result=<<CHEMINPUT;
@@ -175,11 +176,10 @@
 	editor.focus();
     }
 </script>
-<input type="button" value="$display" onclick="javascript:$function();void(0);" />
+<a href="javascript:$function();void(0);"><img class="stift" src='$iconpath/stift.gif' alt='$display' title='$display' /></a>
 CHEMINPUT
     return $result;
 }
-
 sub jme_img {
     my ($jme,$smile,$width,$options)=@_;
     my $id=&Apache::loncommon::get_cgi_id();
@@ -225,8 +225,8 @@
 	    if (&Apache::response::show_answer()) {
 		$shown_text="Show Your Last Answer";
 	    }
-	    $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,
-					 $options,$shown_text);
+	    #stift $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,
+#					 $options,$shown_text);
 	    $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
 	}
     } elsif ($target eq 'edit') {
@@ -341,6 +341,24 @@
 	    &Apache::lonhomework::set_bubble_lines();
 	}
     }
+    if (($target eq 'web' ) && ($Apache::lonhomework::type ne 'exam') && ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER')){
+# hierher
+            my $options=&Apache::lonxml::get_param('options',$parstack,
+                                                   $safeeval);
+            my $shown_text;
+            if (&Apache::response::show_answer()) {
+                $shown_text="Show Your Last Answer";
+            }
+	    my $molecule;
+	    if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {
+		$molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"};
+	    } else {
+		$molecule=&Apache::lonxml::get_param('molecule',$parstack,
+						     $safeeval);
+	    }
+	$result.=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,
+                             $options,$shown_text);
+    }
     &Apache::response::end_response();
     return $result;
 }