--- loncom/interface/lonprintout.pm 2006/07/18 18:19:51 1.464
+++ loncom/interface/lonprintout.pm 2006/07/20 03:38:52 1.465
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.464 2006/07/18 18:19:51 albertel Exp $
+# $Id: lonprintout.pm,v 1.465 2006/07/20 03:38:52 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2064,7 +2064,7 @@ sub init_perm {
$perm{'pav'}=&Apache::lonnet::allowed('pav',
$env{'request.course.id'}.'/'.$env{'request.course.sec'});
}
- $perm{'pfo'}=&Apache::lonnet::allowed('pav',$env{'request.course.id'});
+ $perm{'pfo'}=&Apache::lonnet::allowed('pfo',$env{'request.course.id'});
if (!$perm{'pfo'}) {
$perm{'pfo'}=&Apache::lonnet::allowed('pfo',
$env{'request.course.id'}.'/'.$env{'request.course.sec'});
@@ -2241,10 +2241,15 @@ sub printHelper {
$helper->declareVar('SEQUENCE');
+ # If we're in a sequence...
+ my $start_new_option;
+ if ($perm{'pav'}) {
+ $start_new_option =
+ "before selected').
+ "' variable='FINISHPAGE' />";
+ }
- # If we're in a sequence...
- my $startnew=&mt('Start new page
before selected');
if (($helper->{'VARS'}->{'construction'} ne '1') &&
$helper->{VARS}->{'postdata'} &&
@@ -2253,6 +2258,7 @@ sub printHelper {
push @{$printChoices}, [&mt('Selected Problems in folder [_1]',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];
# Allow all resources from sequence
push @{$printChoices}, [&mt('Selected Resources in folder [_1]',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];
+
my $helperFragment = <
return $isProblem;
$map
return $symbFilter;
-
+ $start_new_option
@@ -2272,7 +2278,7 @@ sub printHelper {
return $isNotMap;
$map
return $symbFilter;
-
+ $start_new_option
HELPERFRAGMENT
@@ -2295,7 +2301,7 @@ HELPERFRAGMENT
return $isProblemOrMap;
return $isNotMap;
return $symbFilter;
-
+ $start_new_option
@@ -2304,7 +2310,7 @@ HELPERFRAGMENT
PAGESIZE
return $isNotMap;
return $symbFilter;
-
+ $start_new_option
ALL_PROBLEMS
@@ -2332,7 +2338,7 @@ ALL_PROBLEMS
return $isProblem;
$map
return $symbFilter;
-
+ $start_new_option
@@ -2496,7 +2502,7 @@ CHOOSE_ANON1
return $isNotMap;
$map
return $symbFilter;
-
+ $start_new_option
@@ -2640,7 +2646,7 @@ CHOOSE_FROM_SUBDIR
return $isProblem
return '$escapedSequenceName';
return $symbFilter;
-
+ $start_new_option
CHOOSE_FROM_ANY_SEQUENCE