[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm printout.pl
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 20 Apr 2006 02:24:10 -0000
albertel Wed Apr 19 22:24:10 2006 EDT
Modified files:
/loncom/interface loncommon.pm printout.pl
Log:
- start_page in printout.pl
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.343 loncom/interface/loncommon.pm:1.344
--- loncom/interface/loncommon.pm:1.343 Wed Apr 19 22:01:30 2006
+++ loncom/interface/loncommon.pm Wed Apr 19 22:24:08 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.343 2006/04/20 02:01:30 albertel Exp $
+# $Id: loncommon.pm,v 1.344 2006/04/20 02:24:08 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -63,6 +63,7 @@
use HTML::Entities;
use Apache::lonhtmlcommon();
use Apache::loncoursedata();
+use Apache::lontexconvert();
my $readit;
@@ -3095,7 +3096,7 @@
$env{'internal.head.redirect'} = $url;
$result.=<<ADDMETA
<meta http-equiv="pragma" content="no-cache" />
-<meta HTTP-EQUIV="Refresh" CONTENT="$time; url=$url" />
+<meta http-equiv="Refresh" content="$time; url=$url" />
ADDMETA
}
if (!defined($title)) {
Index: loncom/interface/printout.pl
diff -u loncom/interface/printout.pl:1.96 loncom/interface/printout.pl:1.97
--- loncom/interface/printout.pl:1.96 Sat Apr 8 03:06:35 2006
+++ loncom/interface/printout.pl Wed Apr 19 22:24:08 2006
@@ -31,11 +31,11 @@
use File::Basename;
use IO::File;
use Image::Magick;
-use Apache::lonhtmlcommon;
+use Apache::lonhtmlcommon();
use Apache::lonnet;
-use Apache::loncommon;
+use Apache::loncommon();
use Apache::lonlocal;
-use Apache::lonmsg;
+use Apache::lonmsg();
use LONCAPA::Enrollment;
use strict;
@@ -161,8 +161,7 @@
}
&Apache::lonlocal::get_language_handle();
&Apache::loncommon::content_type(undef,'text/html');
- my $bodytag=&Apache::loncommon::bodytag('Creating PDF','','');
- print $bodytag;
+ print(&Apache::loncommon::start_page('Creating PDF'));
my $identifier = $ENV{'QUERY_STRING'};
my $texfile = $env{'cgi.'.$identifier.'.file'};
@@ -607,7 +606,7 @@
print "<br /> A <a href=\"$zipfile\">ZIP file</a> of all the PDFs.";
}
if ($advanced_role) { &Apache::lonhtmlcommon::Close_PrgWin('',\%prog_state); }
-
+print(&Apache::loncommon::end_page());
my $done;
sub REAPER {
$done=1;