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

Diff for /loncom/interface/lonprintout.pm between versions 1.545 and 1.545.2.2

version 1.545, 2008/11/04 14:13:16 version 1.545.2.2, 2008/12/21 16:29:56
Line 1505  ENDPART Line 1505  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,$pdfFormFields)=@temporary_array;      my ($laystyle,$numberofcolumns,$papersize)=@temporary_array;
     if ($laystyle eq 'L') {      if ($laystyle eq 'L') {
  $laystyle='album';   $laystyle='album';
     } else {      } else {
Line 1526  ENDPART Line 1526  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 2487  sub get_randomly_ordered_warning { Line 2486  sub get_randomly_ordered_warning {
   
     my $postdata = $env{'form.postdata'} || $helper->{VARS}{'postdata'};      my $postdata = $env{'form.postdata'} || $helper->{VARS}{'postdata'};
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
     my $res = $navmap->getResourceByUrl($map);      if (defined($navmap)) {
     if ($res) {          my $res = $navmap->getResourceByUrl($map);
  my $func =           if ($res) {
     sub { return ($_[0]->is_map() && $_[0]->randomorder); };      my $func = 
  my @matches = $navmap->retrieveResources($res, $func,1,1,1);          sub { return ($_[0]->is_map() && $_[0]->randomorder); };
  if (@matches) {      my @matches = $navmap->retrieveResources($res, $func,1,1,1);
     $message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";      if (@matches) {
  }          $message = "Some of the items below are in folders set to be randomly ordered. However, when printing the contents of these folders, they will be printed in the original order for all students, not the randomized order.";
     }      }
     if ($message) {          }
  return '<message type="warning">'.$message.'</message>';          if ($message) {
       return '<message type="warning">'.$message.'</message>';
           }
       } else {
           &Apache::lonnet::logthis('Retrieval of resources to check for folders set to be randomly ordered failed - could not create navmap object');
           $message = "Retrieval of information about ordering of resources failed."; 
           return '<message type="warning">'.$message.'</message>';
     }      }
     return;      return;
 }  }
Line 3448  sub render { Line 3453  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.='<h3>'.&mt('Layout Options').'</h3>'      $result.='<h3>'.&mt('Layout Options').'</h3>'
             .&Apache::loncommon::start_data_table()              .&Apache::loncommon::start_data_table()
             .&Apache::loncommon::start_data_table_header_row()              .&Apache::loncommon::start_data_table_header_row()
             .'<th>'.$PageLayout.'</th>'              .'<th>'.$PageLayout.'</th>'
             .'<th>'.$NumberOfColumns.'</th>'              .'<th>'.$NumberOfColumns.'</th>'
             .'<th>'.$PaperType.'</th>'              .'<th>'.$PaperType.'</th>'
             .'<th>'.$pdfFormLabel.'</th>'  
             .&Apache::loncommon::end_data_table_header_row()              .&Apache::loncommon::end_data_table_header_row()
             .&Apache::loncommon::start_data_table_row()              .&Apache::loncommon::start_data_table_row()
     .'<td>'      .'<td>'
Line 3498  sub render { Line 3499  sub render {
     $result .= <<HTML;      $result .= <<HTML;
         </select>          </select>
     </td>      </td>
     <td align='center'>  
         <select name='${var}.pdfFormFields'>  
             <option selected value='no'>$without</option>  
             <option value='yes'>$with</option>  
         </select>  
     </td>  
 HTML  HTML
     $result.=&Apache::loncommon::end_data_table_row()      $result.=&Apache::loncommon::end_data_table_row()
             .&Apache::loncommon::end_data_table();              .&Apache::loncommon::end_data_table();
Line 3518  sub postprocess { Line 3513  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.pdfFormFields"};          $env{"form.$var.paper"};
     return 1;      return 1;
 }  }
   
Removed from v.1.545  
changed lines
  Added in v.1.545.2.2

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