--- loncom/interface/lonannounce.pm	2008/05/18 19:45:46	1.70
+++ loncom/interface/lonannounce.pm	2009/11/04 20:01:24	1.80
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.70 2008/05/18 19:45:46 www Exp $
+# $Id: lonannounce.pm,v 1.80 2009/11/04 20:01:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,12 +38,14 @@ use Apache::lonrss();
 use Apache::lonnet;
 use HTML::Entities();
 use LONCAPA qw(:match);
+use DateTime;
+use DateTime::TimeZone;
 
 my %todayhash;
 my %showedcheck;
 
 sub editfield {
-    my ($r,$start,$end,$text)=@_;
+    my ($r,$start,$end,$text,$crstype)=@_;
     # Deal with date forms
     my $startdateform = &Apache::lonhtmlcommon::date_setter('anno',
                                                             'startdate',
@@ -51,14 +53,21 @@ sub editfield {
     my $enddateform = &Apache::lonhtmlcommon::date_setter('anno',
                                                           'enddate',
                                                           $end);
-    my $help=&Apache::loncommon::help_open_menu('Calendar Add Announcement','Calendar_Add_Announcement',274,'Communication Tools');
-    my %lt=&Apache::lonlocal::texthash('post' => 'Post Announcement',
+    #my $help=&Apache::loncommon::help_open_menu('Calendar Add Announcement','Calendar_Add_Announcement',274,'Communication Tools');
+    my $help=&Apache::loncommon::help_open_topic('Calendar_Add_Announcement');
+    
+    my %lt=&Apache::lonlocal::texthash('annon' => 'Course Announcements',
+                                       'post' => 'Post Announcement',
 				       'start' => 'Starting date',
 				       'end' => 'Ending date',
 				       'incrss' => 'Include in course RSS newsfeed');
+    if ($crstype eq 'Community') {
+        $lt{'anon'} = &mt('Community Announcements');
+        $lt{'incrss'} = &mt('Include in community RSS newsfeed');
+    }
 
     $r->print(<<ENDFORM);
-$help
+<h2>$lt{'annon'} $help</h2>
 <form name="anno" method="post">
 <input type="hidden" value='' name="action" />
 <table><tr><td>$lt{'start'}:</td><td>$startdateform</td></tr>
@@ -292,11 +301,59 @@ sub order {
 }
 
 sub nextday {
-    my %th=@_;
-    $th{'day'}++;
+    my ($tk,%th)=@_;
+    my ($incmonth,$incyear);
+    if ($th{'day'} > 27) {
+        if ($th{'month'} == 2) {
+            if ($th{'day'} == 29) { 
+                $incmonth = 1;
+            } elsif ($th{'day'} == 28) {
+                if (!&is_leap_year($tk)) {
+                   $incmonth = 1;
+                }
+            }
+        } elsif (($th{'month'} == 4) || ($th{'month'} == 6) || 
+                 ($th{'month'} == 9) || ($th{'month'} == 11)) {
+            if ($th{'day'} == 30) {
+                $incmonth = 1;
+            }
+        } elsif ($th{'day'} == 31) {
+            if ($th{'month'} == 12) {
+                $incyear = 1;
+            } else {
+                $incmonth = 1;
+            }
+        }
+        if ($incyear) {
+            $th{'day'} = 1;
+            $th{'month'} = 1;
+            $th{'year'}++;
+        } elsif ($incmonth) {
+            $th{'day'} = 1;
+            $th{'month'}++;
+        } else {
+            $th{'day'}++;
+        }
+    } else {
+        $th{'day'}++;
+    }
     return (&Apache::loncommon::maketime(%th),$th{'month'});
 }
 
+sub is_leap_year {
+    my ($thistime) = @_;
+    my ($is_leap,$timezone,$dt);
+    $timezone = &Apache::lonlocal::gettimezone();
+    eval {
+        $dt = DateTime->from_epoch(epoch => $thistime)
+                      ->set_time_zone($timezone);
+    };
+    if (!$@) {
+        $is_leap = $dt->is_leap_year;
+    }
+    return $is_leap;
+}
+
 sub display_msg {
     my ($msg) = @_;
 
@@ -323,7 +380,7 @@ sub display_msg {
 sub showday {
     my ($tk,$mode,%allcal)=@_;
     my %th=&Apache::loncommon::timehash($tk);
-    my ($nextday,$nextmonth)=&nextday(%th);
+    my ($nextday,$nextmonth)=&nextday($tk,%th);
     my @outp;
     if ($mode) {
 	my $oneday=24*3600;
@@ -362,7 +419,7 @@ sub picklink {
 
 sub dialscript {
     return (<<ENDDIA);
-<script language="Javascript">
+<script type="text/javascript" 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;
@@ -415,6 +472,13 @@ sub output_ics_file {
     $r->print("END:VCALENDAR$crlf");
 }
 
+sub show_timezone {
+    my $tzone = &Apache::lonlocal::gettimezone();
+    my $dt = DateTime->now();
+    my $tz = DateTime::TimeZone->new( name => $tzone );
+    return &mt('([_1] time zone)',$tz->short_name_for_datetime($dt));
+}
+
 sub handler {
     my $r = shift;
     if ($r->uri=~/\.(ics|ical)$/) {
@@ -446,15 +510,18 @@ sub handler {
 	'&element='.$env{'form.element'};
 # --------------------------------------------- Find out first day of the month
 
-    my %firstday=&Apache::loncommon::timehash(
-       &Apache::loncommon::maketime( 'day' => 1, 'month'=> $month,
-                                     'year' => $year, 'hours' => 0,
-				     'minutes' => 0, 'seconds' => 0,
-                                     'dlsav' => -1 ));
+    my $tk = &Apache::loncommon::maketime( 'day' => 1,
+                                           'month'=> $month,
+                                           'year' => $year, 
+                                           'hour' => 0,
+				           'minute' => 0, 
+                                           'second' => 0);
+    my %firstday = &Apache::loncommon::timehash($tk);
     my $weekday=$firstday{'weekday'};
+
 # ------------------------------------------------------------ Print the screen
     my $js = <<ENDDOCUMENT;
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
 
     function trysubmit() {
         document.anno.action.value="new";
@@ -475,8 +542,8 @@ ENDDOCUMENT
 		  &dialscript().
 		  '<font size="1">');
     } else {
-       $r->print(&Apache::loncommon::start_page("Announcements and Calendar",
-						$js));
+        my $brcrum = [{href=>"/adm/announcements",text=>"Announcements and Calendar"}];
+        $r->print(&Apache::loncommon::start_page("Communication",$js,{'bread_crumbs' => $brcrum}));
     }
 # does this user have privileges to post, etc?
     my $allowed=0;
@@ -507,31 +574,32 @@ ENDDOCUMENT
 		}
 	    }
 	}
-	$r->print(<<SERVERANNOUNCE);
-<form name="serveranno" method="post">
-<h3>Post Server Announcements</h3>
-Post announcements to the system login and roles screen<br />
-<i>(leave blank to delete announcement)</i><br />
-<textarea name="serverannnounce" cols="60" rows="5"></textarea><br />
-Check machines:<br />
-SERVERANNOUNCE
+	$r->print('<form name="serveranno" method="post">'
+                 .'<h2>'.&mt('Post Server Announcements').'</h2>'
+                 .&mt('Post announcements to the system login and roles screen').'<br />'
+                 .'<i>'.&mt('(leave blank to delete announcement)').'</i><br />'
+                 .'<textarea name="serverannnounce" cols="60" rows="5"></textarea><br />'
+                 .&mt('Check machines:').'<br />'
+        );
 # list servers
     my %hostname = &Apache::lonnet::all_hostnames();
     foreach my $host (sort(keys(%hostname))) {
 	if (&Apache::lonnet::allowed('psa',
 				     &Apache::lonnet::host_domain($host))) {
-	    $r->print ('<br /><label><input type="checkbox" name="postto_'.$host.'" /> '.
+	    $r->print ('<label><input type="checkbox" name="postto_'.$host.'" /> '.
 		       $host.' <tt>'.$hostname{$host}.'</tt> '.
 		       '</label><a href="http://'.$hostname{$host}.
-		       '/announcement.txt?time='.time.'" target="annowin">current</a>');
+		       '/announcement.txt?time='.time.'" target="annowin">'.
+                       &mt('Current Announcement').'</a><br />');
 	}
     }
     $r->print(
-  '<br /><input type="submit" name="serveraction" value="Post"></form><hr />');
+  '<br /><input type="submit" name="serveraction" value="'.&mt('Post').'" /></form><hr />');
     }
     if ($allowed) {
         my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
         my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $crstype = &Apache::loncommon::course_type();
 # ----------------------------------------------------- Store new submitted one
         if ($env{'form.action'} eq 'new') {
 	    my $startdate = 
@@ -549,7 +617,13 @@ SERVERANNOUNCE
 		$startdate.'_'.$enddate => 
 		    $env{'form.msg'} },$coursedom,$coursenum);
 	    if ($env{'form.rsspost'}) {
-               &Apache::lonrss::addentry($coursenum,$coursedom,'Course_Announcements',
+               my $feed;
+               if ($crstype eq 'Community') {
+                   $feed = 'Community_Announcements';
+               } else {
+                   $feed = 'Course_Announcements';
+               }
+               &Apache::lonrss::addentry($coursenum,$coursedom,$feed,
 					 &mt('Event from [_1] to [_2]',
 					     &Apache::lonlocal::locallocaltime($startdate),
 					     &Apache::lonlocal::locallocaltime($enddate)),
@@ -571,7 +645,7 @@ SERVERANNOUNCE
         $tomorrowhash{'day'}++;
         my $tomorrow=&Apache::loncommon::maketime(%tomorrowhash);
         
-        &editfield($r,$today,$tomorrow,'');
+        &editfield($r,$today,$tomorrow,'',$crstype);
     }
 # ----------------------------------------------------- Summarize all calendars
     my %allcal=&get_all_calendars();
@@ -580,18 +654,21 @@ SERVERANNOUNCE
     if ($pm<1) { ($pm,$py)=(12,$year-1); }
     if ($fm>12){ ($fm,$fy)=(1,$year+1); }
 
-    $r->print('<h1>'.('',&mt('January'),&mt('February'),&mt('March'),
+    $r->print('<h2>'.&mt('Calendar').'</h2>'
+             .'<h3>'.('',&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.'</h1>');
+	              $year.' '.&show_timezone().'</h3>');
 # Reached the end of times, give up
     if (($year<1970) || ($year>2037)) {
-	$r->print('<h3>No calendar available for this date.</h3>'.
- '<a href="/adm/announcements?month='.$todayhash{'month'}.
- '&year='.$todayhash{'year'}.'">Current Month</a>'.
-		  &Apache::loncommon::end_page());
+	$r->print('<p class="LC_warning">'
+                 .&mt('No calendar available for this date.')
+                 .'</p>'
+                 .'<a href="/adm/announcements?month='.$todayhash{'month'}
+                 .'&year='.$todayhash{'year'}.'">'.&mt('Current Month').'</a>'
+		 .&Apache::loncommon::end_page());
 	return OK;
     }
 
@@ -599,6 +676,35 @@ SERVERANNOUNCE
     if ($env{'form.pickdate'} eq 'yes') {
 	$class .= " LC_calendar_pickdate";
     }
+# ------------------------------------------------ Determine first day of a week
+    my $datelocale =  &Apache::lonlocal::getdatelocale();
+    my $days_in_week = 7;
+    my $startweek = 0;
+    if (ref($datelocale)) {
+        $startweek = $datelocale->first_day_of_week();
+        if ($startweek == $days_in_week)  { $startweek = 0; }
+    }
+    my @days = ('Sun','Mon','Tue','Wed','Thu','Fri','Sat');
+    my @localdays;
+    if ($startweek == 0) {
+        @localdays = @days;
+    } else {
+        my $endday = $days_in_week - $startweek;
+        for (my $i=0; $i<$days_in_week; $i++) {
+            if ($i < $endday) {
+                $localdays[$i] = $days[$i+$startweek];
+            } else {
+                $localdays[$i] = $days[$i-$endday];
+            }
+        }
+    }
+
+# ----------------------------------------------------------- Weekday in locale
+    my $loc_weekday = $weekday - $startweek;
+    if ($loc_weekday < 0) {
+        $loc_weekday += $days_in_week; 
+    }
+
     $r->print(
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
@@ -607,43 +713,51 @@ SERVERANNOUNCE
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><p>'.
-        '<table class="'.$class.'" cols="7" rows="5"><tr>
-<th>'.&mt('Sun').'</th>
-<th>'.&mt('Mon').'</th>
-<th>'.&mt('Tue').'</th>
-<th>'.&mt('Wed').'</th>
-<th>'.&mt('Thu').'</th>
-<th>'.&mt('Fri').'</th>
-<th>'.&mt('Sat').'</th></tr>');
+        '<table class="'.$class.'" cols="7" rows="5"><tr>');
+    for (my $i=0; $i<@localdays; $i++) {
+        $r->print('<th>'.&mt($localdays[$i]).'</th>');
+    }
+    $r->print('</tr>');
 
-    my $tk=&Apache::loncommon::maketime(%firstday);
     my $outp;
     my $nm;
 
 # ---------------------------------------------------------------- Actual table
     $r->print('<tr>');
-    for (my $i=0;$i<$weekday;$i++) { $r->print(&emptycell); }
-    for (my $i=$weekday;$i<=6;$i++) { 
+    for (my $i=0;$i<$loc_weekday;$i++) { $r->print(&emptycell); }
+    for (my $i=$loc_weekday;$i<=6;$i++) {
         ($tk,$nm,$outp)=&showday($tk,0,%allcal);
         $r->print($outp);
     }
     $r->print('</tr>');
 
+    my $lastrow = 0;
+    my $lastday = 0;
     for (my $k=0;$k<=4;$k++) {
-        $r->print('<tr>');
-        for (my $i=0;$i<=6;$i++) {
-            ($tk,$nm,$outp)=&showday($tk,0,%allcal);
-            if ($month!=$nm) { $outp=&emptycell; }
-            $r->print($outp);
+        if (!$lastrow) {
+            $r->print('<tr>');
+            for (my $i=0;$i<=6;$i++) {
+                if ($lastday) {
+                    $outp = &emptycell();
+                } else {
+                    my $currtk = $tk;
+                    ($tk,$nm,$outp)=&showday($tk,0,%allcal);
+                    if ($month!=$nm) { $lastday = 1; }
+                }
+                $r->print($outp);
+            }
+            if ($lastday) {
+                $lastrow = 1;
+            }
+            $r->print('</tr>');
         }
-        $r->print('</tr>');
     }
 # ------------------------------------------------------------------- End table
     $r->print('</table>');
 # ----------------------------------------------------------------- Check marks
     undef(%showedcheck);
 # --------------------------------------------------------------- Remove button
-    if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries">'.
+    if ($allowed) { $r->print('<br /><input type="button" onClick="removesub()" value="'.&mt('Remove Checked Entries').'">'.
 			      &Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').'</form>'); }
     $r->print('<p>'.
  '<a href="/adm/announcements?month='.$pm.'&year='.$py.