Diff for /loncom/homework/inputtags.pm between versions 1.147 and 1.148

version 1.147, 2004/06/28 15:01:44 version 1.148, 2004/07/15 19:44:54
Line 330  sub decideoutput { Line 330  sub decideoutput {
     my $button=0;      my $button=0;
     my $previousmsg;      my $previousmsg;
     my $bgcolor='orange';      my $bgcolor='orange';
       my $added_computer_text=0;
     my %possiblecolors =      my %possiblecolors =
  ( 'correct' => '#aaffaa',   ( 'correct' => '#aaffaa',
   'charged_try' => '#ffaaaa',    'charged_try' => '#ffaaaa',
Line 347  sub decideoutput { Line 348  sub decideoutput {
     } else {      } else {
  $message = "<b>".&mt('You are correct.')."</b>";   $message = "<b>".&mt('You are correct.')."</b>";
     }      }
     $message.= " ".&mt(" Computer's answer now shown.");      $message.=" ".&mt("Computer's answer now shown.");
       $added_computer_text=1;
     unless ($ENV{'course.'.      unless ($ENV{'course.'.
      $ENV{'request.course.id'}.       $ENV{'request.course.id'}.
      '.disable_receipt_display'} eq 'yes') {        '.disable_receipt_display'} eq 'yes') { 
Line 379  sub decideoutput { Line 381  sub decideoutput {
     } else {      } else {
  $message = "<b>".&mt('You are correct.')."</b>";   $message = "<b>".&mt('You are correct.')."</b>";
     }      }
     $message.= " ".&mt(" Computer's answer now shown.");      $message.=" ".&mt("Computer's answer now shown.");
       $added_computer_text=1;
     unless ($ENV{'course.'.      unless ($ENV{'course.'.
      $ENV{'request.course.id'}.       $ENV{'request.course.id'}.
      '.disable_receipt_display'} eq 'yes') {        '.disable_receipt_display'} eq 'yes') { 
Line 487  sub decideoutput { Line 490  sub decideoutput {
  $bgcolor=$possiblecolors{'correct'};   $bgcolor=$possiblecolors{'correct'};
  $button=1;   $button=1;
     }      }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER') {      if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
    !$added_computer_text) {
  $message.=" ".&mt("Computer's answer now shown.");   $message.=" ".&mt("Computer's answer now shown.");
    $added_computer_text=1;
     }      }
     return ($button,$bgcolor,$message,$previousmsg);      return ($button,$bgcolor,$message,$previousmsg);
 }  }

Removed from v.1.147  
changed lines
  Added in v.1.148


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