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

Diff for /loncom/interface/lonannounce.pm between versions 1.11 and 1.12

version 1.11, 2003/05/21 20:10:53 version 1.12, 2003/05/23 16:14:33
Line 33  use Apache::Constants qw(:common); Line 33  use Apache::Constants qw(:common);
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
   
   my %todayhash;
   
 sub editfield {  sub editfield {
     my ($r,$start,$end,$text)=@_;      my ($r,$start,$end,$text)=@_;
     # Deal with date forms      # Deal with date forms
Line 72  sub emptycell { Line 74  sub emptycell {
 }  }
   
 sub normalcell {  sub normalcell {
     my ($day,$text)=@_;      my ($day,$month,$year,$text)=@_;
     my $output='';      my $output='';
     foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) {      foreach (split(/\_\_\_\&\&\&\_\_\_/,$text)) {
         if ($_) {          if ($_) {
Line 90  sub normalcell { Line 92  sub normalcell {
        substr($msg,0,20).'...</a><br />';         substr($msg,0,20).'...</a><br />';
        }         }
     }      }
     return '<td><b>'.$day.'</b><br>'.$output.'</td>';      return '<td'.
    ((($day eq $todayhash{'day'}) &&
             ($month eq $todayhash{'month'}) &&
             ($year eq $todayhash{'year'}))?' bgcolor="#FFFF00"':'').
              '><b>'.$day.'</b><br>'.$output.'</td>';
 }  }
   
 sub plaincell {  sub plaincell {
Line 144  sub showday { Line 150  sub showday {
         }          }
     }      }
     unless ($mode) {      unless ($mode) {
        return ($nextday,$nextmonth,&normalcell($th{'day'},$outp));         return ($nextday,$nextmonth,&normalcell(
                  $th{'day'},$th{'month'},$th{'year'},$outp));
    } elsif ($outp) {     } elsif ($outp) {
        if ($mode==1) {         if ($mode==1) {
           return '<br />'.&plaincell($outp);            return '<br />'.&plaincell($outp);
Line 164  sub handler { Line 171  sub handler {
   
 # ---------------------------------------------------------- Get time right now  # ---------------------------------------------------------- Get time right now
     my $today=time;      my $today=time;
     my %todayhash=&Apache::loncommon::timehash($today);      %todayhash=&Apache::loncommon::timehash($today);
   
 # ---------------------------------------------------------- Get month and year  # ---------------------------------------------------------- Get month and year
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
Line 260  ENDDOCUMENT Line 267  ENDDOCUMENT
       'June','July','August','September','October',        'June','July','August','September','October',
                       'November','December')[$month].' '.$year.'</h1>'.                        'November','December')[$month].' '.$year.'</h1>'.
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.   '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a><p>'.   '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a>'.
    '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
    '&year='.$todayhash{'year'}.'">Current Month</a><p>'.
         '<table border="2" cols="7" rows="5"><tr><th>Sun</th><th>Mon</th>'.          '<table border="2" cols="7" rows="5"><tr><th>Sun</th><th>Mon</th>'.
         '<th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th></tr>');          '<th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th></tr>');
   
Line 291  ENDDOCUMENT Line 300  ENDDOCUMENT
     if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries"></form>'); }      if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries"></form>'); }
     $r->print('<p>'.      $r->print('<p>'.
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.   '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a><p>'.   '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a>'.
    '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
    '&year='.$todayhash{'year'}.'">Current Month</a></p>'.
  '</body></html>');   '</body></html>');
     return OK;      return OK;
 }   } 
Removed from v.1.11  
changed lines
  Added in v.1.12

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