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

Diff for /loncom/homework/lonhomework.pm between versions 1.263 and 1.267

version 1.263, 2006/12/13 22:48:07 version 1.267, 2007/04/07 00:12:42
Line 96  sub get_target { Line 96  sub get_target {
     return ('grade','webgrade');      return ('grade','webgrade');
  }   }
  if ( defined($env{'form.submitted'}) &&   if ( defined($env{'form.submitted'}) &&
      ( !defined($env{'form.resetdata'})) &&  
      ( !defined($env{'form.newrandomization'}))) {       ( !defined($env{'form.newrandomization'}))) {
     return ('grade', 'web');      return ('grade', 'web');
  } else {   } else {
Line 113  sub get_target { Line 112  sub get_target {
  return ('web');   return ('web');
     }      }
  } else {   } else {
     if ( $env{'form.problemmode'} eq &mt('View') ||      if ($env{'form.problemstate'} eq 'WEB_GRADE') {
    #$env{'form.webgrade'} = 'yes';
    return ('grade','webgrade','answer');
       } elsif ( $env{'form.problemmode'} eq &mt('View') ||
  $env{'form.problemmode'} eq &mt('Discard Edits and View')) {   $env{'form.problemmode'} eq &mt('Discard Edits and View')) {
  if ( defined($env{'form.submitted'}) &&   if ( defined($env{'form.submitted'}) &&
      (!defined($env{'form.resetdata'})) &&       (!defined($env{'form.resetdata'})) &&
Line 663  sub handle_save_or_undo { Line 665  sub handle_save_or_undo {
  if ((!$error) && (!copy($filebak,$file))) { $error=1; }   if ((!$error) && (!copy($filebak,$file))) { $error=1; }
  if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }   if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }
  if (!$error) {   if (!$error) {
     &Apache::lonxml::info("<p><b>".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file</b></p>");      &Apache::lonxml::info("<p><b>".
  } else {    &mt("Undid changes, Switched [_1] and [_2]",
     &Apache::lonxml::info("<p><font color=\"red\" size=\"+1\"><b>".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file</b></font></p>");        '<span class="LC_filename">'.$filebak.
         '</span>',
         '<span class="LC_filename">'.$file.
         '</span>')."</b></p>");
    } else {
       &Apache::lonxml::info("<p><span class=\"LC_error\">".
     &mt("Unable to undo, unable to switch [_1] and [_2]",
         '<span class="LC_filename">'.
         $filebak.'</span>',
         '<span class="LC_filename">'.
         $file.'</span>')."</span></p>");
     $error=1;      $error=1;
  }   }
     } else {      } else {
Line 673  sub handle_save_or_undo { Line 685  sub handle_save_or_undo {
  my $fs=Apache::File->new(">$filebak");   my $fs=Apache::File->new(">$filebak");
  if (defined($fs)) {   if (defined($fs)) {
     print $fs $$problem;      print $fs $$problem;
     &Apache::lonxml::info("<b>".&mt("Making Backup to").      &Apache::lonxml::info("<b>".&mt("Making Backup to [_1]",
   " $filebak</b>");      '<span class="LC_filename">'.
  } else {      $filebak.'</span>').
     &Apache::lonxml::info("<font color=\"red\" size=\"+1\"><b>".&mt("Unable to make backup")." $filebak</b></font>");    "</b>");
    } else {
       &Apache::lonxml::info("<span class=\"LC_error\">".
     &mt("Unable to make backup [_1]",
         '<span class="LC_filename">'.
         $filebak.'</span>')."</span>");
     $error=2;      $error=2;
  }   }
  my $fh=Apache::File->new(">$file");   my $fh=Apache::File->new(">$file");
  if (defined($fh)) {   if (defined($fh)) {
     print $fh $$result;      print $fh $$result;
     &Apache::lonxml::info("<b>".&mt("Saving Modifications to").      &Apache::lonxml::info("<b>".&mt("Saving Modifications to [_1]",
   " $file</b>");     '<span class="LC_filename">'.
  } else {      $file.'</span>' )."</b>");
     &Apache::lonxml::info("<font color=\"red\" size=\"+1\"><b>".   } else {
   &mt("Unable to write to")." $file</b></font>");      &Apache::lonxml::info('<span class="LC_error">'.
     &mt("Unable to write to [_1]",
         '<span class="LC_filename">'.
         $file.'</span>').
     '</span>');
     $error|=4;      $error|=4;
  }   }
     }      }
Line 760  sub analyze { Line 781  sub analyze {
       $answer_part);        $answer_part);
  my $concatanswer= join("\0",@{ $answer_part });   my $concatanswer= join("\0",@{ $answer_part });
  if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {   if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {
     $answer_part = ['<font color="red">'.&mt('Error').'</font>'];      $answer_part = ['<span class="LC_error">'.&mt('Error').'</span>'];
  }   }
  $seedexample{join("\0",$part,$i,@{$answer_part})}=   $seedexample{join("\0",$part,$i,@{$answer_part})}=
     $thisseed;      $thisseed;
Line 841  sub editxmlmode { Line 862  sub editxmlmode {
  if ($cols < 70) { $cols = 70; }   if ($cols < 70) { $cols = 70; }
  if ($rows < 20) { $rows = 20; }   if ($rows < 20) { $rows = 20; }
  my $start_page =    my $start_page = 
     &Apache::loncommon::start_page("EditXML $file",      &Apache::loncommon::start_page(&mt("EditXML [_1]",$file),
    &Apache::edit::js_change_detection());     &Apache::edit::js_change_detection(),
      {'no_auto_mt_title' => 1,});
   
  $result.=$start_page.   $result.=$start_page.
     &renderpage($request,$file,['no_output_web'],1).      &renderpage($request,$file,['no_output_web'],1).
Line 999  sub newproblem { Line 1021  sub newproblem {
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  my $errormsg;   my $errormsg;
  if ($env{'form.newfile'}) {   if ($env{'form.newfile'}) {
     $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";      $errormsg='<p><span class="LC_error">'.&mt('You did not select a template.').'</span></p>'."\n";
  }   }
  my $instructions;   my $instructions;
  my $start_page =    my $start_page = 
Removed from v.1.263  
changed lines
  Added in v.1.267

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