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

Diff for /loncom/homework/structuretags.pm between versions 1.347 and 1.351

version 1.347, 2006/04/18 22:36:23 version 1.351, 2006/04/20 03:35:06
Line 79  sub page_start { Line 79  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,
Line 162  sub page_start { Line 161  sub page_start {
  }   }
  $form_tag_start.='>';   $form_tag_start.='>';
     }      }
   
     return ($page_start,$form_tag_start);      return ($page_start,$form_tag_start);
 }  }
   
Line 250  sub problem_edit_header { Line 248  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::lonhtmcommon::get_htmlareafields()).      &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
     "\n</form>\n".&Apache::loncommon::end_page();      "\n</form>\n".&Apache::loncommon::end_page();
 }  }
   
Line 597  sub start_problem { Line 595  sub start_problem {
     my $accessmsg;      my $accessmsg;
   
     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);   ($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 861  sub end_problem { Line 863  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::lonhtmcommon::get_htmlareafields());   $result.= &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields());
     }      }
     if ($target eq 'web') {      if ($target eq 'web') {
  $result.= &Apache::loncommon::end_page({'discussion' => 1});   $result.= &Apache::loncommon::end_page({'discussion' => 1});
Line 872  sub end_problem { Line 874  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 957  sub end_library { Line 958  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;
Removed from v.1.347  
changed lines
  Added in v.1.351

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