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

Diff for /loncom/homework/structuretags.pm between versions 1.343 and 1.369

version 1.343, 2006/04/14 20:16:23 version 1.369, 2006/11/20 11:52:10
Line 38  use Apache::lonlocal; Line 38  use Apache::lonlocal;
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::lonenc();  use Apache::lonenc();
 use Time::HiRes qw( gettimeofday tv_interval );  use Time::HiRes qw( gettimeofday tv_interval );
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));      &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
 }  }
Line 70  sub end_tex { Line 73  sub end_tex {
 }  }
   
 sub page_start {  sub page_start {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,
    $extra_head)=@_;
     my %found;      my %found;
     foreach my $taginside (@$tagstack) {      foreach my $taginside (@$tagstack) {
  foreach my $taglookedfor ('html','body','form') {   foreach my $taglookedfor ('html','body','form') {
Line 78  sub page_start { Line 82  sub page_start {
  }   }
     }      }
   
   
     if ($target eq 'tex') {      if ($target eq 'tex') {
  return   return
     &Apache::londefdef::start_html($target,$token,$tagstack,      &Apache::londefdef::start_html($target,$token,$tagstack,
    $parstack,$parser,$safeeval);     $parstack,$parser,$safeeval);
     }      }
   
     my $page_start;      my %body_args;
     if (!defined($found{'html'})) {      if (defined($found{'html'})) {
    $body_args{'skip_phases'}{'head'}=1;
       } else {
   
  my $extra_head = &Apache::lonhtmlcommon::spellheader();   $extra_head .= &Apache::lonhtmlcommon::spellheader();
   
  my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');   my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
  if ($css_href =~ /\S/) {   if ($css_href =~ /\S/) {
Line 102  sub page_start { Line 107  sub page_start {
  "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".   "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
  &Apache::loncommon::browser_and_searcher_javascript().   &Apache::loncommon::browser_and_searcher_javascript().
                 "\n</script>\n";                  "\n</script>\n";
       
  }   }
  $page_start .=  
     &Apache::loncommon::head($name,$extra_head,  
      {'force_register' =>   
   ($target ne 'edit') });  
     }      }
   
     if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') {      if (defined($found{'body'})) {
    $body_args{'skip_phases'}{'body'}=1;
       } elsif (!defined($found{'body'}) 
        && $env{'request.state'} eq 'construct') {
  if ($target eq 'web' || $target eq 'edit') {   if ($target eq 'web' || $target eq 'edit') {
     $page_start.=&Apache::loncommon::bodytag();      # no extra args to bodytag
     $page_start.=&Apache::lonxml::message_location();  
  }   }
     } elsif (!defined($found{'body'})) {      } elsif (!defined($found{'body'})) {
  my %add_entries;   my %add_entries;
Line 122  sub page_start { Line 124  sub page_start {
  if ($background ne '' ) {   if ($background ne '' ) {
     $add_entries{'background'} = $background;      $add_entries{'background'} = $background;
  }   }
   
  my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,   my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
        $safeeval);         $safeeval);
           if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }
  if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }  
  $page_start .=   $body_args{'bgcolor'}        = $bgcolor;
     &Apache::loncommon::bodytag(undef,undef,\%add_entries,undef,undef,   $body_args{'no_title'}       = 1;
  1,undef,undef,$bgcolor,$target,1);   $body_args{'force_register'} = 1;
    $body_args{'add_entries'}    = \%add_entries;
  if ( ($target eq 'web' || $target eq 'webgrade')      }
      && $env{'request.state'} ne 'construct') {      $body_args{'no_auto_mt_title'} = 1;
     my ($symb,undef,undef,undef,$publicuser)=      my $page_start = &Apache::loncommon::start_page($name,$extra_head,
  &Apache::lonxml::whichuser();      \%body_args);
     if ($symb eq '' && !$publicuser) {  
  my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");      if (!defined($found{'body'}) 
  $help=&mt("Browsing resource, all submissions are temporary.")."<br />";   && $env{'request.state'} ne 'construct'
  $page_start .= $help;   && ($target eq 'web' || $target eq 'webgrade')) {
     }  
    my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
    if ($symb eq '' && !$publicuser) {
       my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
       $help=&mt("Browsing resource, all submissions are temporary.")."<br />";
       $page_start .= $help;
  }   }
  $page_start .= &Apache::lonxml::message_location();  
     }      }
   
       if (!defined($found{'body'})) {
    $page_start .= &Apache::lonxml::message_location();
       }
       
     my $form_tag_start;      my $form_tag_start;
     if (!defined($found{'form'})) {      if (!defined($found{'form'})) {
  $form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';   $form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
Line 151  sub page_start { Line 162  sub page_start {
  if ($target eq 'edit') {   if ($target eq 'edit') {
     $form_tag_start.=&Apache::edit::form_change_detection();      $form_tag_start.=&Apache::edit::form_change_detection();
  }   }
  $form_tag_start.='>';   $form_tag_start.='>'."\n";
   
    my $symb=&Apache::lonnet::symbread();
    if ($symb =~ /\S/) {
       $symb=
    &HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb));
       $form_tag_start.=
    "\t".'<input type="hidden" name="symb" value="'.$symb.'" />'."\n";
    }
     }      }
     return ($page_start,$form_tag_start);      return ($page_start,$form_tag_start);
 }  }
