--- loncom/interface/lonprintout.pm 2003/01/06 15:19:21 1.101 +++ loncom/interface/lonprintout.pm 2003/01/13 21:20:51 1.104 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.101 2003/01/06 15:19:21 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.104 2003/01/13 21:20:51 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -159,7 +159,8 @@ sub sequence_content_menu { if ($sequence[0]=~/^uploaded/) {$primary_sequence = '/'.$sequence[0];} else {$primary_sequence = '/res/'.$sequence[0];} my @master_seq = &coming_from_hash($primary_sequence,$sequence[0]); - my @master_seq_view = @master_seq; + my @master_seq_view = sort @master_seq; + @master_seq = sort @master_seq; for (my $i=0;$i<=$#master_seq_view;$i++) { $master_seq_view[$i]=~/\/([^\/]+)$/; $master_seq_view[$i]=$1; @@ -272,7 +273,7 @@ sub problem_choice_menu {
ENDMENUOUT1
my $i=0;
- foreach my $file (@list_of_files) {
+ foreach my $file (sort @list_of_files) {
$r->print('
'.
$file);
$i++;
@@ -444,8 +445,11 @@ ENDPART
my $number_of_columns = 1; #used only for pages to determine the width of the cell
my $selectionmade = '';
my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
- my $LaTeXwidth;
-
+ if ($numberofcolumns == 1) {
+ $textwidth=$ENV{'form.width'};
+ $textheight=$ENV{'form.height'};
+ }
+ my $LaTeXwidth;
if ($textwidth=~/(\d+\s*cm)/) {
$LaTeXwidth = $1*10;
} elsif ($textwidth=~/(\d+\s*mm)/) {
@@ -1188,9 +1192,14 @@ sub character_chart {
sub page_format_transformation {
- my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_;
+ my ($papersize,$layout,$numberofcolumns,$choice,$text,$assignment) = @_;
+ my ($textwidth,$textheight,$oddoffset,$evenoffset);
$assignment=~s/_/ /g;
- my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
+ if ($numberofcolumns != 1) {
+ ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns);
+ } else {
+ ($textwidth,$textheight,$oddoffset,$evenoffset) = ($ENV{'form.width'},$ENV{'form.height'},$ENV{'form.leftmargin'},$ENV{'form.leftmargin'});
+ }
my $courseidinfo = $ENV{'course.'.$ENV{'request.course.id'}.'.description'};
if ($layout eq 'CBI') {
$text =~ s/\\begin{document}/\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\topmargin}{200pt}\\setlength{\\textwidth}{$textwidth}\\setlength{\\textheight}{$textheight}\\setlength{\\parindent}{20pt}\\setlength{\\marginparwidth}{90pt}\\setlength{\\textfloatsep}{8pt plus 2\.0pt minus 4\.0pt}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm} \\begin{document}\\setcounter{page}{1}\\noindent\\parbox{\\minipagewidth}{\\noindent\\fbox{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}}} \\hfill $courseidinfo} \\vskip 5 mm /;
@@ -1198,7 +1207,7 @@ sub page_format_transformation {
if ($choice ne 'All class print') {
$text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\setlength{\\topmargin}{1cm}\\setlength{\\headheight}{1cm}\\setlength{\\headsep}{0.5cm}\\markboth{}{\\textbf{$ENV{'environment.firstname'} $ENV{'environment.lastname'}} $courseidinfo - $assignment}\\pagestyle{myheadings}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1}/;
} else {
- $text =~ s/\\begin{document}/\\setlength{\\textheight}{$textheight}\\setlength{\\oddsidemargin}{$oddoffset}\\setlength{\\evensidemargin}{$evenoffset}\\setlength{\\textwidth}{$textwidth}\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1} \\vskip 5 mm /;
+ $text =~ s/\\begin{document}/\\textheight $textheight\\oddsidemargin = $evenoffset\\evensidemargin = $evenoffset\\textwidth= $textwidth\\newlength{\\minipagewidth}\\setlength{\\minipagewidth}{\\textwidth\/\$number_of_columns-0\.2cm}\\renewcommand{\\ref}{\\keephidden\}\\begin{document}\\voffset=-1\.8cm\\setcounter{page}{1} \\vskip 5 mm /;
}
}
return $text;
@@ -1224,9 +1233,14 @@ sub details_for_menu {
my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};
my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
my ($map,$id,$resource)=split(/___/,$symbolic);
- my $name_of_sequence = $hash{'title_'.$hash{'ids_/res/'.$map}};
+ my $name_of_sequence;
+ if ($map=~/^uploaded/) {
+ $name_of_sequence = $hash{'title_'.$hash{'ids_/'.$map}};
+ } else {
+ $name_of_sequence = $hash{'title_'.$hash{'ids_/res/'.$map}};
+ }
if ($name_of_sequence =~ /^\s*$/) {
- $map =~ m|([^/]+)$|;
+ $map =~ m|([^/]+)$|;
$name_of_sequence = $1;
}
my $name_of_map = $hash{'title_'.$hash{'ids_/res/'.$ENV{'request.course.uri'}}};