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

Diff for /loncom/interface/lonprintout.pm between versions 1.537 and 1.540

version 1.537, 2008/08/25 10:16:27 version 1.540, 2008/09/16 02:02:31
Line 280  sub format_page_header { Line 280  sub format_page_header {
     # to \% else LaTeX will think they are comments and terminate      # to \% else LaTeX will think they are comments and terminate
     # the line.. which is bad!!!      # the line.. which is bad!!!
           
       # If the user has role author, $course and $assignment are empty so
       # there is '\\ \\ ' in the page header. That's cause a error in LaTeX
       if($format =~ /\\\\\s\\\\\s/) {
           #TODO find sensible caption for page header
           my $testPrintout = '\\\\'.&mt('Construction Space').' \\\\'.&mt('Test-Printout ');
           $format =~ s/\\\\\s\\\\\s/$testPrintout/;
       }
           
   
     return $format;      return $format;
Line 1474  ENDPART Line 1481  ENDPART
     my ($result,$selectionmade) = ('','');      my ($result,$selectionmade) = ('','');
     my $number_of_columns = 1; #used only for pages to determine the width of the cell      my $number_of_columns = 1; #used only for pages to determine the width of the cell
     my @temporary_array=split /\|/,$format_from_helper;      my @temporary_array=split /\|/,$format_from_helper;
     my ($laystyle,$numberofcolumns,$papersize)=@temporary_array;      my ($laystyle,$numberofcolumns,$papersize,$pdfFormFields)=@temporary_array;
     if ($laystyle eq 'L') {      if ($laystyle eq 'L') {
  $laystyle='album';   $laystyle='album';
     } else {      } else {
Line 1495  ENDPART Line 1502  ENDPART
     my %form;      my %form;
     $form{'grade_target'} = 'tex';      $form{'grade_target'} = 'tex';
     $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);      $form{'textwidth'}    = &get_textwidth($helper, $LaTeXwidth);
       $form{'pdfFormFields'} = $pdfFormFields;
   
     # If form.showallfoils is set, then request all foils be shown:      # If form.showallfoils is set, then request all foils be shown:
     # privilege will be enforced both by not allowing the       # privilege will be enforced both by not allowing the 
Line 2639  sub printHelper { Line 2647  sub printHelper {
     }      }
   
     # Useful filter strings      # Useful filter strings
     my $isProblem = '($res->is_problem()||$res->contains_problem) ';      my $isProblem = '($res->is_problem()||$res->contains_problem||$res->is_practice()) ';
     $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;      $isProblem .= ' && !$res->randomout()' if !$userCanSeeHidden;
     my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence()';      my $isProblemOrMap = '$res->is_problem() || $res->contains_problem() || $res->is_sequence()';
     my $isNotMap = '!$res->is_sequence()';      my $isNotMap = '!$res->is_sequence()';
Line 3386  sub render { Line 3394  sub render {
     my $PaperType=&mt('Paper type');      my $PaperType=&mt('Paper type');
     my $landscape=&mt('Landscape');      my $landscape=&mt('Landscape');
     my $portrait=&mt('Portrait');      my $portrait=&mt('Portrait');
       my $pdfFormLabel=&mt('PDF-Formfields');
       my $with=&mt('with Formfields');
       my $without=&mt('without Formfields');
     $result .= <<STATEHTML;      $result .= <<STATEHTML;
   
 <hr width="33%" />  <hr width="33%" />
Line 3394  sub render { Line 3405  sub render {
     <td align="center"><b>$PageLayout</b></td>      <td align="center"><b>$PageLayout</b></td>
     <td align="center"><b>$NumberOfColumns</b></td>      <td align="center"><b>$NumberOfColumns</b></td>
     <td align="center"><b>$PaperType</b></td>      <td align="center"><b>$PaperType</b></td>
       <td align="center"><b>$pdfFormLabel</b></td>
   </tr>    </tr>
   <tr>    <tr>
     <td>      <td>
Line 3431  STATEHTML Line 3443  STATEHTML
         }          }
         $i++;          $i++;
     }      }
     $result .= "</select></td></tr></table>";      $result .= <<HTML;
           </select>
       </td>
       <td align='center'>
           <select name='${var}.pdfFormFields'>
               <option selected value='no'>$without</option>
               <option value='yes'>$with</option>
           </select>
       </td>
     </tr></table>
   HTML
   
     return $result;      return $result;
 }  }
   
Line 3442  sub postprocess { Line 3465  sub postprocess {
     my $helper = Apache::lonhelper->getHelper();      my $helper = Apache::lonhelper->getHelper();
     $helper->{VARS}->{$var} =       $helper->{VARS}->{$var} = 
         $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .          $env{"form.$var.layout"} . '|' . $env{"form.$var.cols"} . '|' .
         $env{"form.$var.paper"};          $env{"form.$var.paper"} . '|' . $env{"form.$var.pdfFormFields"};
     return 1;      return 1;
 }  }
   
Removed from v.1.537  
changed lines
  Added in v.1.540

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