Line 162  sub get_resource_name { Line 181  sub get_resource_name {
     if (defined($Apache::lonhomework::name)) {      if (defined($Apache::lonhomework::name)) {
  return $Apache::lonhomework::name;   return $Apache::lonhomework::name;
     }      }
     my ($symb)=&Apache::lonxml::whichuser();      my ($symb)=&Apache::lonnet::whichuser();
     my $name=&Apache::lonnet::gettitle($symb);      my $name=&Apache::lonnet::gettitle($symb);
     if ($name eq '') {      if ($name eq '') {
  $name=&Apache::lonnet::EXT('resource.title');   $name=&Apache::lonnet::EXT('resource.title');
Line 179  sub get_resource_name { Line 198  sub get_resource_name {
 sub setup_rndseed {  sub setup_rndseed {
     my ($safeeval)=@_;      my ($safeeval)=@_;
     my $rndseed;      my $rndseed;
     my ($symb)=&Apache::lonxml::whichuser();      my ($symb)=&Apache::lonnet::whichuser();
     if ($env{'request.state'} eq "construct"       if ($env{'request.state'} eq "construct" 
  || $symb eq ''    || $symb eq '' 
  || $Apache::lonhomework::type eq 'practice'   || $Apache::lonhomework::type eq 'practice'
Line 232  sub problem_edit_header { Line 251  sub problem_edit_header {
        <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />         <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />
        <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />         <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />
        <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.         <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
        &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help')         &Apache::loncommon::help_open_menu('Problem Editing Help','Problem_Editor_XML_Index',5,'Authoring',undef,undef,undef,'Problem Editing Help')
        .'</td></tr></table>'.         .'</td></tr></table>'.
        '<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';         '<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';
 }  }
Line 240  sub problem_edit_header { Line 259  sub problem_edit_header {
 sub problem_edit_footer {  sub problem_edit_footer {
     return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />      return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
     <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'.      <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'.
     &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).      &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
     "\n</form>\n".&Apache::loncommon::end_page();      "\n</form>\n".&Apache::loncommon::end_page();
 }  }
   
Line 323  Feedback Mode: Line 342  Feedback Mode:
 }  }
   
 sub initialize_storage {  sub initialize_storage {
     %Apache::lonhomework::results=();      my ($given_symb) = @_;
     %Apache::lonhomework::history=();      undef(%Apache::lonhomework::results);
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();      undef(%Apache::lonhomework::history);
       my ($symb,$courseid,$domain,$name) = 
    &Apache::lonnet::whichuser($given_symb);
       
       # anonymous users (CODEd exams) have no data
       if ($name eq 'anonymous' 
    && !defined($domain)) {
    return;
       }
   
     if ($env{'request.state'} eq 'construct'       if ($env{'request.state'} eq 'construct' 
  || $symb eq ''   || $symb eq ''
  || $Apache::lonhomework::type eq 'practice') {   || $Apache::lonhomework::type eq 'practice') {
Line 345  sub initialize_storage { Line 373  sub initialize_storage {
  %Apache::lonhomework::history=   %Apache::lonhomework::history=
     &Apache::lonnet::restore($symb,$courseid,$domain,$name);      &Apache::lonnet::restore($symb,$courseid,$domain,$name);
     }      }
   
     #ignore error conditions      #ignore error conditions
     my ($temp)=keys %Apache::lonhomework::history ;      my ($temp)=keys %Apache::lonhomework::history ;
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }      if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
Line 357  sub initialize_storage { Line 386  sub initialize_storage {
 # Will increment totals for attempts, students, and corrects  # Will increment totals for attempts, students, and corrects
 # if running user has student role.    # if running user has student role.  
 sub finalize_storage {  sub finalize_storage {
       my ($given_symb) = @_;
     my $result;      my $result;
     if (%Apache::lonhomework::results) {      if (%Apache::lonhomework::results) {
  my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results));   my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results));
  delete(@Apache::lonhomework::results{@remove});   delete(@Apache::lonhomework::results{@remove});
  my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();   my ($symb,$courseid,$domain,$name) = 
       &Apache::lonnet::whichuser($given_symb);
  if ($env{'request.state'} eq 'construct'    if ($env{'request.state'} eq 'construct' 
     || $symb eq ''      || $symb eq ''
     || $Apache::lonhomework::type eq 'practice') {      || $Apache::lonhomework::type eq 'practice') {
Line 432  sub checkout_msg { Line 463  sub checkout_msg {
                 'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',                  'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
                 'checkout'=>'Check out Exam for Viewing',                  'checkout'=>'Check out Exam for Viewing',
  'checkout?'=>'Check out Exam?');   'checkout?'=>'Check out Exam?');
       my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);      return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>  <h2>$lt{'resource'}</h2>
     <p>$lt{'id_expln'}</p>      <p>$lt{'id_expln'}</p>
 <font color="red">  <font color="red">
 <p>$lt{'warning'}</p>  <p>$lt{'warning'}</p>
 </font>  </font>
 <form name="checkout" method="POST" action="$env{'request.uri'}">  <form name="checkout" method="POST" action="$uri">
 <input type="hidden" name="doescheckout" value="yes" />  <input type="hidden" name="doescheckout" value="yes" />
 <input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />  <input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
 </form>  </form>
Line 450  sub firstaccess_msg { Line 482  sub firstaccess_msg {
     my ($map)=&Apache::lonnet::decode_symb($symb);      my ($map)=&Apache::lonnet::decode_symb($symb);
     my $foldertitle=&Apache::lonnet::gettitle($map);      my $foldertitle=&Apache::lonnet::gettitle($map);
     &Apache::lonxml::debug("map is $map title is $foldertitle");      &Apache::lonxml::debug("map is $map title is $foldertitle");
       my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);      return (<<ENDCHECKOUT);
 <h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2>  <h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2>
 <form name="markaccess" method="POST" action="$env{'request.uri'}">  <form name="markaccess" method="POST" action="$uri">
 <input type="hidden" name="markaccess" value="yes" />  <input type="hidden" name="markaccess" value="yes" />
 <input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />  <input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />
 </form>  </form>
Line 493  sub init_problem_globals { Line 526  sub init_problem_globals {
     @Apache::structuretags::whileline=();      @Apache::structuretags::whileline=();
     $Apache::lonhomework::scantronmode=0;      $Apache::lonhomework::scantronmode=0;
     undef($Apache::lonhomework::name);      undef($Apache::lonhomework::name);
       undef($Apache::lonhomework::default_type);
       undef($Apache::lonhomework::type);
 }  }
   
 sub reset_problem_globals {  sub reset_problem_globals {
Line 505  sub reset_problem_globals { Line 539  sub reset_problem_globals {
 #detect if we try to do 2 problems in one file  #detect if we try to do 2 problems in one file
 #   undef($Apache::lonhomework::parsing_a_problem);  #   undef($Apache::lonhomework::parsing_a_problem);
     undef($Apache::lonhomework::name);      undef($Apache::lonhomework::name);
       undef($Apache::lonhomework::default_type);
       undef($Apache::lonhomework::type);
       undef($Apache::lonhomework::scantronmode);
       undef($Apache::lonhomework::problemstatus);
       undef($Apache::lonhomework::ignore_response_errors);
 }  }
   
 sub set_problem_state {  sub set_problem_state {
Line 554  sub start_problem { Line 593  sub start_problem {
  $Apache::lonhomework::scantronmode=1;   $Apache::lonhomework::scantronmode=1;
     }      }
   
     &initialize_storage();  
     if ($target ne 'analyze') {      if ($target ne 'analyze') {
  if ($target eq 'web') {  
     &Apache::lonhomework::showhash(%Apache::lonhomework::history);  
  }  
         if ($env{'request.state'} eq 'construct') { &set_problem_state('0'); }          if ($env{'request.state'} eq 'construct') { &set_problem_state('0'); }
  $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');   $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
  if (($env{'request.state'} eq 'construct') &&   if (($env{'request.state'} eq 'construct') &&
Line 579  sub start_problem { Line 614  sub start_problem {
     }      }
     $Apache::lonhomework::default_type = $Apache::lonhomework::type;      $Apache::lonhomework::default_type = $Apache::lonhomework::type;
   
       &initialize_storage();
       if ($target eq 'web') {
    &Apache::lonxml::debug(" grading history ");
    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
       }
   
     #added vars to the scripting enviroment      #added vars to the scripting enviroment
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';      my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
     $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';      $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
Line 586  sub start_problem { Line 627  sub start_problem {
     my $status;      my $status;
     my $accessmsg;      my $accessmsg;
   
     #should get back a <html> or the neccesary stuff to start XML/MathML  
     my $name= &get_resource_name($parstack,$safeeval);      my $name= &get_resource_name($parstack,$safeeval);
     my ($result,$form_tag_start)=      my ($result,$form_tag_start);
  &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,      if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
     $name);   || $target eq 'edit') {
    ($result,$form_tag_start) =
       &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
    $name);
       }
   
     if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}      if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
   
     if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }      if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
Line 612  sub start_problem { Line 657  sub start_problem {
  }   }
  #handle rand seed in construction space   #handle rand seed in construction space
  my $rndseed=&setup_rndseed($safeeval);   my $rndseed=&setup_rndseed($safeeval);
  my ($symb)=&Apache::lonxml::whichuser();   my ($symb)=&Apache::lonnet::whichuser();
  if ($env{'request.state'} ne "construct" &&    if ($env{'request.state'} ne "construct" && 
     ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {      ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
     $form_tag_start.='<input type="hidden" name="rndseed" value="'.      $form_tag_start.='<input type="hidden" name="rndseed" value="'.
Line 692  sub start_problem { Line 737  sub start_problem {
  'problem');   'problem');
     }      }
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     $result.="\n $form_tag_start".      if ($status eq 'CAN_ANSWER' 
    && $slot_name ne ''
    && $Apache::lonhomework::history{'resource.0.checkedin'} eq '') {
    # unproctored slot access, self checkin
    &Apache::bridgetask::check_in('problem',undef,undef,
         $slot_name);
       }
       $result.="\n $form_tag_start \t".
       '<input type="hidden" name="submitted" value="yes" />';        '<input type="hidden" name="submitted" value="yes" />';
     # create a page header and exit      # create a page header and exit
     if ($env{'request.state'} eq "construct") {      if ($env{'request.state'} eq "construct") {
Line 852  sub end_problem { Line 904  sub end_problem {
     if ($target ne 'tex' &&      if ($target ne 'tex' &&
  $env{'form.answer_output_mode'} ne 'tex') {   $env{'form.answer_output_mode'} ne 'tex') {
  $result.="</form>";   $result.="</form>";
  $result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);   $result.= &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields());
     }      }
     if ($target eq 'web') {      if ($target eq 'web') {
  $result.=&Apache::lonxml::xmlend().'</html>';   $result.= &Apache::loncommon::end_page({'discussion' => 1});
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $endminipage = '';   my $endminipage = '';
  if (not $env{'form.problem_split'}=~/yes/) {   if (not $env{'form.problem_split'}=~/yes/) {
Line 863  sub end_problem { Line 915  sub end_problem {
  }   }
                 if ($env{'form.print_discussions'} eq 'yes') {                  if ($env{'form.print_discussions'} eq 'yes') {
     $result.=&Apache::lonxml::xmlend($target,$parser);      $result.=&Apache::lonxml::xmlend($target,$parser);
     $result=~s/<\/html>//;  
  } else {   } else {
     $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';      $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
     if (not $env{'request.symb'} =~ m/\.page_/) {      if (not $env{'request.symb'} =~ m/\.page_/) {
Line 880  sub end_problem { Line 931  sub end_problem {
  }   }
  if ($target eq 'answer' && ($env{'request.state'} eq 'construct')   if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
     && $env{'form.answer_output_mode'} ne 'tex') {      && $env{'form.answer_output_mode'} ne 'tex') {
     $result.=&Apache::lonxml::xmlend().'</html>';      $result.=&Apache::loncommon::end_page({'discussion' => 1});
                         # normally we get it from above, but in CSTR                          # normally we get it from above, but in CSTR
                         # we always show answer mode too.                          # we always show answer mode too.
  }   }
Line 948  sub end_library { Line 999  sub end_library {
  $result=&problem_edit_footer();   $result=&problem_edit_footer();
     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&      } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
      $env{'request.state'} eq "construct") {       $env{'request.state'} eq "construct") {
  $result.='</form>'.&Apache::lonxml::xmlend();   $result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
     }      }
     if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };      if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
     return $result;      return $result;
Line 1351  sub start_part { Line 1402  sub start_part {
     }      }
     if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}      if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     $result.='<a name="'.&Apache::lonnet::escape($Apache::inputtags::part).'" />';      $result.='<a name="'.&escape($Apache::inputtags::part).'" />';
  }   }
     }      }
  }   }
Line 1434  sub end_preduedate { Line 1485  sub end_preduedate {
     return '';      return '';
 }  }
   
   # In all the modes where <postanswerdate> text is 
   # displayable,  all we do is eat up the text between the start/stop
   # tags if the conditions are not right to display it.
 sub start_postanswerdate {  sub start_postanswerdate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade') {      if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade' ||
    $target eq 'tex') {
  if ($Apache::lonhomework::scantronmode ||   if ($Apache::lonhomework::scantronmode ||
     $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {      $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
     &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);      &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
  }   }
     } elsif ($target eq 'tex') {  
  &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);  
     }      }
     return '';      return '';
 }  }
Line 1549  sub end_startouttext { Line 1602  sub end_startouttext {
  ."</td>   ."</td>
 <td>".  <td>".
                  &Apache::edit::insertlist($target,$token).                   &Apache::edit::insertlist($target,$token).
    '</td><td align="right" valign="top">' .
    &Apache::loncommon::helpLatexCheatsheet().
  &Apache::edit::end_row().   &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n"                   &Apache::edit::start_spanning_row()."\n".
  . &Apache::loncommon::helpLatexCheatsheet () .  
  &Apache::edit::editfield($token->[1],$text,"",80,8,1);   &Apache::edit::editfield($token->[1],$text,"",80,8,1);
     }      }
     if ($target eq 'modified') {      if ($target eq 'modified') {
Line 1602  sub start_simpleeditbutton { Line 1656  sub start_simpleeditbutton {
         (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {          (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
         my $url=$env{'request.noversionuri'};          my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;          $url=~s/\?.*$//;
  my ($symb) = &Apache::lonxml::whichuser();   my ($symb) = &Apache::lonnet::whichuser();
  $result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.   $result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
                 '<a href="'.$url.'/smpedit?symb='.&Apache::lonnet::escape($symb).'">'.&mt('Edit').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').                  '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.&mt('Edit').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
 &Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />';  &Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />';
     }      }
     return $result;      return $result;
Removed from v.1.343  
changed lines
  Added in v.1.369

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