--- loncom/interface/lonprintout.pm 2022/06/11 15:50:09 1.680 +++ loncom/interface/lonprintout.pm 2022/06/11 18:12:28 1.682 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.680 2022/06/11 15:50:09 raeburn Exp $ +# $Id: lonprintout.pm,v 1.682 2022/06/11 18:12:28 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -4788,8 +4788,9 @@ CHOOSE_FROM_SUBDIR # another resource selector for that sequence if ((!$helper->{VARS}->{'construction'}) && (!$is_published || (($subdir eq '') && ($url eq '/adm/navmaps')))) { - push @$printChoices, [&mtn("Selected Resources from selected folder in course"), - 'select_sequences', 'CHOOSE_SEQUENCE']; + push(@$printChoices,[&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course', + '','','',''), + 'select_sequences','CHOOSE_SEQUENCE']); my $escapedSequenceName; if ($helper->{VARS}->{'SEQUENCE'} ne '') { $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'}; @@ -4804,7 +4805,9 @@ CHOOSE_FROM_SUBDIR #Escape apostrophes and backslashes for Perl $escapedSequenceName =~ s/\\/\\\\/g; $escapedSequenceName =~ s/'/\\'/g; + my $nocurrloc; if (($subdir eq '') && ($url eq '/adm/navmaps')) { + $nocurrloc = 'nocurrloc="1"'; if ($perm{'pfo'}) { push(@{$printChoices}, [&mt('Selected [_1]Problems[_2] from [_3]selected folder[_4] in course for [_5]selected people[_6]', @@ -4818,18 +4821,10 @@ CHOOSE_FROM_SUBDIR 'select_sequences_resources_for_students','CHOOSE_SEQUENCE_STUDENTS1'], [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course for [_5]CODEd assignments[_6]', '','','','','',''), - 'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2'], - [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course', - '','','',''), - 'select_sequences','CHOOSE_SEQUENCE']); + 'select_sequences_resources_for_anon','CHOOSE_SEQUENCE_ANON2']); if ($escapedSequenceName) { &generate_common_choosers($r,$helper,$escapedSequenceName,$escapedSequenceName,$isProblem,$symbFilter,$start_new_option); } - } else { - push(@{$printChoices}, - [&mt('Selected [_1]Resources[_2] from [_3]selected folder[_4] in course', - '','','',''), - 'select_sequences','CHOOSE_SEQUENCE']); } } if (($subdir eq '') && ($url eq '/adm/navmaps') && ($perm{'pfo'})) { @@ -4887,7 +4882,7 @@ CHOOSE_FROM_SUBDIR (mark desired resources then click "next" button)
+ closeallpages="1" modallink="1" $nocurrloc> PAGESIZE return $isNotMap return '$escapedSequenceName'; @@ -4911,7 +4906,7 @@ CHOOSE_FROM_ANY_SEQUENCE (mark desired resources then click "next" button)
+ closeallpages="1" modallink="1" $nocurrloc> PAGESIZE return $isNotMap return '$escapedSequenceName';