Diff for /loncom/interface/lonprintout.pm between versions 1.639 and 1.642

version 1.639, 2014/02/08 23:49:12 version 1.642, 2014/04/24 15:31:39
Line 3612  sub print_resources { Line 3612  sub print_resources {
     #      #
   
     my $syllabus_first = 0;      my $syllabus_first = 0;
     my $assessment_first = 0;  
     my $current_assignment = "";      my $current_assignment = "";
     my $assignment;      my $assignment;
     my $courseidinfo = &get_course();      my $courseidinfo = &get_course();
Line 3634  sub print_resources { Line 3633  sub print_resources {
     if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {      if ($print_incomplete && !&incomplete($username, $userdomain, $res_url)) {
  next;   next;
     }      }
             if ((!$actually_printed) && ($curresline =~ m/$LONCAPA::assess_re/)) {  
                 $assessment_first = 1;  
             }  
     $actually_printed++; # we're going to print one.      $actually_printed++; # we're going to print one.
   
     if (&Apache::lonnet::allowed('bre',$res_url)) {      if (&Apache::lonnet::allowed('bre',$res_url)) {
Line 3771  sub print_resources { Line 3767  sub print_resources {
     if ($syllabus_first) {      if ($syllabus_first) {
         $current_output =~ s/\\\\ Last updated:/Last updated:/          $current_output =~ s/\\\\ Last updated:/Last updated:/
     }      }
     my $newheader;      my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');
     unless ($assessment_first) {      my $header_line =
  my $currentassignment=&Apache::lonxml::latex_special_symbols($helper->{VARS}->{'assignment'},'header');      &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},
  my $header_line =                          $currentassignment, $courseidinfo, $fullname, $usersection);
     &format_page_header($LaTeXwidth, $parmhash{'print_header_format'},      my $header_start = ($columns_in_format == 1) ? '\lhead' : '\fancyhead[LO]';
  $currentassignment, $courseidinfo, $fullname, $usersection);      my $newheader = $header_start.'{'.$header_line.'}';
  my $header_start = ($columns_in_format == 1) ? '\lhead'  
     : '\fancyhead[LO]';  
  $newheader = $header_start.'{'.$header_line.'}';  
     }  
     if ($current_output=~/\\documentclass/) {      if ($current_output=~/\\documentclass/) {
  $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$newheader$namepostfix}\\vskip 5 mm /;   $current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$newheader$namepostfix}\\vskip 5 mm /;
   
Line 5034  sub render { Line 5026  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 $pdfFormLabel=&mt('PDF Form Fields');
     my $with=&mt('with Formfields');      my $with=&mt('with Form Fields');
     my $without=&mt('without Formfields');      my $without=&mt('without Form Fields');
           
   
     $result.='<h3>'.&mt('Layout Options').'</h3>'      $result.='<h3>'.&mt('Layout Options').'</h3>'

Removed from v.1.639  
changed lines
  Added in v.1.642


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