[BACK]Return to lonprintout.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonprintout.pm between versions 1.554.2.1 and 1.558

version 1.554.2.1, 2009/06/17 10:21:33 version 1.558, 2009/07/03 16:13:13
Line 1475  sub print_construction_sequence { Line 1475  sub print_construction_sequence {
     $result.=$texversion;      $result.=$texversion;
   
  } elsif ($urlp=~/\.(sequence|page)$/) {   } elsif ($urlp=~/\.(sequence|page)$/) {
        
     # header:      # header:
   
     $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';      $result.='\strut\newline\noindent Sequence/page '.$urlp.'\strut\newline\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\newline\noindent ';
Line 1519  sub output_data { Line 1519  sub output_data {
     my %parmhash = %$rparmhash;      my %parmhash = %$rparmhash;
     $ssi_error = 0; # This will be set nonzero by failing ssi's.      $ssi_error = 0; # This will be set nonzero by failing ssi's.
     $resources_printed = '';      $resources_printed = '';
       $font_size = $helper->{'VARS'}->{'fontsize'};
     my $do_postprocessing = 1;      my $do_postprocessing = 1;
     my $js = <<ENDPART;      my $js = <<ENDPART;
 <script type="text/javascript">  <script type="text/javascript">
Line 1548  sub output_data { Line 1549  sub output_data {
 ENDPART  ENDPART
   
   
       # Breadcrumbs
     my $start_page  = &Apache::loncommon::start_page('Preparing Printout',$js);      #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 ...');      my $msg = &mt('Please stand by while processing your print request, this may take some time ...');
   
     $r->print($start_page."\n<p>\n$msg\n</p>\n");      $r->print($start_page."\n<p>\n$msg\n</p>\n");
Line 1629  ENDPART Line 1638  ENDPART
  }   }
  $selectionmade = 1;   $selectionmade = 1;
  if ($cleanURL!~m|^/adm/|   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 $rndseed=time;
     my $texversion='';      my $texversion='';
     if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {      if ($helper->{'VARS'}->{'ANSWER_TYPE'} ne 'only') {
Line 1722  ENDPART Line 1731  ENDPART
  ($result,$number_of_columns) = &page_cleanup($result);   ($result,$number_of_columns) = &page_cleanup($result);
     }      }
         } elsif ($cleanURL!~m|^/adm/|          } 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              #printing content of sequence from the construction space
     $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;      $currentURL=~s|\/~([^\/]+)\/|\/home\/$1\/public_html\/|;
 #    $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});  #    $result .= &print_latex_header($helper->{'VARS'}->{'LATEX_TYPE'});
Line 3260  CHOOSE_FROM_ANY_SEQUENCE Line 3269  CHOOSE_FROM_ANY_SEQUENCE
  &addMessage('<br />'   &addMessage('<br />'
                    .'<h3>'.&mt('Print Options').'</h3>'                     .'<h3>'.&mt('Print Options').'</h3>'
                    .&Apache::lonhtmlcommon::start_pick_box()                     .&Apache::lonhtmlcommon::start_pick_box()
 #                  .&Apache::lonhtmlcommon::row_headline()  
 #                  .'<h3>'.&mt('Print Options').'</h3>'  
 #                  .&Apache::lonhtmlcommon::row_closure()  
                    .&Apache::lonhtmlcommon::row_title(                     .&Apache::lonhtmlcommon::row_title(
                        '<label for="ANSWER_TYPE_forminput">'                         '<label for="ANSWER_TYPE_forminput">'
                       .&mt('Print Answers')                        .&mt('Print Answers')
Line 3280  CHOOSE_FROM_ANY_SEQUENCE Line 3286  CHOOSE_FROM_ANY_SEQUENCE
         Apache::lonhelper::dropdown->new();          Apache::lonhelper::dropdown->new();
  &addMessage(&Apache::lonhtmlcommon::row_closure());   &addMessage(&Apache::lonhtmlcommon::row_closure());
  $startedTable = 1;   $startedTable = 1;
   
   #
   #  Select font size.
   #
   
               $helper->declareVar('fontsize');
               &addMessage(&Apache::lonhtmlcommon::row_title(&mt('Font Size')));
               my $xmlfrag = << "FONT_SELECTION";
   
             
               <dropdown variable='fontsize' multichoice='0', allowempty='0'>
               <defaultvalue>
     return 'normalsize';
               </defaultvalue>
               <choice computer='tiny'>Tiny</choice>
               <choice computer='sub/superscriptsize'>Script Size</choice>
               <choice computer='footnotesize'>Footnote Size</choice>
               <choice computer='small'>Small</choice>
               <choice computer='normalsize'>Normal (default)</choice>
               <choice computer='large'>larger than normal</choice>
               <choice computer='Large'>Even larger than normal</choice>
               <choice computer='LARGE'>Still larger than normal</choice>
               <choice computer='huge'>huge font size</choice>
               <choice computer='Huge'>Largest possible size</choice>
               </dropdown>
   FONT_SELECTION
               &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
               &addMessage(&Apache::lonhtmlcommon::row_closure(1));
     }      }
   
     if ($perm{'pav'}) {      if ($perm{'pav'}) {
Line 3379  CHOOSE_FROM_ANY_SEQUENCE Line 3413  CHOOSE_FROM_ANY_SEQUENCE
     $paramHash->{'multichoice'} = "true";      $paramHash->{'multichoice'} = "true";
     $paramHash->{'allowempty'}  = "true";      $paramHash->{'allowempty'}  = "true";
     $paramHash->{'variable'}   = "showallfoils";      $paramHash->{'variable'}   = "showallfoils";
     $paramHash->{'CHOICES'} = [ ["Show all foils", "1"] ];      $paramHash->{'CHOICES'} = [ [&mt('Show All Foils'), "1"] ];
     Apache::lonhelper::choices->new();      Apache::lonhelper::choices->new();
             &addMessage(&Apache::lonhtmlcommon::row_closure(1));              &addMessage(&Apache::lonhtmlcommon::row_closure(1));
  }   }
Line 3416  CHOOSE_FROM_ANY_SEQUENCE Line 3450  CHOOSE_FROM_ANY_SEQUENCE
 .qq|<a href="javascript:openbrowser('helpform','style_file_forminput','sty')">|  .qq|<a href="javascript:openbrowser('helpform','style_file_forminput','sty')">|
 .$selectfiletext.'</a>'  .$selectfiletext.'</a>'
             .&Apache::lonhtmlcommon::row_closure()              .&Apache::lonhtmlcommon::row_closure()
             .&Apache::lonhtmlcommon::row_title(&mt('Show all foils'))              .&Apache::lonhtmlcommon::row_title(&mt('Show All Foils'))
             .'</message>              .'</message>
      <choices allowempty="1" multichoice="true" variable="showallfoils">       <choices allowempty="1" multichoice="true" variable="showallfoils">
                 <choice computer="1">&nbsp;</choice>                  <choice computer="1">&nbsp;</choice>
Line 3445  CHOOSE_FROM_ANY_SEQUENCE Line 3479  CHOOSE_FROM_ANY_SEQUENCE
  </dropdown>   </dropdown>
 PROBTYPE  PROBTYPE
             &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);              &Apache::lonxml::xmlparse($r, 'helper', $xmlfrag);
       
             &addMessage(&Apache::lonhtmlcommon::row_closure(1));              &addMessage(&Apache::lonhtmlcommon::row_closure(1));
   
   
   
         }          }
     }      }
   
Line 3557  sub render { Line 3592  sub render {
     my $pdfFormLabel=&mt('PDF-Formfields');      my $pdfFormLabel=&mt('PDF-Formfields');
     my $with=&mt('with Formfields');      my $with=&mt('with Formfields');
     my $without=&mt('without Formfields');      my $without=&mt('without Formfields');
       
   
     $result.='<h3>'.&mt('Layout Options').'</h3>'      $result.='<h3>'.&mt('Layout Options').'</h3>'
             .&Apache::loncommon::start_data_table()              .&Apache::loncommon::start_data_table()
             .&Apache::loncommon::start_data_table_header_row()              .&Apache::loncommon::start_data_table_header_row()
Removed from v.1.554.2.1  
changed lines
  Added in v.1.558

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