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

Diff for /loncom/interface/lonannounce.pm between versions 1.17 and 1.20

version 1.17, 2003/08/12 19:46:04 version 1.20, 2003/09/17 19:45:39
Line 32  use strict; Line 32  use strict;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
   use Apache::lonlocal;
 use HTML::Entities();  use HTML::Entities();
   
 my %todayhash;  my %todayhash;
Line 86  sub normalcell { Line 87  sub normalcell {
  ', '.localtime($start).' - '.localtime($end).': '.$msg;   ', '.localtime($start).' - '.localtime($end).': '.$msg;
             if ($courseid eq $ENV{'request.course.id'}) {              if ($courseid eq $ENV{'request.course.id'}) {
               if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))                if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))
                && (!$showedcheck{$start.'_'.$end})) {                 && (!$showedcheck{$start.'_'.$end})
          && ($ENV{'form.pickdate'} ne 'yes')) {
                $output.='<input type="checkbox" name="remove_'.$start.'_'.                 $output.='<input type="checkbox" name="remove_'.$start.'_'.
    $end.'">';     $end.'">';
                $showedcheck{$start.'_'.$end}=1;                 $showedcheck{$start.'_'.$end}=1;
Line 102  sub normalcell { Line 104  sub normalcell {
  ((($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"':'').
            '><b>'.$day.'</b><br>'.$output.'</td>';             '>'.&tfont('<b>'.&picklink($day,$day,$month,$year).'</b><br>'.$output).'</td>';
 }  }
   
 sub plaincell {  sub plaincell {
Line 171  sub showday { Line 173  sub showday {
    }     }
 }  }
   
   sub tfont {
       my $text=shift;
       if ($ENV{'form.pickdate'} eq 'yes') {
    return '<font size="1">'.$text.'</font>';
       } else {
    return $text;
       }
   }
   
   sub picklink {
       my ($text,$day,$month,$year)=@_;
       if ($ENV{'form.pickdate'} eq 'yes') {
    return '<a href="javascript:dialin('.$day.','.$month.','.$year.')">'.
       $text.'</a>';
       } else {
    return $text;
       }
   }
   
   sub dialscript {
       return (<<ENDDIA);
   <script language="Javascript">
   function dialin(day,month,year) {
    opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_year.value=year;
       var slct=opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_month;
       var i;
       for (i=0;i<slct.length;i++) {
           if (slct.options[i].value==month) { slct.selectedIndex=i; }
       }
       opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_day.value=day;
       opener.$ENV{'form.element'}\_checkday();
       self.close();
   }
   </script>
   ENDDIA
   }
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     $r->content_type('text/html');      $r->content_type('text/html');
Line 185  sub handler { Line 224  sub handler {
     undef %showedcheck;      undef %showedcheck;
 # ---------------------------------------------------------- Get month and year  # ---------------------------------------------------------- Get month and year
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['month','year']);                               ['month','year','pickdate','formname','element']);
 # --------------------------------------------------- Decide what month to show  # --------------------------------------------------- Decide what month to show
     my $year=$todayhash{'year'};      my $year=$todayhash{'year'};
     if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; }      if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; }
     my $month=$todayhash{'month'};      my $month=$todayhash{'month'};
     if ($ENV{'form.month'}) { $month=$ENV{'form.month'}; }      if ($ENV{'form.month'}) { $month=$ENV{'form.month'}; }
   
   # ---------------------------------------------- See if we are in pickdate mode
       my $pickdatemode=($ENV{'form.pickdate'} eq 'yes');
       my $pickinfo='&pickdate=yes&formname='.$ENV{'form.formname'}.
    '&element='.$ENV{'form.element'};
 # --------------------------------------------- Find out first day of the month  # --------------------------------------------- Find out first day of the month
   
     my %firstday=&Apache::loncommon::timehash(      my %firstday=&Apache::loncommon::timehash(
Line 219  sub handler { Line 263  sub handler {
 </script>  </script>
 </head>  </head>
 ENDDOCUMENT  ENDDOCUMENT
     $r->print(&Apache::loncommon::bodytag("Announcements and Calendar"));      if ($pickdatemode) {
   # no big header in pickdate mode
    $r->print(&Apache::loncommon::bodytag("Pick a Date",'','',1).
     &dialscript().
     '<font size="1">');
       } else {
          $r->print(&Apache::loncommon::bodytag("Announcements and Calendar"));
       }
 # does this user have privileges to post, etc?  # does this user have privileges to post, etc?
     my $allowed=0;      my $allowed=0;
     if ($ENV{'request.course.id'}) {      if ($ENV{'request.course.id'}) {
Line 233  ENDDOCUMENT Line 284  ENDDOCUMENT
     } else {      } else {
  $serverpost=&Apache::lonnet::allowed('psa','/');   $serverpost=&Apache::lonnet::allowed('psa','/');
     }      }
   # -------------------------------- BUT: do no fancy stuff when in pickdate mode
       if ($pickdatemode) { 
    $serverpost=0; 
    $allowed=0;
       }
 # ------------------------------------------------------------ Process commands  # ------------------------------------------------------------ Process commands
     if ($serverpost) {      if ($serverpost) {
  if ($ENV{'form.serveraction'}) {   if ($ENV{'form.serveraction'}) {
Line 312  SERVERANNOUNCE Line 368  SERVERANNOUNCE
     if ($pm<1) { ($pm,$py)=(12,$year-1); }      if ($pm<1) { ($pm,$py)=(12,$year-1); }
     if ($fm>12){ ($fm,$fy)=(1,$year+1); }      if ($fm>12){ ($fm,$fy)=(1,$year+1); }
   
     $r->print('<h1>'.('','January','February','March','April','May',      $r->print('<h1>'.('',&mt('January'),&mt('February'),&mt('March'),
       'June','July','August','September','October',        &mt('April'),&mt('May'),
                       'November','December')[$month].' '.$year.'</h1>');        &mt('June'),&mt('July'),&mt('August'),
                         &mt('September'),&mt('October'),
                         &mt('November'),&mt('December'))[$month].' '.
                 $year.'</h1>');
 # Reached the end of times, give up  # Reached the end of times, give up
     if (($year<1970) || ($year>2037)) {      if (($year<1970) || ($year>2037)) {
  $r->print('<h3>No calendar available for this date.</h3>'.   $r->print('<h3>No calendar available for this date.</h3>'.
Line 323  SERVERANNOUNCE Line 382  SERVERANNOUNCE
  return OK;   return OK;
     }      }
     $r->print(      $r->print(
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.'">Previous Month</a> '.   '<a href="/adm/announcements?month='.$pm.'&year='.$py.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a>'.   ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
    '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
    ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.   '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.'">Current Month</a><p>'.   '&year='.$todayhash{'year'}.
         '<table border="2" cols="7" rows="5"><tr><th>Sun</th><th>Mon</th>'.   ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><p>'.
         '<th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th></tr>');          '<table border="2" cols="7" rows="5"><tr><th>'.
   &tfont(&mt('Sun'))
   .'</th><th>'.
   &tfont(&mt('Mon'))
   .'</th><th>'.
   &tfont(&mt('Tue'))
   .'</th><th>'.
   &tfont(&mt('Wed'))
   .'</th><th>'.
   &tfont(&mt('Thu'))
   .'</th><th>'.
   &tfont(&mt('Fri'))
   .'</th><th>'.
   &tfont(&mt('Sat'))
   .'</th></tr>');
   
     my $tk=&Apache::loncommon::maketime(%firstday);      my $tk=&Apache::loncommon::maketime(%firstday);
     my $outp;      my $outp;
Line 360  SERVERANNOUNCE Line 435  SERVERANNOUNCE
 # --------------------------------------------------------------- Remove button  # --------------------------------------------------------------- Remove button
     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.
  '<a href="/adm/announcements?month='.$fm.'&year='.$fy.'">Next Month</a>'.   ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
    '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
    ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.   '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.'">Current Month</a></p>'.   '&year='.$todayhash{'year'}.
    ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.
    ($pickdatemode?'</font>':'').
  '</body></html>');   '</body></html>');
     return OK;      return OK;
 }   } 
Removed from v.1.17  
changed lines
  Added in v.1.20

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