Diff for /loncom/interface/lonannounce.pm between versions 1.29 and 1.31

version 1.29, 2004/07/03 20:45:23 version 1.31, 2004/08/27 21:41:39
Line 79  sub readcalendar { Line 79  sub readcalendar {
     ($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);      ($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
  my $section=&mt('All Students');   my $section=&mt('All Students');
  if ($middle=~/^\[(.*)\]\./) {   if ($middle=~/^\[(.*)\]\./) {
       my $sec=$1;
       # if we have a section don't show ones that aren't ours
       if ($ENV{'request.course.sec'} &&
    $ENV{'request.course.sec'} ne $sec) { next; }
       # if a student without a section don't show any section ones
       if (!$ENV{'request.role.adv'} &&
    !$ENV{'request.course.sec'}) { next; }
     $section=&mt('Group/Section').': '.$1;      $section=&mt('Group/Section').': '.$1;
     $middle=~s/^\[(.*)\]\.//;      $middle=~s/^\[(.*)\]\.//;
  }   }
Line 157  sub normalcell { Line 164  sub normalcell {
        substr($msg,0,20).'...</a><br />';         substr($msg,0,20).'...</a><br />';
        }         }
     }      }
     return '<td'.      return '<td valign="top"'.
  ((($day eq $todayhash{'day'}) &&   ((($day eq $todayhash{'day'}) &&
           ($month eq $todayhash{'month'}) &&            ($month eq $todayhash{'month'}) &&
           ($year eq $todayhash{'year'}))?' bgcolor="#FFFF00"':'').            ($year eq $todayhash{'year'}))?' bgcolor="#FFFF00"':'').
            '>'.&tfont('<b>'.&picklink($day,$day,$month,$year).'</b><br>'.$output).'</td>';             '>'.&tfont('<b>'.&picklink($day,$day,$month,$year).'</b><br />'.$output).'</td>';
 }  }
   
 sub plaincell {  sub plaincell {
Line 313  sub handler { Line 320  sub handler {
        &Apache::loncommon::maketime( 'day' => 1, 'month'=> $month,         &Apache::loncommon::maketime( 'day' => 1, 'month'=> $month,
                                      'year' => $year, 'hours' => 0,                                       'year' => $year, 'hours' => 0,
      'minutes' => 0, 'seconds' => 0,       'minutes' => 0, 'seconds' => 0,
                                      'dlsav' => $todayhash{'dlsav'} ));                                       'dlsav' => -1 ));
     my $weekday=$firstday{'weekday'};      my $weekday=$firstday{'weekday'};
 # ------------------------------------------------------------ Print the screen  # ------------------------------------------------------------ Print the screen
   

Removed from v.1.29  
changed lines
  Added in v.1.31


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