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

Diff for /loncom/interface/lonprintout.pm between versions 1.536.2.3 and 1.548

version 1.536.2.3, 2008/10/02 17:40:34 version 1.548, 2009/01/23 16:00:46
Line 229  sub printf_style_subst { Line 229  sub printf_style_subst {
 #     %a    - Assignment name.  #     %a    - Assignment name.
 #     %c    - Course name.  #     %c    - Course name.
 #     %n    - Student name.  #     %n    - Student name.
   #     %s    - The section if it is supplied.
 #  #
 sub format_page_header {  sub format_page_header {
     my ($width, $format, $assignment, $course, $student) = @_;      my ($width, $format, $assignment, $course, $student, $section) = @_;
   
           
     $width = &recalcto_mm($width); # Get width in mm.      $width = &recalcto_mm($width); # Get width in mm.
     #  Default format?      #  Default format?
Line 248  sub format_page_header { Line 250  sub format_page_header {
  # - Allow the assignment to be 2 lines (wrapped).   # - Allow the assignment to be 2 lines (wrapped).
  #   #
  my $chars_per_line = $width/2; # Character/textline.   my $chars_per_line = $width/2; # Character/textline.
   
   
   
  my $firstline = "$student $course";   my $name_length    = int($chars_per_line *3 /4);
  if (length($firstline) > $chars_per_line) {   my $sec_length     = int($chars_per_line / 5);
     my $lastchar = $chars_per_line - length($student) - 1;  
     if ($lastchar > 0) {   $format  = "%$name_length".'n';
  $course = substr($course, 0, $lastchar);  
     } else { # Nothing left of course:   if ($section) {
  $course = '';      $format .=  ' - Sec: '."%$sec_length".'s';
     }  
  }  
  if (length($assignment) > $chars_per_line) {  
     $assignment = substr($assignment, 0, $chars_per_line);  
  }   }
   
  $format =  "\\textbf{$student} $course \\hfill \\thepage \\\\ \\textit{$assignment}";  
   
     } else {  
  # An open question is how to handle long user formatted page headers...  
  # A possible future is to support e.g. %na so that the user can control  
  # the truncation of the elements that can appear in the header.  
  #  
  $format =  &printf_style_subst("a", $format, $assignment);  
  $format =  &printf_style_subst("c", $format, $course);  
  $format =  &printf_style_subst("n", $format, $student);  
   
  # If the user put %'s in the format string, they  must be escaped  
  # to \% else LaTeX will think they are comments and terminate  
  # the line.. which is bad!!!  
   
    $format .= '\\\\%c \\\\ %a';
           
   
     }      }
       # An open question is how to handle long user formatted page headers...
       # A possible future is to support e.g. %na so that the user can control
       # the truncation of the elements that can appear in the header.
       #
       $format =  &printf_style_subst("a", $format, $assignment);
       $format =  &printf_style_subst("c", $format, $course);
       $format =  &printf_style_subst("n", $format, $student);
       $format =  &printf_style_subst("s", $format, $section);
       
       
       # If the user put %'s in the format string, they  must be escaped
       # to \% else LaTeX will think they are comments and terminate
       # 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 978  sub get_course { Line 985  sub get_course {
     my $courseidinfo;      my $courseidinfo;
     if (defined($env{'request.course.id'})) {      if (defined($env{'request.course.id'})) {
  $courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');   $courseidinfo = &Apache::lonxml::latex_special_symbols(&unescape($env{'course.'.$env{'request.course.id'}.'.description'}),'header');
    my $sec = $env{'request.course.sec'};
       
     }      }
     return $courseidinfo;      return $courseidinfo;
 }  }
Line 1000  sub page_format_transformation { Line 1009  sub page_format_transformation {
   
     my $name = &get_name();      my $name = &get_name();
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }  
     my $header_text  = $parmhash{'print_header_format'};      my $header_text  = $parmhash{'print_header_format'};
     $header_text     = &format_page_header($textwidth, $header_text, $assignment,      $header_text     = &format_page_header($textwidth, $header_text, $assignment,
    $courseidinfo, $name);     $courseidinfo, $name);
Line 1273  sub recently_generated { Line 1281  sub recently_generated {
     $cuid,$cgid,$crdev,$csize,      $cuid,$cgid,$crdev,$csize,
     $catime,$cmtime,$cctime,      $catime,$cmtime,$cctime,
     $cblksize,$cblocks)=stat($prtspool.'/'.$filename);      $cblksize,$cblocks)=stat($prtspool.'/'.$filename);
  my $result="<a href='/prtspool/$filename'>".          my $ext_text = 'pdf' ? &mt('PDF File'):&mt('Zip File');
     &mt('Generated [_1] ([_2] bytes)',   my $result=&Apache::loncommon::start_data_table_row()
  &Apache::lonlocal::locallocaltime($cctime),$csize).                    .'<td>'
  '</a><br />';                    .'<a href="/prtspool/'.$filename.'">'.$ext_text.'</a>'
                     .'</td>'
                     .'<td>'.&Apache::lonlocal::locallocaltime($cctime).'</td>'
                     .'<td align="right">'.$csize.'</td>'
                     .&Apache::loncommon::end_data_table_row();
  if ($ext eq 'pdf') { $pdf_result .= $result; }   if ($ext eq 'pdf') { $pdf_result .= $result; }
  if ($ext eq 'zip') { $zip_result .= $result; }   if ($ext eq 'zip') { $zip_result .= $result; }
     }      }
       if ($zip_result || $pdf_result) {
           $r->print('<hr />');
       }
     if ($zip_result) {      if ($zip_result) {
  $r->print('<h4>'.&mt('Recently generated printout zip files')."</h4>\n"   $r->print('<h3>'.&mt('Recently generated printout zip files')."</h3>\n"
   .$zip_result);                    .&Apache::loncommon::start_data_table()
                     .&Apache::loncommon::start_data_table_header_row()
                     .'<th>'.&mt('Download').'</th>'
                     .'<th>'.&mt('Creation Date').'</th>'
                     .'<th>'.&mt('File Size (Bytes)').'</th>'
                     .&Apache::loncommon::end_data_table_header_row()
                     .$zip_result
                     .&Apache::loncommon::end_data_table()
           );
     }      }
     if ($pdf_result) {      if ($pdf_result) {
  $r->print('<h4>'.&mt('Recently generated printouts')."</h4>\n"   $r->print('<h3>'.&mt('Recently generated printouts')."</h3>\n"
   .$pdf_result);                    .&Apache::loncommon::start_data_table()
                     .&Apache::loncommon::start_data_table_header_row()
                     .'<th>'.&mt('Download').'</th>'
                     .'<th>'.&mt('Creation Date').'</th>'
                     .'<th>'.&mt('File Size (Bytes)').'</th>'
                     .&Apache::loncommon::end_data_table_header_row()
                     .$pdf_result
                     .&Apache::loncommon::end_data_table()
           );
     }      }
 }  }
   
