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

Diff for /loncom/interface/loncommon.pm between versions 1.475 and 1.478

version 1.475, 2006/11/29 15:38:22 version 1.478, 2006/11/29 22:02:47
Line 1381  sub select_form { Line 1381  sub select_form {
   
 sub display_filter {  sub display_filter {
     if (!$env{'form.show'}) { $env{'form.show'}=10; }      if (!$env{'form.show'}) { $env{'form.show'}=10; }
       if (!$env{'form.displayfilter'}) { $env{'form.displayfilter'}='currentfolder'; }
     return '<nobr><label>'.&mt('Records [_1]',      return '<nobr><label>'.&mt('Records [_1]',
        &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,         &Apache::lonmeta::selectbox('show',$env{'form.show'},undef,
    (&mt('all'),10,20,50,100,1000,10000))).     (&mt('all'),10,20,50,100,1000,10000))).
    '</label></nobr> <nobr><label>'.     '</label></nobr> <nobr>'.
            &mt('Filter [_1]',             &mt('Filter [_1]',
    &select_form(($env{'form.displayfilter'}?$env{'form.displayfilter'}:'currentfolder'),     &select_form($env{'form.displayfilter'},
  'displayfilter',   'displayfilter',
  ('currentfolder' => 'Current folder',   ('currentfolder' => 'Current folder/page',
  'containing' => 'Containing phrase',   'containing' => 'Containing phrase',
  'none' => 'None'))).   'none' => 'None'))).
    '<input type="text" name="containingphrase" size="30" /></label></nobr>';   '<input type="text" name="containingphrase" size="30" value="'.&HTML::Entities::encode($env{'form.containingphrase'}).'" /></nobr>';
 }  }
   
 sub gradeleveldescription {  sub gradeleveldescription {
Line 2896  sub parse_block_record { Line 2897  sub parse_block_record {
         ($setuname,$setudom) = split(/:/,$record->{'setter'});          ($setuname,$setudom) = split(/:/,$record->{'setter'});
         $title = &unescape($record->{'event'});          $title = &unescape($record->{'event'});
         $blocks = $record->{'blocks'};          $blocks = $record->{'blocks'};
   
     } else {      } else {
         my @data = split(/:/,$record,3);          my @data = split(/:/,$record,3);
         if (scalar(@data) eq 2) {          if (scalar(@data) eq 2) {
Line 2919  sub build_block_table { Line 2919  sub build_block_table {
         'blse' => 'Block set by'          'blse' => 'Block set by'
     );      );
     my $output;      my $output;
     $output = '<br /><br />'.$lt{'cacb'}.':<br /><br />';      $output = '<br />'.$lt{'cacb'}.':<br />';
     $output .= &start_data_table();      $output .= &start_data_table();
     $output .= '      $output .= '
 <tr>  <tr>
Line 2932  sub build_block_table { Line 2932  sub build_block_table {
         my %courseinfo=&Apache::lonnet::coursedescription($course);          my %courseinfo=&Apache::lonnet::coursedescription($course);
         for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {          for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
             my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};              my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
             my $fullname = &Apache::loncommon::plainname($uname,$udom);              my $fullname = &aboutmewrapper(&plainname($uname,$udom),$uname,$udom);
             my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};              my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
             $openblock = &Apache::lonlocal::locallocaltime($openblock);              $openblock = &Apache::lonlocal::locallocaltime($openblock);
             $closeblock= &Apache::lonlocal::locallocaltime($closeblock);              $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
             $output .= &Apache::loncommon::start_data_table_row().              $output .= &Apache::loncommon::start_data_table_row().
                        '<td>'.$courseinfo{'description'}.'</td>'.                         '<td>'.$courseinfo{'description'}.'</td>'.
                        '<td>'.$openblock.' to '.$closeblock.'</td>'.                         '<td>'.$openblock.' to '.$closeblock.'</td>'.
                        '<td>'.$fullname.' ('.$uname.':'.$udom.                         '<td>'.$fullname.'.</td>'.
                        ')</td>'.  
                         &Apache::loncommon::end_data_table_row();                          &Apache::loncommon::end_data_table_row();
         }          }
     }      }
Removed from v.1.475  
changed lines
  Added in v.1.478

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