Diff for /loncom/homework/chemresponse.pm between versions 1.54 and 1.55

version 1.54, 2005/05/26 20:49:23 version 1.55, 2005/05/26 20:59:47
Line 30  package Apache::chemresponse; Line 30  package Apache::chemresponse;
 use strict;  use strict;
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::lonlocal;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));      &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));
Line 63  sub chem_standard_order { Line 64  sub chem_standard_order {
 }  }
   
 sub separate_jme_window {  sub separate_jme_window {
     my ($smile_input,$jme_input,$molecule,$options)=@_;      my ($smile_input,$jme_input,$molecule,$options,$shown_text)=@_;
     my $smilesection;      my $smilesection;
     if (defined($smile_input)) {      if (defined($smile_input)) {
  $smilesection=<<SMILESECTION;   $smilesection=<<SMILESECTION;
Line 123  CHEMPAGE Line 124  CHEMPAGE
     $body=~s/\n/ /g;      $body=~s/\n/ /g;
     my $nothing=&Apache::lonhtmlcommon::javascript_nothing();      my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
       my $display=&mt('Draw Molecule');
       if (defined($shown_text)) { $display=&mt($shown_text); }
     my $result=<<CHEMINPUT;      my $result=<<CHEMINPUT;
 <input type="button" value="Draw Molecule" onclick="javascript:editor=window.open($nothing,'jmeedit','width=500,height=500,menubar=yes,scrollbars=no,resizable=yes');editor.$docopen;editor.document.write('$body');editor.document.close();editor.focus()" />  <input type="button" value="$display" onclick="javascript:editor=window.open($nothing,'jmeedit','width=500,height=500,menubar=yes,scrollbars=no,resizable=yes');editor.$docopen;editor.document.write('$body');editor.document.close();editor.focus()" />
 CHEMINPUT  CHEMINPUT
     return $result;      return $result;
 }  }
Line 137  sub start_organicresponse { Line 140  sub start_organicresponse {
     if ($target eq 'meta') {      if ($target eq 'meta') {
  $result=&Apache::response::meta_package_write('organicresponse');   $result=&Apache::response::meta_package_write('organicresponse');
     } elsif ($target eq 'web') {      } elsif ($target eq 'web') {
  if (  &Apache::response::show_answer() ) {   my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
     my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,   $safeeval);
      $safeeval);   if (  &Apache::response::show_answer() && $jmeanswer ne '') {
     my $options=&Apache::lonxml::get_param('options',$parstack,      my $options=&Apache::lonxml::get_param('options',$parstack,
    $safeeval);     $safeeval);
     my $width=&Apache::lonxml::get_param('width',$parstack,      my $width=&Apache::lonxml::get_param('width',$parstack,
Line 162  sub start_organicresponse { Line 165  sub start_organicresponse {
     }      }
     my $options=&Apache::lonxml::get_param('options',$parstack,      my $options=&Apache::lonxml::get_param('options',$parstack,
    $safeeval);     $safeeval);
     $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);      my $shown_text;
       if (&Apache::response::show_answer()) {
    $shown_text="Show Your Last Answer";
       }
       $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,
    $options,$shown_text);
     $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';      $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {

Removed from v.1.54  
changed lines
  Added in v.1.55


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>