Line 1474  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)=@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 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 1780  ENDPART Line 1812  ENDPART
  if (($selectionmade == 4) and ($assignment ne $prevassignment)) {   if (($selectionmade == 4) and ($assignment ne $prevassignment)) {
     my $name = &get_name();      my $name = &get_name();
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }  
     $prevassignment=$assignment;      $prevassignment=$assignment;
     my $header_text = $parmhash{'print_header_format'};      my $header_text = $parmhash{'print_header_format'};
     $header_text    = &format_page_header($textwidth, $header_text,      $header_text    = &format_page_header($textwidth, $header_text,
Line 2365  sub print_resources { Line 2396  sub print_resources {
  if (&Apache::loncommon::connection_aborted($r)) { last; }   if (&Apache::loncommon::connection_aborted($r)) { last; }
     }      }
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
     if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }  
     if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}  
     my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');      my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     my $header_line =      my $header_line =
  &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},   &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
     $currentassignment, $courseidinfo, $fullname);      $currentassignment, $courseidinfo, $fullname, $usersection);
     my $header_start = ($columns_in_format == 1) ? '\lhead'      my $header_start = ($columns_in_format == 1) ? '\lhead'
                                          : '\fancyhead[LO]';                                           : '\fancyhead[LO]';
     $header_line = $header_start.'{'.$header_line.'}';      $header_line = $header_start.'{'.$header_line.'}';
