[LON-CAPA-cvs] cvs: loncom /interface printout.pl

[albertel]

albertel		Tue Aug  3 17:18:53 2004 EDT

  Modified files:              
    /loncom/interface	printout.pl 
  Log:
  - last of BUG#3222, moved around order of elements and remove the 'Generated' text
  
  
Index: loncom/interface/printout.pl
diff -u loncom/interface/printout.pl:1.60 loncom/interface/printout.pl:1.61
--- loncom/interface/printout.pl:1.60	Thu Jul 29 15:45:41 2004
+++ loncom/interface/printout.pl	Tue Aug  3 17:18:53 2004
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # CGI-script to run LaTeX, dvips, ps2ps, ps2pdf etc.
 #
-# $Id: printout.pl,v 1.60 2004/07/29 19:45:41 albertel Exp $
+# $Id: printout.pl,v 1.61 2004/08/03 21:18:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -154,8 +154,9 @@
 
 my $ind=-1;
 my %prog_state;
+print "<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />";
 if ($adv) { %prog_state=&Apache::lonhtmlcommon::Create_PrgWin('','Print Status','Class Print Status',$number_of_files,'inline','80'); }
-my $final_statement="<a href=\"$backref\"><b>Return</b></a> to last resource.<br /><br />Generated PDF File for:<br />";
+print "<br />";
 foreach $texfile (@texfile) {
   my $status_statement='';
   my $link_text='download PDF';
@@ -168,7 +169,7 @@
   } else {
       $name=$tempo_array[0].'@'.$tempo_array[1];
   }
-  $link_text='<b>'.$name.'</b> ';
+  $link_text='<b>'.$name.'</b>';
   $status_statement.=$name;
   if ($#stud_info>0) {
       @tempo_array=split(/:/,$stud_info[-1]);
@@ -177,7 +178,7 @@
       } else {
 	  $name=$tempo_array[0].'@'.$tempo_array[1];
       }
-      $link_text.='- <b>'.$name.':</b>  ';
+      $link_text.=' - <b>'.$name.'</b>';
       $status_statement.=' -  '.$name;
   } 
   if ($adv) { &Apache::lonhtmlcommon::Update_PrgWin('',\%prog_state,'Creating PDF for '.$status_statement); }
@@ -334,8 +335,7 @@
 			     "for $status_statement now Converting to PS",
 			     \%prog_state,$new_name_file);
 	  if (-e $new_name_file) {
-	      print "<br />$final_statement ";
-	      $final_statement='';
+	      print "<br />";
 	      $new_name_file =~ m/^(.*)\./;
 	      my $ps_file = my $tempo_file = $1.'temporar.ps';
 	      my $pdf_file = $1.'.pdf';