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

Diff for /loncom/homework/inputtags.pm between versions 1.260 and 1.260.4.1

version 1.260, 2009/07/17 15:27:17 version 1.260.4.1, 2009/12/06 21:00:15
Line 869  sub decideoutput { Line 869  sub decideoutput {
  $css_class=$possible_class{'charged_try'};   $css_class=$possible_class{'charged_try'};
  $button=1;   $button=1;
     } elsif ($award eq 'SUBMITTED') {      } elsif ($award eq 'SUBMITTED') {
  $message = &mt("Your submission has been recorded.");          if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
               if ($target eq 'web') {
                   $message .= '<br />'.&mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');
               }
           } else {
       $message = &mt("Your submission has been recorded.");
           }
  $css_class=$possible_class{'no_grade'};   $css_class=$possible_class{'no_grade'};
  $button=1;   $button=1;
     } elsif ($award eq 'DRAFT') {      } elsif ($award eq 'DRAFT') {
Line 922  sub decideoutput { Line 928  sub decideoutput {
     if (&Apache::lonhomework::hide_problem_status()      if (&Apache::lonhomework::hide_problem_status()
  && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'   && $Apache::inputtags::status[-1] ne 'SHOW_ANSWER'
  && &hide_award($award)) {   && &hide_award($award)) {
  $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");          if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
               if ($target eq 'web') {
                   $message = &mt("Your submission has been recorded.").'<br />'.
                              &mt('Thank you for making a submission to the Geosciences Concept Inventory via the GCI Web Center.');
               }
           } else {
       $message = &mt("Answer Submitted: Your final submission will be graded after the due date.");
           }
  $css_class=$possible_class{'no_grade'};   $css_class=$possible_class{'no_grade'};
  $button=1;   $button=1;
     }      }
Line 1237  sub get_grade_messages { Line 1250  sub get_grade_messages {
  $trystr = '\vskip 0 mm ';   $trystr = '\vskip 0 mm ';
     }      }
  } else {   } else {
     $trystr = '<td><span class="LC_nobreak">'.$tries_text." $tries";              $trystr = '<td><span class="LC_nobreak">';
     if ($Apache::lonhomework::parsing_a_task) {              my %parmhash=&Apache::lonnet::coursedescription($env{'request.course.id'});
     } elsif($env{'request.state'} ne 'construct') {              if ($parmhash{'suppress_tries'} ne 'yes') {
  $trystr.="/$maxtries";                  $trystr .= "$tries_text $tries";
     } else {          if ($Apache::lonhomework::parsing_a_task) {
  if (defined($Apache::inputtags::params{'maxtries'})) {          } elsif($env{'request.state'} ne 'construct') {
     $trystr.="/".$Apache::inputtags::params{'maxtries'};      $trystr.="/$maxtries";
  }          } else {
     }      if (defined($Apache::inputtags::params{'maxtries'})) {
           $trystr.="/".$Apache::inputtags::params{'maxtries'};
       }
           }
               }
     $trystr.="</span></td>";      $trystr.="</span></td>";
  }   }
     }      }
Line 1288  sub gradestatus { Line 1305  sub gradestatus {
  }   }
  if ( $showbutton ) {    if ( $showbutton ) { 
     if ($target ne 'tex') {      if ($target ne 'tex') {
                   my $submit_text = &mt('Submit Answer');
                   if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
                       $submit_text = &mt('Submit Questions');
                   }
  $button =    $button = 
             '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\')"              '<input onmouseup="javascript:setSubmittedPart(\''.$id.'\')"
                     type="submit" name="submit_'.$id.'"                      type="submit" name="submit_'.$id.'"
                     value="'.&mt('Submit Answer').'" />';                      value="'.$submit_text.'" />';
     }      }
  }   }
   
Line 1387  sub previous_tries { Line 1408  sub previous_tries {
     $output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>';      $output.='<br /><form action=""><center><input type="button" name="close" value="'.&mt('Close Window').'" onClick="window.close()" /></center></form>';
   
     my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();      my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
       my $pagetitle = 'Previous Tries';
       if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
           $pagetitle = 'Submission History';
       }
     my $start_page =      my $start_page =
  &Apache::loncommon::start_page('Previous Tries', undef,   &Apache::loncommon::start_page($pagetitle, undef,
        {'only_body'      => 1,         {'only_body'      => 1,
  'bgcolor'        => '#FFFFFF',   'bgcolor'        => '#FFFFFF',
  'js_ready'       => 1,   'js_ready'       => 1,
Line 1399  sub previous_tries { Line 1424  sub previous_tries {
     $prefix =~ tr{.}{_};      $prefix =~ tr{.}{_};
     my $function_name = "LONCAPA_previous_tries_".$prefix.      my $function_name = "LONCAPA_previous_tries_".$prefix.
  $Apache::lonxml::curdepth.'_'.$env{'form.counter'};   $Apache::lonxml::curdepth.'_'.$env{'form.counter'};
       my $triestext = &mt('Previous Tries');
       if ($env{'request.uri'} eq '/res/gci/gci/internal/submission.problem') {
           $triestext = &mt('Submission History');
       }
     my $result ="<script type=\"text/javascript\">      my $result ="<script type=\"text/javascript\">
 // <![CDATA[  // <![CDATA[
     function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}      function $function_name() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page $output $end_page');newWindow.document.close();newWindow.focus()}
 // ]]>  // ]]>
 </script><a href=\"javascript:$function_name();void(0);\">".&mt("Previous Tries")."</a><br />";  </script><a href=\"javascript:$function_name();void(0);\">".$triestext."</a><br />";
     #use Data::Dumper;      #use Data::Dumper;
     #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));      #&Apache::lonnet::logthis(&Dumper(\%Apache::inputtags::submission_display));
     return $result;      return $result;
Removed from v.1.260  
changed lines
  Added in v.1.260.4.1

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