Line 2458  sub get_randomly_ordered_warning { Line 2487  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 2667  sub printHelper { Line 2702  sub printHelper {
  $helper->{VARS}->{'postdata'} &&   $helper->{VARS}->{'postdata'} &&
  $helper->{VARS}->{'assignment'}) {   $helper->{VARS}->{'assignment'}) {
         # Allow problems from sequence          # Allow problems from sequence
         push @{$printChoices}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];          push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 'map_problems', 'CHOOSE_PROBLEMS'];
         # Allow all resources from sequence          # Allow all resources from sequence
         push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];          push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>'), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
   
         my $helperFragment = <<HELPERFRAGMENT;          my $helperFragment = <<HELPERFRAGMENT;
   <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">    <state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
Line 2698  HELPERFRAGMENT Line 2733  HELPERFRAGMENT
  &Apache::lonxml::xmlparse($r, 'helper', $helperFragment);   &Apache::lonxml::xmlparse($r, 'helper', $helperFragment);
     }      }
   
     # If the user has pfo (print for otheres) allow them to print all       # If the user has pfo (print for others) allow them to print all 
     # problems and resources  in the entier course, optionally for selected students      # problems and resources  in the entire course, optionally for selected students
     if ($perm{'pfo'} &&  !$is_published  &&      if ($perm{'pfo'} &&  !$is_published  &&
         ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {           ($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) { 
   
Line 2749  HELPERFRAGMENT Line 2784  HELPERFRAGMENT
 ALL_PROBLEMS  ALL_PROBLEMS
   
  if ($helper->{VARS}->{'assignment'}) {   if ($helper->{VARS}->{'assignment'}) {
     push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected people</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];      push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'problems_for_students', 'CHOOSE_STUDENTS'];
     push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];      push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'problems_for_anon', 'CHOOSE_ANON1'];
  }   }
   
  my $randomly_ordered_warning =    my $randomly_ordered_warning = 
Line 2928  CHOOSE_ANON1 Line 2963  CHOOSE_ANON1
   
   
  if ($helper->{VARS}->{'assignment'}) {   if ($helper->{VARS}->{'assignment'}) {
     push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected people</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];      push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]selected people[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_students', 'CHOOSE_STUDENTS1'];
     push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>CODEd assignments</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];      push @{$printChoices}, [&mt('Selected [_1]Resources[_2] from folder [_3] for [_4]CODEd assignments[_5]','<b>','</b>','<b><i>'.$sequenceTitle.'</i></b>','<b>','</b>'), 'resources_for_anon', 'CHOOSE_ANON2'];
  }   }
           
   
Line 3052  CHOOSE_ANON2 Line 3087  CHOOSE_ANON2
  ) {   ) {
   
  my $pretty_dir = &Apache::lonnet::hreflocation($subdir);   my $pretty_dir = &Apache::lonnet::hreflocation($subdir);
         push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$pretty_dir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];          push @{$printChoices}, [&mt('Selected [_1]Problems[_2] from current subdirectory [_3]','<b>','</b>','<b><i>'.$pretty_dir.'</i></b>','<b>','</b>'), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
         my $xmlfrag = <<CHOOSE_FROM_SUBDIR;          my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
   <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$pretty_dir</small></b> to print">    <state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$pretty_dir</small></b> to print">
   
Line 3122  CHOOSE_FROM_ANY_SEQUENCE Line 3157  CHOOSE_FROM_ANY_SEQUENCE
   
     if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or       if (($perm{'pav'} and &Apache::lonnet::allowed('vgr',$env{'request.course.id'})) or 
  ($helper->{VARS}->{'construction'} eq '1')) {   ($helper->{VARS}->{'construction'} eq '1')) {
  addMessage("<hr width='33%' /><table><tr><td align='right'>".   &addMessage('<br />'
                    '<label for="ANSWER_TYPE_forminput">'.                     .'<h3>'.&mt('Print Options').'</h3>'
                    &mt('Print').                     .&Apache::lonhtmlcommon::start_pick_box()
                    "</label>: </td><td>");  #                  .&Apache::lonhtmlcommon::row_headline()
   #                  .'<h3>'.&mt('Print Options').'</h3>'
   #                  .&Apache::lonhtmlcommon::row_closure()
                      .&Apache::lonhtmlcommon::row_title(
                          '<label for="ANSWER_TYPE_forminput">'
                         .&mt('Print Answers')
                         .'</label>'
                       )
           );
         $paramHash = Apache::lonhelper::getParamHash();          $paramHash = Apache::lonhelper::getParamHash();
  $paramHash->{'variable'} = 'ANSWER_TYPE';      $paramHash->{'variable'} = 'ANSWER_TYPE';   
  $helper->declareVar('ANSWER_TYPE');            $helper->declareVar('ANSWER_TYPE');         
Line 3135  CHOOSE_FROM_ANY_SEQUENCE Line 3178  CHOOSE_FROM_ANY_SEQUENCE
                                    ['Only Answers', 'only']                                     ['Only Answers', 'only']
                                 ];                                  ];
         Apache::lonhelper::dropdown->new();          Apache::lonhelper::dropdown->new();
  addMessage("</td></tr>");   &addMessage(&Apache::lonhtmlcommon::row_closure());
  $startedTable = 1;   $startedTable = 1;
     }      }
   
