[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface lonprintout.pm
raeburn
raeburn@source.lon-capa.org
Wed, 04 Aug 2010 22:23:27 -0000
raeburn Wed Aug 4 22:23:27 2010 EDT
Modified files: (Branch: version_2_9_X)
/loncom/interface lonprintout.pm
Log:
- Backport 1.583.
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.568.2.8 loncom/interface/lonprintout.pm:1.568.2.9
--- loncom/interface/lonprintout.pm:1.568.2.8 Fri Jul 30 22:47:02 2010
+++ loncom/interface/lonprintout.pm Wed Aug 4 22:23:26 2010
@@ -2,7 +2,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.568.2.8 2010/07/30 22:47:02 raeburn Exp $
+# $Id: lonprintout.pm,v 1.568.2.9 2010/08/04 22:23:26 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2925,7 +2925,9 @@
if (&Apache::loncommon::connection_aborted($r)) { last; }
}
-
+ if ($syllabus_first) {
+ $current_output =~ s/\\\\ Last updated:/Last updated:/
+ }
my $courseidinfo = &get_course();
if (defined($courseidinfo)) { $courseidinfo=' - '.$courseidinfo }
if ($usersection ne '') {$courseidinfo.=' - Sec. '.$usersection}
@@ -2936,11 +2938,8 @@
my $header_start = ($columns_in_format == 1) ? '\lhead'
: '\fancyhead[LO]';
$header_line = $header_start.'{'.$header_line.'}';
- if ($current_output=~/\\documentclass/ && (!$syllabus_first)) {
+ if ($current_output=~/\\documentclass/) {
$current_output =~ s/\\begin{document}/\\setlength{\\topmargin}{1cm} \\begin{document}\\noindent\\parbox{\\minipagewidth}{\\noindent$header_line$namepostfix}\\vskip 5 mm /;
- } elsif ($syllabus_first) {
-
- $current_output =~ s/\\\\ Last updated:/Last updated:/
} else {
my $blankpages =
'\clearpage\strut\clearpage'x$helper->{'VARS'}->{'EMPTY_PAGES'};