--- loncom/interface/lonprintout.pm 2003/05/06 20:09:49 1.154 +++ loncom/interface/lonprintout.pm 2003/05/06 20:50:04 1.155 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.154 2003/05/06 20:09:49 sakharuk Exp $ +# $Id: lonprintout.pm,v 1.155 2003/05/06 20:50:04 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1350,24 +1350,6 @@ ENDPART } my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format_new($papersize,$laystyle,$numberofcolumns); my $assignment = $ENV{'form.assignment'}; -# if ($choice eq 'Subdirectory print') { -# if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';} -# if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';} -# if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;} -# } -# if (($choice eq 'Standard LaTeX output for current document') && -# ($ENV{'form.url'}=~m|^/~|)) { -# if ($ENV{'form.layout'} eq '') {$layout = 'CAPA';} -# if ($ENV{'form.papersize'} eq '') {$papersize = 'Letter [8 1/2x11 in]';} -# if ($ENV{'form.numberofcolumns'} eq '') {$numberofcolumns = 2;} -# } - - -# my ($textwidth,$textheight,$oddoffset,$evenoffset) = &page_format($papersize,$layout,$numberofcolumns); -# if ($numberofcolumns == 1) { -# $textwidth=$ENV{'form.width'}; -# $textheight=$ENV{'form.height'}; -# } my $LaTeXwidth; if ($textwidth=~/(\d+)\s*cm/) { $LaTeXwidth = $1*10; @@ -1378,7 +1360,6 @@ ENDPART } $LaTeXwidth.=' mm'; - if ($helper->{'VARS'}->{'PRINT_TYPE'} eq 'current_document') { #-- single document - problem, page, html, xml, ... my $currentURL; @@ -1771,22 +1752,22 @@ sub printHelper { my $paramHash; # We can always print the current screen. - push @{$printChoices}, ["$resourceTitle (exactly what was on the screen)", 'current_document', 'PAGESIZE']; + push @{$printChoices}, ["Current resource $resourceTitle (prints what you just saw on the screen)", 'current_document', 'PAGESIZE']; # If we're in a sequence... if (not defined $helper->{'VARS'}->{'construction'}) { # Allow problems from sequence - push @{$printChoices}, ["Problems from $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS']; + push @{$printChoices}, ["Problem(s) from $sequenceTitle", 'map_problems', 'CHOOSE_PROBLEMS']; # Allow all resources from sequence - push @{$printChoices}, ["Problems and pages from $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML']; + push @{$printChoices}, ["Everything (problem(s), page(s), html/xml file(s)) from $sequenceTitle", 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML']; my $isProblem = '$res->is_problem();'; my $isProblemOrMap = '$res->is_problem() || $res->is_map()'; my $isNotMap = '!$res->is_map();'; my $symb = '$res->symb();'; my $helperFragment = < - Select problems to print: + + (mark them then click "next" button)
PAGESIZE return $isProblem @@ -1795,8 +1776,8 @@ sub printHelper { - - Select resources to print: + + (mark them then click "next" button)
PAGESIZE return $isNotMap; @@ -1812,15 +1793,15 @@ HELPERFRAGMENT # If the user is priviledged, allow them to print all # problems in the course, optionally for selected students if (($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) and ($helper->{VARS}->{'postdata'}=~/\/res\//)) { - push @{$printChoices}, ['All problems in course (may take a lot of time)', 'all_problems', 'ALL_PROBLEMS']; + push @{$printChoices}, ['Problems in this course', 'all_problems', 'ALL_PROBLEMS']; push @{$printChoices}, ["Problems from $sequenceTitle for selected students", 'problems_for_students', 'CHOOSE_STUDENTS']; my $isProblem = '$res->is_problem();'; my $isProblemOrMap = '$res->is_problem() || $res->is_map()'; my $symb = '$res->symb();'; &Apache::lonxml::xmlparse($r, 'helper', < - Select problems to print: + + (mark them then click "next" button)
PAGESIZE return $isProblemOrMap @@ -1829,15 +1810,16 @@ HELPERFRAGMENT - - Select the students you wish to print the problems for: + + (do not forget to select assignment itself - make another selection below)
+
Select resources for the assignment
 return $isProblem $map return $symb - How should the results be printed? +
How should the results be printed?
 Print students assignments without separations (as uniform flow) Start student assignment from new page (add pagefeed after each student) @@ -1850,12 +1832,12 @@ CHOOSE_STUDENTS # FIXME: That RE should come from a library somewhere. if (((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) { - push @{$printChoices}, ["Problems from $subdir", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR']; + push @{$printChoices}, ["Problems from current subdirectory $subdir", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR']; my $f = '$filename'; my $xmlfrag = < - Select problems you wish to print from $subdir + + (mark them then click "next" button)
PAGESIZE return '$subdir'; @@ -1872,9 +1854,9 @@ CHOOSE_FROM_SUBDIR } # Generate the first state, to select which resources get printed. - Apache::lonhelper::state->new("START", "Selecting Resources to Print"); + Apache::lonhelper::state->new("START", "What do you want to print? Make a choice."); $paramHash = Apache::lonhelper::getParamHash(); - $paramHash->{MESSAGE_TEXT} = "What do you want to print?"; + $paramHash->{MESSAGE_TEXT} = ""; Apache::lonhelper::message->new(); $paramHash = Apache::lonhelper::getParamHash(); $paramHash->{'variable'} = 'PRINT_TYPE'; @@ -1969,19 +1951,19 @@ sub render { $result .= <How should the printing be formatted?

+

What page format do you prefer?

- - + + -
LayoutColumnsPage layoutNumber of columns Paper type
- Landscape
- Portrait + Landscape
+ Portrait 		+