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

Diff for /loncom/homework/structuretags.pm between versions 1.429 and 1.434

version 1.429, 2008/08/26 03:18:29 version 1.434, 2008/11/10 11:44:54
Line 36  use Apache::File(); Line 36  use Apache::File();
 use Apache::lonmenu;  use Apache::lonmenu;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonxml;  use Apache::lonxml;
   use Apache::londefdef;
 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 lib '/home/httpd/lib/perl/';
Line 74  sub start_tex { Line 75  sub start_tex {
     if ($target ne 'edit' && $target ne 'modified') {      if ($target ne 'edit' && $target ne 'modified') {
  my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);   my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);
  if ($target eq 'tex') {   if ($target eq 'tex') {
     return $bodytext.' ';      
       # If inside a table, occurrences of \\ must be removed;
       # else the table blows up.
   
       if (&Apache::londefdef::is_inside_of($tagstack, "table")) {
    $bodytext =~ s/\\\\//g;
       }
       return $bodytext.'{}';
  }   }
     } elsif ($target eq "edit" ) {      } elsif ($target eq "edit" ) {
  my $bodytext =    my $bodytext = 
Line 148  sub page_start { Line 156  sub page_start {
   
     $extra_head .= &homework_js();      $extra_head .= &homework_js();
   
     unless ($env{'environment.wysiwygeditor'} eq 'on') {      if ($env{'environment.wysiwygeditor'} eq 'on') {
         $extra_head .= &Apache::lonhtmlcommon::dragmath_js();   $extra_head .= &Apache::lonhtmlcommon::dragmath_js("FCKEditMathPopup");
       } else {
           $extra_head .= &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
     }      }
   
     my %body_args;      my %body_args;
Line 1392  sub end_languageblock { Line 1402  sub end_languageblock {
     my $result = &Apache::lonxml::endredirection();      my $result = &Apache::lonxml::endredirection();
     my $which = &Apache::lonxml::get_param('which',$parstack,      my $which = &Apache::lonxml::get_param('which',$parstack,
    $safeeval);     $safeeval);
             foreach my $language (split(/\s*\,\s*/,$which)) {              if ($which=~/\w/) {
                unless ($language=~/\w/) { next; }                  $available_texts{$which} = $result;
                $available_texts{$language} = $result;              }
               my $otherlangs = &Apache::lonxml::get_param('other',$parstack,
                                                           $safeeval);
               foreach my $language (split(/\s*\,\s*/,$otherlangs)) {
                   if ($language=~/\w/) {
                       $available_texts{$language} = $result;
                   }
             }              }
   
  }   }
Line 1493  sub end_while { Line 1509  sub end_while {
     $return = &Apache::run::run($code,$safeeval);      $return = &Apache::run::run($code,$safeeval);
  }   }
  if ($error) {   if ($error) {
     &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running &lt;while&gt; on line').' '.$line.'</pre>');      &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running &lt;while&gt; on line').' '.$line.'</pre>');
  }   }
     } elsif ($target eq "edit") {      } elsif ($target eq "edit") {
  $result.= &Apache::edit::tag_end($target,$token,'');   $result.= &Apache::edit::tag_end($target,$token,'');
Line 1890  sub end_startouttext { Line 1906  sub end_startouttext {
     if ($target eq 'edit') {      if ($target eq 'edit') {
  my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;   my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
  $text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);   $text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
   
  $result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>   $result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>
 <td>".&mt('Delete:').  <td>".&mt('Delete:').
                  &Apache::edit::deletelist($target,$token)                   &Apache::edit::deletelist($target,$token)
  ."</td>";   ."</td>";
         unless ($env{'environment.wysiwygeditor'} eq 'on') {          unless ($env{'environment.wysiwygeditor'} eq 'on') {
             $result.='<td align="left">'      $result .= '<td align="left">'
                      .&Apache::lonhtmlcommon::dragmath_button($areaid,1)   .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
      .'</td>'   .'</td>'
                      .'<td>'   .'<td>'
                      .&Apache::edit::insertlist($target,$token)   .&Apache::edit::insertlist($target,$token)
      .'</td>';   .'</td>';
         }   }
  $result.='<td align="right" valign="top">' .   $result.='<td align="right" valign="top">' .
  &Apache::loncommon::helpLatexCheatsheet().      &Apache::loncommon::helpLatexCheatsheet().
  &Apache::edit::end_row().   &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n".                   &Apache::edit::start_spanning_row()."\n".
  &Apache::edit::editfield($token->[1],$text,"",80,8,1);   &Apache::edit::editfield($token->[1],$text,"",80,8,1);
Removed from v.1.429  
changed lines
  Added in v.1.434

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