[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm
www
lon-capa-cvs@mail.lon-capa.org
Fri, 14 Jul 2006 21:03:49 -0000
This is a MIME encoded message
--www1152911029
Content-Type: text/plain
www Fri Jul 14 17:03:49 2006 EDT
Modified files:
/loncom/interface lonprintout.pm
Log:
Wording per usability meeting
--www1152911029
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20060714170349.txt"
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.457 loncom/interface/lonprintout.pm:1.458
--- loncom/interface/lonprintout.pm:1.457 Tue Jul 11 06:12:44 2006
+++ loncom/interface/lonprintout.pm Fri Jul 14 17:03:47 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.457 2006/07/11 10:12:44 foxr Exp $
+# $Id: lonprintout.pm,v 1.458 2006/07/14 21:03:47 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2180,7 +2180,7 @@
my $paramHash;
if ($resourceTitle) {
- push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('what you just saw on the screen').")", 'current_document', 'PAGESIZE'];
+ push @{$printChoices}, ["<b><i>$resourceTitle</i></b> (".&mt('the resource you just saw on the screen').")", 'current_document', 'PAGESIZE'];
}
# Useful filter strings
@@ -2198,37 +2198,35 @@
# If we're in a sequence...
+ my $startnew=&mt('Start new page<br />before selected');
if (($helper->{'VARS'}->{'construction'} ne '1') &&
$helper->{VARS}->{'postdata'} &&
$helper->{VARS}->{'assignment'}) {
# Allow problems from sequence
- push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", '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
- push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('in')." <b><i>$sequenceTitle</i></b>", '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;
<state name="CHOOSE_PROBLEMS" title="Select Problem(s) to print">
- <message>(mark them then click "next" button) <br /></message>
<resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
closeallpages="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='Newpage' variable='FINISHPAGE' />
+ <option text='$startnew' variable='FINISHPAGE' />
</resource>
</state>
<state name="CHOOSE_PROBLEMS_HTML" title="Select Resource(s) to print">
- <message>(mark them then click "next" button) <br /></message>
<resource variable="RESOURCES" multichoice="1" toponly='1' addstatus="1"
closeallpages="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isNotMap;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='Newpage' variable='FINISHPAGE' />
+ <option text='$startnew' variable='FINISHPAGE' />
</resource>
</state>
HELPERFRAGMENT
@@ -2241,35 +2239,33 @@
if ($perm{'pfo'} &&
($helper->{VARS}->{'postdata'}=~/\/res\// || $helper->{VARS}->{'postdata'}=~/\/(syllabus|smppg|aboutme|bulletinboard)$/)) {
- push @{$printChoices}, ['<b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
- push @{$printChoices}, ['<b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
+ push @{$printChoices}, ['Selected <b>Problems</b> from <b>entire course</b>', 'all_problems', 'ALL_PROBLEMS'];
+ push @{$printChoices}, ['Selected <b>Resources</b> from <b>entire course</b>', 'all_resources', 'ALL_RESOURCES'];
&Apache::lonxml::xmlparse($r, 'helper', <<ALL_PROBLEMS);
<state name="ALL_PROBLEMS" title="Select Problem(s) to print">
- <message>(mark them then click "next" button) <br /></message>
<resource variable="RESOURCES" toponly='0' multichoice="1"
suppressEmptySequences='0' addstatus="1" closeallpages="1">
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isProblemOrMap;</filterfunc>
<choicefunc>return $isNotMap;</choicefunc>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='Newpage' variable='FINISHPAGE' />
+ <option text='$startnew' variable='FINISHPAGE' />
</resource>
</state>
<state name="ALL_RESOURCES" title="Select Resource(s) to print">
- <message>(Mark them then click "next" button) <br /> </message>
<resource variable="RESOURCES" toponly='0' multichoice='1'
suppressEmptySequences='0' addstatus='1' closeallpages='1'>
<nextstate>PAGESIZE</nextstate>
<filterfunc>return $isNotMap; </filterfunc>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='NewPage' variable='FINISHPAGE' />
+ <option text='$startnew' variable='FINISHPAGE' />
</resource>
</state>
ALL_PROBLEMS
if ($helper->{VARS}->{'assignment'}) {
- push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'problems_for_students', 'CHOOSE_STUDENTS'];
- push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('anonymous students')."</b>", 'problems_for_anon', 'CHOOSE_ANON1'];
+ push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'problems_for_students', 'CHOOSE_STUDENTS'];
+ push @{$printChoices}, [&mt("Selected <b>Problems</b> from folder <b><i>[_1]</i></b> for <b>anonymous students</b>",$sequenceTitle), 'problems_for_anon', 'CHOOSE_ANON1'];
}
# resource_selector will hold a few states that:
@@ -2290,7 +2286,7 @@
<filterfunc>return $isProblem;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='New Page' variable='FINISHPAGE' />
+ <option text='$startnew' variable='FINISHPAGE' />
</resource>
</state>
<state name="PRINT_FORMATTING" title="How should results be printed?">
@@ -2440,8 +2436,8 @@
if ($helper->{VARS}->{'assignment'}) {
- push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('selected students')."</b>", 'resources_for_students', 'CHOOSE_STUDENTS1'];
- push @{$printChoices}, ["<b>".&mt('Resources')."</b> ".&mt('from')." <b><i>$sequenceTitle</i></b> ".&mt('for')." <b>".&mt('anonymous students')."</b>", 'resources_for_anon', 'CHOOSE_ANON2'];
+ push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>selected students</b>",$sequenceTitle), 'resources_for_students', 'CHOOSE_STUDENTS1'];
+ push @{$printChoices}, [&mt("Selected <b>Resources</b> from folder <b><i>[_1]</i></b> for <b>anonymous students</b>",$sequenceTitle), 'resources_for_anon', 'CHOOSE_ANON2'];
}
@@ -2454,7 +2450,7 @@
<filterfunc>return $isNotMap;</filterfunc>
<mapurl>$map</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='Newpage' variable='FINISHPAGE' />
+ <option text='$startnew' variable='FINISHPAGE' />
</resource>
</state>
<state name="PRINT_FORMATTING" title="Format of the print job">
@@ -2547,12 +2543,12 @@
# 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'}) and $perm{'pav'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {
- push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
+ push @{$printChoices}, [&mt("Selected <b>Problems</b> from current subdirectory <b><i>[_1]</i></b>",$subdir), 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
my $f = '$filename';
my $xmlfrag = <<CHOOSE_FROM_SUBDIR;
<state name="CHOOSE_FROM_SUBDIR" title="Select File(s) from <b><small>$subdir</small></b> to print">
- <message>(mark them then click "next" button) <br /></message>
+
<files variable="FILES" multichoice='1'>
<nextstate>PAGESIZE</nextstate>
<filechoice>return '$subdir';</filechoice>
@@ -2573,7 +2569,7 @@
# Allow the user to select any sequence in the course, feed it to
# another resource selector for that sequence
if (!$helper->{VARS}->{'construction'}) {
- push @$printChoices, ["<b>Resources</b> from <b>selected sequence</b> in course",
+ push @$printChoices, ["Selected <b>Resources</b> from <b>selected folder</b> in course",
'select_sequences', 'CHOOSE_SEQUENCE'];
my $escapedSequenceName = $helper->{VARS}->{'SEQUENCE'};
#Escape apostrophes and backslashes for Perl
@@ -2598,7 +2594,7 @@
<filterfunc>return $isProblem</filterfunc>
<mapurl evaluate='1'>return '$escapedSequenceName';</mapurl>
<valuefunc>return $symbFilter;</valuefunc>
- <option text='Newpage' variable='FINISHPAGE' />
+ <option text='$startnew' variable='FINISHPAGE' />
</resource>
</state>
CHOOSE_FROM_ANY_SEQUENCE
--www1152911029--