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

Diff for /loncom/interface/lonblockingstatus.pm between versions 1.8 and 1.11

version 1.8, 2012/03/31 14:19:24 version 1.11, 2012/04/04 21:04:56
Line 44  sub handler { Line 44  sub handler {
     return OK if $r->header_only;      return OK if $r->header_only;
   
     my (%activities,$activity,$origurl);      my (%activities,$activity,$origurl);
     map { $activities{$_} = 1; } ('boards','chat','msgdisplay','blogs','groups','port','docs');      map { $activities{$_} = 1; } ('boards','chat','msgdisplay','blogs','groups','port','printout','docs');
   
     # determine what kind of blocking we want details for      # determine what kind of blocking we want details for
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['activity','url']);      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['activity','url']);
Line 52  sub handler { Line 52  sub handler {
   
     my $title = 'Communication Blocking Status Information';      my $title = 'Communication Blocking Status Information';
   
     if ($activity eq 'docs') {      if (($activity eq 'docs') || ($activity eq 'printout')) {
         $title = 'Blocking Status Information';          $title = 'Blocking Status Information';
         $origurl = $env{'form.url'};          $origurl = $env{'form.url'};
     }      }
Line 95  sub blockpage { Line 95  sub blockpage {
     # retrieve start/end of possible active blocking      # retrieve start/end of possible active blocking
     my %setters;      my %setters;
     my ($startblock,$endblock,$triggerblock) =       my ($startblock,$endblock,$triggerblock) = 
         &Apache::loncommon::blockcheck(\%setters,$activity,$uname,$udom,$url);          &Apache::loncommon::blockcheck(\%setters,$activity,$uname,$udom,$origurl);
   
     # nothing to do if there's no active blocking      # nothing to do if there's no active blocking
     unless ($startblock && $endblock) { return ''; }      unless ($startblock && $endblock) { return ''; }
Line 108  sub blockpage { Line 108  sub blockpage {
                    msgdisplay => 'This message',                     msgdisplay => 'This message',
                    blogs      => 'Blogs',                     blogs      => 'Blogs',
                    groups     => 'Groups in this course',                     groups     => 'Groups in this course',
                      printout   => 'Printout generation', 
                    docs       => 'Course Content',                     docs       => 'Course Content',
                 );                  );
   
Line 135  sub blockpage { Line 136  sub blockpage {
     if ( ref($description) ne 'ARRAY' ) {      if ( ref($description) ne 'ARRAY' ) {
         #default: $description is one of the above descriptions          #default: $description is one of the above descriptions
         if ($activity eq 'docs') {          if ($activity eq 'docs') {
             $output=&mt( 'Access to the content page you are attempting to               $output=&mt( 'Access to the content page you are attempting to' 
                          . ' view will be unavailable between [_1] and [_2] because'                           . ' view will be unavailable between [_1] and [_2] because'
                          . ' access to selected $description is being blocked.'                           . ' access to selected '.$description.' is being blocked.'
                          ,$showstart, $showend);                           ,$showstart, $showend);
             }          } elsif ($activity eq 'printout') {
               $output = mt( $description
                             . ' will be unavailable between [_1] and [_2] because'
                             . ' this functionality is being blocked.'
                             ,$showstart, $showend);
         } else {          } else {
             $output = mt( $description              $output = mt( $description
                           . ' will be inaccessible between [_1] and [_2] because'                            . ' will be inaccessible between [_1] and [_2] because'
Line 174  sub blockpage { Line 179  sub blockpage {
 sub build_block_table {  sub build_block_table {
     my ($setters) = @_;      my ($setters) = @_;
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
         'cacb' => 'Currently active communication blocks',          'cacb' => 'Currently active communication/content blocks',
         'cour' => 'Course',          'cour' => 'Course',
         'dura' => 'Duration',          'dura' => 'Duration',
         'blse' => 'Block set by'          'blse' => 'Block set by'
Line 197  sub build_block_table { Line 202  sub build_block_table {
             {              {
                 $fullname = Apache::loncommon::aboutmewrapper($fullname,$uname,$udom);                  $fullname = Apache::loncommon::aboutmewrapper($fullname,$uname,$udom);
             }              }
             my $triggertype = $$setters{$course}{times}[$i];              my $triggertype = $$setters{$course}{triggers}[$i];
             if ($triggertype) {              if ($triggertype) {
                 $fullname .= &mt(' (triggered by you when starting timer)');                   $fullname .= &mt(' (triggered by you when starting timer)'); 
             }              }
Removed from v.1.8  
changed lines
  Added in v.1.11

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