--- loncom/interface/lonannounce.pm 2003/06/18 20:06:29 1.15 +++ loncom/interface/lonannounce.pm 2003/09/29 13:38:43 1.21 @@ -1,7 +1,7 @@ # The LearningOnline Network # Announce # -# $Id: lonannounce.pm,v 1.15 2003/06/18 20:06:29 www Exp $ +# $Id: lonannounce.pm,v 1.21 2003/09/29 13:38:43 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,9 +32,11 @@ use strict; use Apache::Constants qw(:common); use Apache::loncommon; use Apache::lonhtmlcommon(); +use Apache::lonlocal; use HTML::Entities(); my %todayhash; +my %showedcheck; sub editfield { my ($r,$start,$end,$text)=@_; @@ -84,9 +86,12 @@ sub normalcell { my $fullmsg=$ENV{'course.'.$courseid.'.description'}. ', '.localtime($start).' - '.localtime($end).': '.$msg; 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}) + && ($ENV{'form.pickdate'} ne 'yes')) { $output.=''; + $showedcheck{$start.'_'.$end}=1; } } $fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\''); @@ -99,7 +104,7 @@ sub normalcell { ((($day eq $todayhash{'day'}) && ($month eq $todayhash{'month'}) && ($year eq $todayhash{'year'}))?' bgcolor="#FFFF00"':''). - '>'.$day.'
'.$output.''; + '>'.&tfont(''.&picklink($day,$day,$month,$year).'
'.$output).''; } sub plaincell { @@ -168,24 +173,68 @@ sub showday { } } +sub tfont { + my $text=shift; + if ($ENV{'form.pickdate'} eq 'yes') { + return ''.$text.''; + } else { + return $text; + } +} + +sub picklink { + my ($text,$day,$month,$year)=@_; + if ($ENV{'form.pickdate'} eq 'yes') { + return ''. + $text.''; + } else { + return $text; + } +} + +sub dialscript { + return (< +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 +ENDDIA +} + sub handler { my $r = shift; - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; # ---------------------------------------------------------- Get time right now my $today=time; %todayhash=&Apache::loncommon::timehash($today); - +# ----------------------------------------------------------------- Check marks + %showedcheck=(); + undef %showedcheck; # ---------------------------------------------------------- Get month and year &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['month','year']); + ['month','year','pickdate','formname','element']); # --------------------------------------------------- Decide what month to show my $year=$todayhash{'year'}; if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; } my $month=$todayhash{'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 my %firstday=&Apache::loncommon::timehash( @@ -214,13 +263,63 @@ sub handler { 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(). + ''); + } else { + $r->print(&Apache::loncommon::bodytag("Announcements and Calendar")); + } # does this user have privileges to post, etc? my $allowed=0; if ($ENV{'request.course.id'}) { $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}); } - +# does this user have privileges to post to servers? + my $serverpost=0; + if ($ENV{'request.role.domain'}) { + $serverpost=&Apache::lonnet::allowed('psa', + $ENV{'request.role.domain'}); + } else { + $serverpost=&Apache::lonnet::allowed('psa','/'); + } +# -------------------------------- BUT: do no fancy stuff when in pickdate mode + if ($pickdatemode) { + $serverpost=0; + $allowed=0; + } +# ------------------------------------------------------------ Process commands + if ($serverpost) { + if ($ENV{'form.serveraction'}) { + foreach (keys %ENV) { + if ($_=~/^form\.postto\_(\w+)/) { + $r->print( + '
Posting '.$1.': '.&Apache::lonnet::postannounce + ($1,$ENV{'form.serverannnounce'})); + } + } + } + $r->print(< +

Post Server Announcements

+Post announcements to the system login and roles screen
+(leave blank to delete announcement)
+
+Check machines:
+SERVERANNOUNCE +# list servers + foreach (sort keys %Apache::lonnet::hostname) { + if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$_})) { + $r->print ('
'. + $_.' '.$Apache::lonnet::hostname{$_}.' '. + 'current'); + } + } + $r->print( + '
'); + } if ($allowed) { my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'}; my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; @@ -269,9 +368,12 @@ ENDDOCUMENT if ($pm<1) { ($pm,$py)=(12,$year-1); } if ($fm>12){ ($fm,$fy)=(1,$year+1); } - $r->print('

'.('','January','February','March','April','May', - 'June','July','August','September','October', - 'November','December')[$month].' '.$year.'

'); + $r->print('

'.('',&mt('January'),&mt('February'),&mt('March'), + &mt('April'),&mt('May'), + &mt('June'),&mt('July'),&mt('August'), + &mt('September'),&mt('October'), + &mt('November'),&mt('December'))[$month].' '. + $year.'

'); # Reached the end of times, give up if (($year<1970) || ($year>2037)) { $r->print('

No calendar available for this date.

'. @@ -280,12 +382,28 @@ ENDDOCUMENT return OK; } $r->print( - 'Previous Month '. - 'Next Month'. + ''.&mt('Previous Month').' '. + ''.&mt('Next Month').''. '   Current Month

'. - ''. - ''); + '&year='.$todayhash{'year'}. + ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'

'. + '

SunMonTueWedThuFriSat
'); my $tk=&Apache::loncommon::maketime(%firstday); my $outp; @@ -311,12 +429,20 @@ ENDDOCUMENT } # ------------------------------------------------------------------- End table $r->print('
'. +&tfont(&mt('Sun')) +.''. +&tfont(&mt('Mon')) +.''. +&tfont(&mt('Tue')) +.''. +&tfont(&mt('Wed')) +.''. +&tfont(&mt('Thu')) +.''. +&tfont(&mt('Fri')) +.''. +&tfont(&mt('Sat')) +.'
'); +# ----------------------------------------------------------------- Check marks + %showedcheck=(); + undef %showedcheck; +# --------------------------------------------------------------- Remove button if ($allowed) { $r->print(''); } $r->print('

'. - 'Previous Month '. - 'Next Month'. + ''.&mt('Previous Month').' '. + ''.&mt('Next Month').''. '   Current Month

'. + '&year='.$todayhash{'year'}. + ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'

'. + ($pickdatemode?'':''). ''); return OK; }