--- loncom/interface/lonprintout.pm 2009/06/22 09:26:01 1.554.2.2 +++ loncom/interface/lonprintout.pm 2009/07/03 16:13:13 1.558 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.554.2.2 2009/06/22 09:26:01 foxr Exp $ +# $Id: lonprintout.pm,v 1.558 2009/07/03 16:13:13 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1475,7 +1475,7 @@ sub print_construction_sequence { $result.=$texversion; } elsif ($urlp=~/\.(sequence|page)$/) { - + # header: $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent '; @@ -1549,8 +1549,16 @@ sub output_data { ENDPART - - my $start_page = &Apache::loncommon::start_page('Preparing Printout',$js); + # Breadcrumbs + #FIXME: Choose better/different breadcrumbs?!? Links? + my $brcrum = [{'href' => '', + 'text' => 'Helper'}, #FIXME: Different origin possible than print out helper? + {'href' => '', + 'text' => 'Preparing Printout'}]; + + my $start_page = &Apache::loncommon::start_page('Preparing Printout', + $js, + {'bread_crumbs' => $brcrum,}); my $msg = &mt('Please stand by while processing your print request, this may take some time ...'); $r->print($start_page."\n

\n$msg\n

\n"); @@ -1630,7 +1638,7 @@ ENDPART } $selectionmade = 1; if ($cleanURL!~m|^/adm/| - && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)$/) { + && $cleanURL=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm)$/) { my $rndseed=time; my $texversion=''; if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') { @@ -1723,7 +1731,7 @@ ENDPART ($result,$number_of_columns) = &page_cleanup($result); } } elsif ($cleanURL!~m|^/adm/| - && $currentURL=~/\.sequence$/ && $helper->{'VARS'}->{'construction'} eq '1') { + && $currentURL=~/\.(sequence|page)$/ && $helper->{'VARS'}->{'construction'} eq '1') { #printing content of sequence from the construction space $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|; # $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'}); @@ -3405,7 +3413,7 @@ FONT_SELECTION $paramHash->{'multichoice'} = "true"; $paramHash->{'allowempty'} = "true"; $paramHash->{'variable'} = "showallfoils"; - $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ]; + $paramHash->{'CHOICES'} = [ [&mt('Show All Foils'), "1"] ]; Apache::lonhelper::choices->new(); &addMessage(&Apache::lonhtmlcommon::row_closure(1)); } @@ -3442,7 +3450,7 @@ FONT_SELECTION .qq|| .$selectfiletext.'' .&Apache::lonhtmlcommon::row_closure() - .&Apache::lonhtmlcommon::row_title(&mt('Show all foils')) + .&Apache::lonhtmlcommon::row_title(&mt('Show All Foils')) .'