[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm
sakharuk
lon-capa-cvs@mail.lon-capa.org
Thu, 12 Sep 2002 15:08:43 -0000
sakharuk Thu Sep 12 11:08:43 2002 EDT
Modified files:
/loncom/interface lonprintout.pm
Log:
Changed interface (after work with Felicia).
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.61 loncom/interface/lonprintout.pm:1.62
--- loncom/interface/lonprintout.pm:1.61 Wed Sep 11 16:18:08 2002
+++ loncom/interface/lonprintout.pm Thu Sep 12 11:08:43 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.61 2002/09/11 20:18:08 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.62 2002/09/12 15:08:43 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -64,41 +64,49 @@
</head>
<body bgcolor="FFFFFF">
<form method="post" enctype="multipart/form-data" action="/adm/printout" name="printform">
-<tt>$ENV{'form.postdata'}</tt><p>
ENDHEADER
+ if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) {
+ $r->print(<<ENDHEADER1);
+<b>Path to current document: </b><tt>$ENV{'form.postdata'}</tt><p>
+ENDHEADER1
+}
}
sub menu_for_output {
my $r = shift;
- my ($title_for_single_resource,$title_for_sequence) = &details_for_menu;
+ my ($title_for_single_resource,$title_for_sequence,$title_for_main_map) = &details_for_menu;
if ($title_for_single_resource ne '') {$title_for_single_resource = '"'.$title_for_single_resource.'"';}
if ($title_for_sequence ne '') {$title_for_sequence = '"'.$title_for_sequence.'"';}
+ if ($title_for_main_map ne '') {$title_for_main_map = '"'.$title_for_main_map.'"';}
+ my $subdir_to_print = $ENV{'form.postdata'};
+ $subdir_to_print =~ m/\/([^\/]+)$/;
+ $subdir_to_print =~ s/$1//;
$r->print(<<ENDMENUOUT1);
<h1>What do you want to print? Make a choice.</h1><br />
<input type="hidden" name="phase" value="two">
<input type="hidden" name="url" value="$ENV{'form.postdata'}">
<input type="radio" name="choice" value="Standard LaTeX output for current document" checked> Current document <b>$title_for_single_resource</b>
-(you will print what you see on the screen)<br />
+(you will print what you saw on the screen)<br />
ENDMENUOUT1
if ((not $ENV{'request.role'}=~m/^au\./) and (not $ENV{'request.role'}=~m/^ca\./)) {
$r->print(<<ENDMENUOUT2);
-<input type="radio" name="choice" value="Standard LaTeX output for the primary sequence"> All problems from the primary sequence <b>$title_for_sequence</b><br />
-<input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence"> The whole primary sequence <b>$title_for_sequence</b> (problems plus all html and xml files)<br />
+<input type="radio" name="choice" value="Standard LaTeX output for the primary sequence"> All problems from the sequence <b>$title_for_sequence</b><br />
+<input type="radio" name="choice" value="Standard LaTeX output for whole primary sequence"> All problems plus any html/xml files from the sequence <b>$title_for_sequence</b><br />
ENDMENUOUT2
}
if ($ENV{'request.role'}=~m/^cc\./ or $ENV{'request.role'}=~m/^in\./ or $ENV{'request.role'}=~m/^ta\./) {
$r->print(<<ENDMENUOUT6);
-<input type="radio" name="choice" value="Standard LaTeX output for the top level sequence"> All problems from the top level sequence<br />
+<input type="radio" name="choice" value="Standard LaTeX output for the top level sequence"> All problems in this course (<b>warning:</b> this may be time consuming) <br />
<br />
-<input type="radio" name="choice" value="All class print"> Print assignment <b>$title_for_sequence</b> (all problems from the primary sequence) for group of students<br /><br />
+<input type="radio" name="choice" value="All class print"> All problems from the sequence <b>$title_for_sequence</b> for selected students<br /><br />
ENDMENUOUT6
}
my $subdirtoprint = &Apache::lonnet::filelocation("",$ENV{'form.url'});
$subdirtoprint =~ s/\/[^\/]+$//;
if (&Apache::lonnet::allowed('bre',$subdirtoprint) eq 'F') {
$r->print(<<ENDMENUOUT4);
- <input type="radio" name="choice" value="Subdirectory print"> All problems from current subdirectory (where this particular problem is)<br />
+ <input type="radio" name="choice" value="Subdirectory print"> Problems from current subdirectory <b>$subdir_to_print</b><br />
ENDMENUOUT4
}
$r->print(<<ENDMENUOUT5);
@@ -119,10 +127,10 @@
</td>
<td rawspan="2">
Paper size (format [width x height]): <select name="papersize">
- <option selected> Letter [216x297 mm] </option>
- <option> Legal [216x356 mm] </option>
- <option> Executive [190x254 mm] </option>
- <option> Ledger/Tabloid [279x432 mm] </option>
+ <option selected> Letter [8 1/2x11 in] </option>
+ <option> Legal [8 1/2x14 in] </option>
+ <option> Ledger/Tabloid [11x17 in] </option>
+ <option> Executive [7 1/2x10 in] </option>
<option> A2 [420x594 mm] </option>
<option> A3 [297x420 mm] </option>
<option> A4 [210x297 mm] </option>
@@ -1029,10 +1037,10 @@
my $name_of_resourse = $hash{'title_'.$hash{'ids_'.$ENV{'form.postdata'}}};
my $symbolic = &Apache::lonnet::symbread($ENV{'form.postdata'});
$symbolic =~ m/([^_]+)_/;
- my $primary_sequence = '/res/'.$1;
- my $name_of_sequence = $hash{'title_'.$hash{'ids_'.$primary_sequence}};
+ my $name_of_sequence = $hash{'title_'.$hash{'ids_/res/'.$1}};
+ my $name_of_map = $hash{'title_'.$hash{'ids_/res/'.$ENV{'request.course.uri'}}};
- return $name_of_resourse,$name_of_sequence;
+ return $name_of_resourse,$name_of_sequence,$name_of_map;
}