loncom/interface/lonprintout.pm - diff

Return to lonprintout.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.464 and 1.465

version 1.464, 2006/07/18 18:19:51	version 1.465, 2006/07/20 03:38:52
Line 2064 sub init_perm {	Line 2064 sub init_perm {
$perm{'pav'}=&Apache::lonnet::allowed('pav',	$perm{'pav'}=&Apache::lonnet::allowed('pav',
$env{'request.course.id'}.'/'.$env{'request.course.sec'});	$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'}) {	if (!$perm{'pfo'}) {
$perm{'pfo'}=&Apache::lonnet::allowed('pfo',	$perm{'pfo'}=&Apache::lonnet::allowed('pfo',
$env{'request.course.id'}.'/'.$env{'request.course.sec'});	$env{'request.course.id'}.'/'.$env{'request.course.sec'});
Line 2241 sub printHelper {	Line 2241 sub printHelper {

$helper->declareVar('SEQUENCE');	$helper->declareVar('SEQUENCE');

	# If we're in a sequence...

	my $start_new_option;
	if ($perm{'pav'}) {
	$start_new_option =
	"<option text='".&mt('Start new page<br />before selected').
	"' variable='FINISHPAGE' />";
	}

# If we're in a sequence...
my $startnew=&mt('Start new page<br />before selected');
if (($helper->{'VARS'}->{'construction'} ne '1') &&	if (($helper->{'VARS'}->{'construction'} ne '1') &&

$helper->{VARS}->{'postdata'} &&	$helper->{VARS}->{'postdata'} &&
Line 2253 sub printHelper {	Line 2258 sub printHelper {
push @{$printChoices}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];	push @{$printChoices}, [&mt('Selected <b>Problems</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems', 'CHOOSE_PROBLEMS'];
# Allow all resources from sequence	# Allow all resources from sequence
push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];	push @{$printChoices}, [&mt('Selected <b>Resources</b> in folder <b><i>[_1]</i></b>',$sequenceTitle), 'map_problems_pages', 'CHOOSE_PROBLEMS_HTML'];

my $helperFragment = <<HELPERFRAGMENT;	my $helperFragment = <<HELPERFRAGMENT;
<state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">	<state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
<resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"	<resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
Line 2261 sub printHelper {	Line 2267 sub printHelper {
<filterfunc>return $isProblem;</filterfunc>	<filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>	<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>	<valuefunc>return $symbFilter;</valuefunc>
<option text='$startnew' variable='FINISHPAGE' />	$start_new_option
</resource>	</resource>
</state>	</state>

Line 2272 sub printHelper {	Line 2278 sub printHelper {
<filterfunc>return $isNotMap;</filterfunc>	<filterfunc>return $isNotMap;</filterfunc>
<mapurl>$map</mapurl>	<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>	<valuefunc>return $symbFilter;</valuefunc>
<option text='$startnew' variable='FINISHPAGE' />	$start_new_option
</resource>	</resource>
</state>	</state>
HELPERFRAGMENT	HELPERFRAGMENT
Line 2295 HELPERFRAGMENT	Line 2301 HELPERFRAGMENT
<filterfunc>return $isProblemOrMap;</filterfunc>	<filterfunc>return $isProblemOrMap;</filterfunc>
<choicefunc>return $isNotMap;</choicefunc>	<choicefunc>return $isNotMap;</choicefunc>
<valuefunc>return $symbFilter;</valuefunc>	<valuefunc>return $symbFilter;</valuefunc>
<option text='$startnew' variable='FINISHPAGE' />	$start_new_option
</resource>	</resource>
</state>	</state>
<state name="ALL_RESOURCES" title="Select Resource(s) to print">	<state name="ALL_RESOURCES" title="Select Resource(s) to print">
Line 2304 HELPERFRAGMENT	Line 2310 HELPERFRAGMENT
<nextstate>PAGESIZE</nextstate>	<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isNotMap; </filterfunc>	<filterfunc>return $isNotMap; </filterfunc>
<valuefunc>return $symbFilter;</valuefunc>	<valuefunc>return $symbFilter;</valuefunc>
<option text='$startnew' variable='FINISHPAGE' />	$start_new_option
</resource>	</resource>
</state>	</state>
ALL_PROBLEMS	ALL_PROBLEMS
Line 2332 ALL_PROBLEMS	Line 2338 ALL_PROBLEMS
<filterfunc>return $isProblem;</filterfunc>	<filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>	<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>	<valuefunc>return $symbFilter;</valuefunc>
<option text='$startnew' variable='FINISHPAGE' />	$start_new_option
</resource>	</resource>
</state>	</state>
<state name="PRINT_FORMATTING" title="How should results be printed?">	<state name="PRINT_FORMATTING" title="How should results be printed?">
Line 2496 CHOOSE_ANON1	Line 2502 CHOOSE_ANON1
<filterfunc>return $isNotMap;</filterfunc>	<filterfunc>return $isNotMap;</filterfunc>
<mapurl>$map</mapurl>	<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>	<valuefunc>return $symbFilter;</valuefunc>
<option text='$startnew' variable='FINISHPAGE' />	$start_new_option
</resource>	</resource>
</state>	</state>
<state name="PRINT_FORMATTING" title="Format of the print job">	<state name="PRINT_FORMATTING" title="Format of the print job">
Line 2640 CHOOSE_FROM_SUBDIR	Line 2646 CHOOSE_FROM_SUBDIR
<filterfunc>return $isProblem</filterfunc>	<filterfunc>return $isProblem</filterfunc>
<mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>	<mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
<valuefunc>return $symbFilter;</valuefunc>	<valuefunc>return $symbFilter;</valuefunc>
<option text='$startnew' variable='FINISHPAGE' />	$start_new_option
</resource>	</resource>
</state>	</state>
CHOOSE_FROM_ANY_SEQUENCE	CHOOSE_FROM_ANY_SEQUENCE

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.464
changed lines
	Added in v.1.465