Line 3147  CHOOSE_FROM_ANY_SEQUENCE Line 3190  CHOOSE_FROM_ANY_SEQUENCE
                        "</label>: </td><td>");                         "</label>: </td><td>");
     $startedTable = 1;      $startedTable = 1;
  } else {   } else {
     addMessage("<tr><td align='right'>".      &addMessage(&Apache::lonhtmlcommon::row_title(
                        '<label for="LATEX_TYPE_forminput">'.                             '<label for="LATEX_TYPE_forminput">'
                         &mt('LaTeX mode').                             .&mt('LaTeX mode')
                        "</label>: </td><td>");                             .'</label>'
                           )
               );
  }   }
         $paramHash = Apache::lonhelper::getParamHash();          $paramHash = Apache::lonhelper::getParamHash();
  $paramHash->{'variable'} = 'LATEX_TYPE';      $paramHash->{'variable'} = 'LATEX_TYPE';   
Line 3166  CHOOSE_FROM_ANY_SEQUENCE Line 3211  CHOOSE_FROM_ANY_SEQUENCE
  }   }
         Apache::lonhelper::dropdown->new();          Apache::lonhelper::dropdown->new();
     
  addMessage("</td></tr><tr><td align='right'>".   &addMessage(&Apache::lonhtmlcommon::row_closure()
                    '<label for="TABLE_CONTENTS_forminput">'.                     .&Apache::lonhtmlcommon::row_title(
                    &mt('Print Table of Contents').                          '<label for="TABLE_CONTENTS_forminput">'
                    "</label>: </td><td>");                         .&mt('Print Table of Contents')
                          .'</label>'
                       )
           );
         $paramHash = Apache::lonhelper::getParamHash();          $paramHash = Apache::lonhelper::getParamHash();
  $paramHash->{'variable'} = 'TABLE_CONTENTS';      $paramHash->{'variable'} = 'TABLE_CONTENTS';   
  $helper->declareVar('TABLE_CONTENTS');            $helper->declareVar('TABLE_CONTENTS');         
