[BACK]Return to inputtags.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/inputtags.pm between versions 1.333.2.3 and 1.333.2.6

version 1.333.2.3, 2015/10/30 11:33:07 version 1.333.2.6, 2019/08/07 21:10:37
Line 667  sub file_selector { Line 667  sub file_selector {
         $result .= $constraints.'<br />';          $result .= $constraints.'<br />';
     }      }
     if ($which eq 'uploadonly' || $which eq 'both') {       if ($which eq 'uploadonly' || $which eq 'both') { 
  $result.=&mt('Submit a file: (only one file per submission)').          my $free_space = $maxfilesize * 1048576;
     ' <br /><input type="file" size="50" name="HWFILE'.          $result .= &mt('Submit a file: (only one file per submission)').
     $jspart.'_'.$id.'" id="HWFILE'.$jspart.'_'.$id.'" /><br />';              ' <br /><input type="file" size="50" name="HWFILE'.$jspart.'_'.$id.
               '" id="HWFILE'.$jspart.'_'.$id.'" class="LC_flUpload" />'.
               '<input type="hidden" id="free_space" value="'.$free_space.'" /><br />';
     }      }
     if ( $which eq 'both') {      if ( $which eq 'both') {
  $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';   $result.='<br />'.'<strong>'.&mt('OR:').'</strong><br />';
Line 1048  sub decideoutput { Line 1050  sub decideoutput {
 #  #
           
     my $computer = ($handgrade || $nocorrect)? ''      my $computer = ($handgrade || $nocorrect)? ''
                        : " ".&mt("Computer's answer now shown above.");                         : &mt("Computer's answer now shown above.");
     &Apache::lonxml::debug("handgrade has :$handgrade:");      &Apache::lonxml::debug("handgrade has :$handgrade:");
   
     if ($previous) { $previousmsg=&mt('You have entered that answer before'); }      if ($previous) { $previousmsg=&mt('You have entered that answer before'); }
Line 1072  sub decideoutput { Line 1074  sub decideoutput {
  $message = '\textbf{'.$message.'}';   $message = '\textbf{'.$message.'}';
     } else {      } else {
  $message = "<b>".$message."</b>";   $message = "<b>".$message."</b>";
  $message.= $computer;                  if ($computer) {
                       $message = "$computer $message";
                   }
     }      }
     $added_computer_text=1;      $added_computer_text=1;
     if ($awarded > 0) {      if ($awarded > 0) {
Line 1116  sub decideoutput { Line 1120  sub decideoutput {
  $message = '\textbf{'.&mt('You are correct.').'}';   $message = '\textbf{'.&mt('You are correct.').'}';
     } else {      } else {
  $message = "<b>".&mt('You are correct.')."</b>";   $message = "<b>".&mt('You are correct.')."</b>";
  $message.= $computer;                  if ($computer) {
                       $message = "$computer $message";
                   }
     }      }
     $added_computer_text=1;      $added_computer_text=1;
     if  ($awarded > 0       if  ($awarded > 0 
Line 1328  sub decideoutput { Line 1334  sub decideoutput {
     }      }
     if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' &&       if ($Apache::inputtags::status[-1] eq 'SHOW_ANSWER' && 
  !$added_computer_text && $target ne 'tex') {   !$added_computer_text && $target ne 'tex') {
  $message.= $computer;          if ($computer) {
               $message = "$computer $message";
           }
  $added_computer_text=1;   $added_computer_text=1;
     }      }
     if ($Apache::lonhomework::type eq 'practice') {      if ($Apache::lonhomework::type eq 'practice') {
Line 1865  sub previous_tries { Line 1873  sub previous_tries {
     my $tries_text = &get_tries_text('link');      my $tries_text = &get_tries_text('link');
     my $prefix = $env{'form.request.prefix'};      my $prefix = $env{'form.request.prefix'};
     $prefix =~ tr{.}{_};      $prefix =~ tr{.}{_};
     my $function_name = "LONCAPA_previous_tries_".$prefix.      my $function_name = 'LONCAPA_previous_tries_'.$prefix;
  $Apache::lonxml::curdepth.'_'.$env{'form.counter'};      if (($env{'request.state'} eq 'construct') || ($id =~ /[._]|[^\w\s\-]/)) {
           $function_name .= $Apache::lonxml::curdepth;
       } else {
           $function_name .= &js_escape($id);
       }
       $function_name .= '_'.$Apache::lonxml::counter;
     my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />";      my $result = &Apache::loncommon::modal_adhoc_window($function_name,420,410,$output,&mt($tries_text))."<br />";
     return $result;      return $result;
 }  }
Removed from v.1.333.2.3  
changed lines
  Added in v.1.333.2.6

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