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

Diff for /loncom/homework/structuretags.pm between versions 1.328 and 1.332.2.1

version 1.328, 2005/12/22 22:06:54 version 1.332.2.1, 2006/03/28 18:31:37
Line 113  sub page_start { Line 113  sub page_start {
     &Apache::lonhtmlcommon::htmlareaheaders().      &Apache::lonhtmlcommon::htmlareaheaders().
     &Apache::lonhtmlcommon::spellheader().      &Apache::lonhtmlcommon::spellheader().
     &Apache::lonxml::fontsettings();           &Apache::lonxml::fontsettings();     
    my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
    if ($css_href =~ /\S/) {
       &Apache::lonxml::extlink($css_href);
       $head_tag_start = 
    '<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';
    }
  if ($target eq 'edit') {   if ($target eq 'edit') {
     $head_tag_start.=&Apache::edit::js_change_detection();      $head_tag_start.=&Apache::edit::js_change_detection();
  }   }
Line 556  sub start_problem { Line 562  sub start_problem {
     defined($env{'form.problemtype'})) {      defined($env{'form.problemtype'})) {
     $Apache::lonhomework::type=$env{'form.problemtype'};      $Apache::lonhomework::type=$env{'form.problemtype'};
  }   }
  &Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");   &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
     }      }
     if ($Apache::lonhomework::type eq '' ) {      if ($Apache::lonhomework::type eq '' ) {
  my $uri=$env{'request.uri'};   my $uri=$env{'request.uri'};
Line 658  sub start_problem { Line 664  sub start_problem {
  }   }
  $result.=$msg.'<br />';   $result.=$msg.'<br />';
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $result.='\begin{document}\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';   my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
                       : '\begin{minipage}{\textwidth}';
    $result.='\begin{document}\noindent \vskip 1 mm '.
       $startminipage.'\vskip 0 mm';
  if ($status eq 'UNAVAILABLE') {   if ($status eq 'UNAVAILABLE') {
     $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';      $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
  } else {   } else {
Line 719  sub end_problem { Line 728  sub end_problem {
   
     if (!$Apache::lonxml::metamode) {      if (!$Apache::lonxml::metamode) {
  $result = &Apache::lonxml::endredirection(); #started in &start_problem   $result = &Apache::lonxml::endredirection(); #started in &start_problem
    $Apache::lonxml::post_evaluate=0;
     }      }
   
     if ($target eq 'tex') {      if ($target eq 'tex') {
Line 1165  sub start_randomlist { Line 1175  sub start_randomlist {
     my $result;      my $result;
     if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||      if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  my $body= &Apache::lonxml::get_all_text("/randomlist",$parser,$style);   my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);
  my $b_parser= HTML::LCParser->new(\$body);   my $b_parser= HTML::LCParser->new(\$body);
  $b_parser->xml_mode(1);   $b_parser->xml_mode(1);
  $b_parser->marked_sections(1);   $b_parser->marked_sections(1);
Line 1371  sub end_part { Line 1381  sub end_part {
     my $result;      my $result;
     if (!$Apache::lonxml::metamode) {      if (!$Apache::lonxml::metamode) {
  $result = &Apache::lonxml::endredirection(); # started in &start_part   $result = &Apache::lonxml::endredirection(); # started in &start_part
    $Apache::lonxml::post_evaluate=0;
     }      }
     if ($target eq 'grade') {      if ($target eq 'grade') {
  if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&   if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
Line 1584  sub start_simpleeditbutton { Line 1595  sub start_simpleeditbutton {
     my $result='';      my $result='';
     if (($env{'form.simple_edit_button'} ne 'off') &&      if (($env{'form.simple_edit_button'} ne 'off') &&
  ($target eq 'web') &&   ($target eq 'web') &&
         (&Apache::lonnet::allowed('srm',$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::lonxml::whichuser();
Removed from v.1.328  
changed lines
  Added in v.1.332.2.1

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