Line 3177  CHOOSE_FROM_ANY_SEQUENCE Line 3225  CHOOSE_FROM_ANY_SEQUENCE
                                    ['No', 'no'],                                     ['No', 'no'],
                                    ['Yes', 'yes'] ];                                     ['Yes', 'yes'] ];
         Apache::lonhelper::dropdown->new();          Apache::lonhelper::dropdown->new();
  addMessage("</td></tr>");   &addMessage(&Apache::lonhtmlcommon::row_closure());
                   
  if (not $helper->{VARS}->{'construction'}) {   if (not $helper->{VARS}->{'construction'}) {
     addMessage("<tr><td align='right'>".      &addMessage(&Apache::lonhtmlcommon::row_title(
                        '<label for="TABLE_INDEX_forminput">'.                              '<label for="TABLE_INDEX_forminput">'
                        &mt('Print Index').                             .&mt('Print Index')
                        "</label>: </td><td>");                             .'</label>'
                           )
               );
     $paramHash = Apache::lonhelper::getParamHash();      $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{'variable'} = 'TABLE_INDEX';         $paramHash->{'variable'} = 'TABLE_INDEX';   
     $helper->declareVar('TABLE_INDEX');               $helper->declareVar('TABLE_INDEX');         
Line 3191  CHOOSE_FROM_ANY_SEQUENCE Line 3241  CHOOSE_FROM_ANY_SEQUENCE
      ['No', 'no'],       ['No', 'no'],
      ['Yes', 'yes'] ];       ['Yes', 'yes'] ];
     Apache::lonhelper::dropdown->new();      Apache::lonhelper::dropdown->new();
     addMessage("</td></tr>");              &addMessage(&Apache::lonhtmlcommon::row_closure());
     addMessage("<tr><td align='right'>".              &addMessage(&Apache::lonhtmlcommon::row_title(
                        '<label for="PRINT_DISCUSSIONS_forminput">'.                              '<label for="PRINT_DISCUSSIONS_forminput">'
                        &mt('Print Discussions').                             .&mt('Print Discussions')
                        "</label>: </td><td>");                             .'</label>'
                           )
               );
     $paramHash = Apache::lonhelper::getParamHash();      $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{'variable'} = 'PRINT_DISCUSSIONS';         $paramHash->{'variable'} = 'PRINT_DISCUSSIONS';   
     $helper->declareVar('PRINT_DISCUSSIONS');               $helper->declareVar('PRINT_DISCUSSIONS');         
Line 3203  CHOOSE_FROM_ANY_SEQUENCE Line 3255  CHOOSE_FROM_ANY_SEQUENCE
      ['No', 'no'],       ['No', 'no'],
      ['Yes', 'yes'] ];       ['Yes', 'yes'] ];
     Apache::lonhelper::dropdown->new();      Apache::lonhelper::dropdown->new();
     addMessage("</td></tr>");              &addMessage(&Apache::lonhtmlcommon::row_closure());
   
     # Prompt for printing annotations too.      # Prompt for printing annotations too.
   
     addMessage("<tr><td align='right'>".      &addMessage(&Apache::lonhtmlcommon::row_title(
        '<label for="PRINT_ANNOTATIONS_forminput">'.                              '<label for="PRINT_ANNOTATIONS_forminput">'
        &mt('Print Annotations').                             .&mt('Print Annotations')
        "</label>:</td><td>");                             .'</label>'
                           )
               );
     $paramHash = Apache::lonhelper::getParamHash();      $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{'variable'} = "PRINT_ANNOTATIONS";      $paramHash->{'variable'} = "PRINT_ANNOTATIONS";
     $helper->declareVar("PRINT_ANNOTATIONS");      $helper->declareVar("PRINT_ANNOTATIONS");
Line 3218  CHOOSE_FROM_ANY_SEQUENCE Line 3272  CHOOSE_FROM_ANY_SEQUENCE
      ['No', 'no'],       ['No', 'no'],
      ['Yes', 'yes']];       ['Yes', 'yes']];
     Apache::lonhelper::dropdown->new();      Apache::lonhelper::dropdown->new();
     addMessage("</td></tr>");              &addMessage(&Apache::lonhtmlcommon::row_closure());
   
     addMessage("<tr><td align = 'right'>  </td><td>");              &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Foils')));
     $paramHash = Apache::lonhelper::getParamHash();      $paramHash = Apache::lonhelper::getParamHash();
     $paramHash->{'multichoice'} = "true";      $paramHash->{'multichoice'} = "true";
     $paramHash->{'allowempty'}  = "true";      $paramHash->{'allowempty'}  = "true";
     $paramHash->{'variable'}   = "showallfoils";      $paramHash->{'variable'}   = "showallfoils";
     $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];      $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];
     Apache::lonhelper::choices->new();      Apache::lonhelper::choices->new();
     addMessage("</td></tr>");              &addMessage(&Apache::lonhtmlcommon::row_closure(1));
  }   }
   
  if ($helper->{'VARS'}->{'construction'}) {    if ($helper->{'VARS'}->{'construction'}) { 
Line 3236  CHOOSE_FROM_ANY_SEQUENCE Line 3290  CHOOSE_FROM_ANY_SEQUENCE
             my $stylefiletext=&mt("Use style file");              my $stylefiletext=&mt("Use style file");
             my $selectfiletext=&mt("Select style file");              my $selectfiletext=&mt("Select style file");
   
     my $xmlfrag .= <<"RNDSEED";      my $xmlfrag .= '<message>'
     <message><tr><td align='right'>              .&Apache::lonhtmlcommon::row_title('<label for="curseed_forminput">'
             <label for="curseed_forminput">$randseedtext</label>:                                                .$randseedtext
             </td><td></message>                                                .'</label>'
     <string variable="curseed" size="15" maxlength="15">               )
  <defaultvalue>              .'</message>
             return $helper->{VARS}->{'curseed'};              <string variable="curseed" size="15" maxlength="15">
         </defaultvalue>                  <defaultvalue>
     </string>                     return '.$helper->{VARS}->{'curseed'}.';
      <message></td></tr><tr><td align="right">                  </defaultvalue>'
              <label for="style_file">$stylefiletext</label>:              .'</string>'
              </td><td></message>              .'<message>'
               .&Apache::lonhtmlcommon::row_closure()
               .&Apache::lonhtmlcommon::row_title('<label for="style_file">'
                                                 .$stylefiletext
                                                 .'</label>'
                )
               .'</message>
              <string variable="style_file" size="40">               <string variable="style_file" size="40">
  <defaultvalue>                  <defaultvalue>
             return $stylevalue;                      return '.$stylevalue.';
         </defaultvalue>                  </defaultvalue>
              </string><message>&nbsp; <a href="javascript:openbrowser('helpform','style_file_forminput','sty')">$selectfiletext</a> </td></tr><tr><td></td><td align="left"></message>               </string><message>&nbsp;'
   .qq|<a href="javascript:openbrowser('helpform','style_file_forminput','sty')">|
   .$selectfiletext.'</a>'
               .&Apache::lonhtmlcommon::row_closure()
               .&Apache::lonhtmlcommon::row_title(&mt('Show all foils'))
               .'</message>
      <choices allowempty="1" multichoice="true" variable="showallfoils">       <choices allowempty="1" multichoice="true" variable="showallfoils">
                 <choice computer="1">Show all foils</choice>                  <choice computer="1">&nbsp;</choice>
              </choices>               </choices>'
      <message></td></tr></message>      .'<message>'
 RNDSEED              .&Apache::lonhtmlcommon::row_closure()
               .'</message>';
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);              &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
   
   
     addMessage("<tr><td>Problem Type:</td><td>");              &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Problem Type')));
     #      #
     # Initial value from construction space:      # Initial value from construction space:
     #      #
Line 3280  RNDSEED Line 3346  RNDSEED
 PROBTYPE  PROBTYPE
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);              &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
           
     addMessage("</td></tr>");               &addMessage(&Apache::lonhtmlcommon::row_closure(1));
   
  }           }
     }      }
   
   
   
   
     if ($startedTable) {      if ($startedTable) {
  addMessage("</table>");          &addMessage(&Apache::lonhtmlcommon::end_pick_box());
     }      }
   
     Apache::lonprintout::page_format_state->new("FORMAT");      Apache::lonprintout::page_format_state->new("FORMAT");
Line 3388  sub render { Line 3454  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');
     $result .= <<STATEHTML;      my $pdfFormLabel=&mt('PDF-Formfields');
       my $with=&mt('with Formfields');
       my $without=&mt('without Formfields');
       $result.='<h3>'.&mt('Layout Options').'</h3>'
               .&Apache::loncommon::start_data_table()
               .&Apache::loncommon::start_data_table_header_row()
               .'<th>'.$PageLayout.'</th>'
               .'<th>'.$NumberOfColumns.'</th>'
               .'<th>'.$PaperType.'</th>'
               .'<th>'.$pdfFormLabel.'</th>'
               .&Apache::loncommon::end_data_table_header_row()
               .&Apache::loncommon::start_data_table_row()
       .'<td>'
       .'<label><input type="radio" name="'.${var}.'.layout" value="L" />'.$landscape.'</label><br />'
       .'<label><input type="radio" name="'.${var}.'.layout" value="P" checked="checked" />'.$portrait.'</label>'
       .'</td>';
   
 <hr width="33%" />      $result.='<td align="center">'
 <table cellpadding="3">              .'<select name="'.${var}.'.cols">';
   <tr>  
     <td align="center"><b>$PageLayout</b></td>  
     <td align="center"><b>$NumberOfColumns</b></td>  
     <td align="center"><b>$PaperType</b></td>  
   </tr>  
   <tr>  
     <td>  
       <label><input type="radio" name="${var}.layout" value="L" /> $landscape </label><br />  
       <label><input type="radio" name="${var}.layout" value="P" checked='1'  /> $portrait </label>  
     </td>  
     <td align="center">  
       <select name="${var}.cols">  
 STATEHTML  
   
     my $i;      my $i;
     for ($i = 1; $i <= $maxColumns; $i++) {      for ($i = 1; $i <= $maxColumns; $i++) {
Line 3433  STATEHTML Line 3501  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>
   HTML
       $result.=&Apache::loncommon::end_data_table_row()
               .&Apache::loncommon::end_data_table();
   
     return $result;      return $result;
 }  }
   
Line 3444  sub postprocess { Line 3524  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;
 }  }
   
Line 3556  sub render { Line 3636  sub render {
     }  else {      }  else {
  $size{'margin'} += 2.54;   $size{'margin'} += 2.54;
     }      }
     my %text = ('format' => 'How should each column be formatted?',      my %lt = &Apache::lonlocal::texthash(
  'width'  => 'Width:',          'format' => 'How should each column be formatted?',
  'height' => 'Height:',          'width'  => 'Width',
  'margin' => 'Left Margin:',);          'height' => 'Height',
     %text = &Apache::lonlocal::texthash(%text);          'margin' => 'Left Margin'
       );
     $result .= <<ELEMENTHTML;  
       $result .= '<p>'.$lt{'format'}.'</p>'
 <p>$text{'format'}</p>                .&Apache::lonhtmlcommon::start_pick_box()
                 .&Apache::lonhtmlcommon::row_title($lt{'width'})
 <table cellpadding='3'>                .'<input type="text" name="'.$var.'.width" value="'.$size{'width'}.'" size="4" />'
   <tr>                .'<select name="'.$var.'.widthunit">'
     <td align='right'><b>$text{'width'}</b></td>                .$size{'width_options'}
     <td align='left'><input type='text' name='$var.width' value="$size{'width'}" size='4' /></td>                .'</select>'
     <td align='left'>                .&Apache::lonhtmlcommon::row_closure()
       <select name='$var.widthunit'>                .&Apache::lonhtmlcommon::row_title($lt{'height'})
       $size{'width_options'}                .'<input type="text" name="'.$var.'.height" value="'.$size{'height'}.'" size="4" />'
       </select>                .'<select name="'.$var.'.heightunit">'
     </td>                .$size{'height_options'}
   </tr>                .'</select>'
   <tr>                .&Apache::lonhtmlcommon::row_closure()
     <td align='right'><b>$text{'height'}</b></td>                .&Apache::lonhtmlcommon::row_title($lt{'margin'})
     <td align='left'><input type='text' name="$var.height" value="$size{'height'}" size='4' /></td>                .'<input type="text" name="'.$var.'.lmargin" value="'.$size{'margin'}.'" size="4" />'
     <td align='left'>                .'<select name="'.$var.'.lmarginunit">'
       <select name='$var.heightunit'>                .$size{'margin_options'}
       $size{'height_options'}                .'</select>'
       </select>                .&Apache::lonhtmlcommon::row_closure(1)
     </td>                .&Apache::lonhtmlcommon::end_pick_box();
   </tr>      # <p>Hint: Some instructors like to leave scratch space for the student by
   <tr>      # making the width much smaller than the width of the page.</p>
     <td align='right'><b>$text{'margin'}</b></td>  
     <td align='left'><input type='text' name='$var.lmargin' value="$size{'margin'}" size='4' /></td>  
     <td align='left'>  
       <select name='$var.lmarginunit'>  
       $size{'margin_options'}  
       </select>  
     </td>  
   </tr>  
 </table>  
   
 <!--<p>Hint: Some instructors like to leave scratch space for the student by  
 making the width much smaller than the width of the page.</p>-->  
   
 ELEMENTHTML  
   
     return $result;      return $result;
 }  }
Removed from v.1.536.2.3  
changed lines
  Added in v.1.548

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