--- loncom/interface/lonannounce.pm	2008/09/19 03:27:04	1.71
+++ loncom/interface/lonannounce.pm	2017/02/16 18:17:49	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.71 2008/09/19 03:27:04 raeburn Exp $
+# $Id: lonannounce.pm,v 1.88 2017/02/16 18:17:49 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,7 +45,7 @@ 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',
@@ -53,22 +53,29 @@ 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{'annon'} = &mt('Community Announcements');
+        $lt{'incrss'} = &mt('Include in community RSS newsfeed');
+    }
 
     $r->print(<<ENDFORM);
-$help
-<form name="anno" method="post">
+<h2>$lt{'annon'} $help</h2>
+<form name="anno" method="post" action="">
 <input type="hidden" value='' name="action" />
 <table><tr><td>$lt{'start'}:</td><td>$startdateform</td></tr>
 <tr><td>$lt{'end'}:</td><td>$enddateform</td></tr></table>
 <textarea name="msg" rows="4" cols="60">$text</textarea>
 <br />
 <label><input type="checkbox" name="rsspost" /> $lt{'incrss'}</label>
-<br /><input type="button" onClick="trysubmit()" value="$lt{'post'}" /><hr />
+<br /><input type="button" onclick="trysubmit()" value="$lt{'post'}" /><hr />
 ENDFORM
 }
 
@@ -110,7 +117,7 @@ sub readcalendar {
     foreach my $thiskey (keys(%$resourcedata)) {
 	if ($resourcedata->{$thiskey.'.type'}=~/^date/) {
 	    my ($course,$middle,$part,$name)=
-		($thiskey=~/^(\Q$courseid\E)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);
+		($thiskey=~/^(\Q$courseid\E)\.(?:(.+)\.)*([\w\s\-]+)\.(\w+)$/);
 
 	    my %data = ( 'section' => &mt('All Students'));
 	    if ($middle=~/^\[(.*)\]\./) {
@@ -221,7 +228,7 @@ sub normalcell {
 	       && ($env{'form.pickdate'} ne 'yes')
 	       && (!$internalflag)) {
                $output.='<input type="checkbox" name="remove_'.$start.'_'.
-		   $end.'">';
+		   $end.'" />';
                $showedcheck{$start.'_'.$end}=1;
 	      }
 	    }
@@ -412,7 +419,8 @@ sub picklink {
 
 sub dialscript {
     return (<<ENDDIA);
-<script language="Javascript">
+<script type="text/javascript" language="JavaScript">
+// <![CDATA[
 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;
@@ -424,6 +432,7 @@ function dialin(day,month,year) {
     opener.$env{'form.element'}\_checkday();
     self.close();
 }
+// ]]>
 </script>
 ENDDIA
 }
@@ -499,8 +508,8 @@ sub handler {
 
 # ---------------------------------------------- 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'};
+    my $pickinfo='&amp;pickdate=yes&amp;formname='.$env{'form.formname'}.
+	'&amp;element='.$env{'form.element'};
 # --------------------------------------------- Find out first day of the month
 
     my $tk = &Apache::loncommon::maketime( 'day' => 1,
@@ -514,7 +523,8 @@ sub handler {
 
 # ------------------------------------------------------------ Print the screen
     my $js = <<ENDDOCUMENT;
-<script type="text/javascript">
+<script type="text/javascript" language="JavaScript">
+// <![CDATA[
 
     function trysubmit() {
         document.anno.action.value="new";
@@ -525,6 +535,7 @@ sub handler {
         document.anno.action.value="del";
 	document.anno.submit();
     }
+// ]]>
 </script>
 ENDDOCUMENT
 
@@ -535,8 +546,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;
@@ -558,40 +569,55 @@ ENDDOCUMENT
     }
 # ------------------------------------------------------------ Process commands
     if ($serverpost) {
-	if ($env{'form.serveraction'}) {
-	    foreach my $key (keys(%env)) {
-		if ($key=~/^form\.postto\_(\w+)/) {
-		    $r->print( 
-			'<br />Posting '.$1.': '.&Apache::lonnet::postannounce
-			($1,$env{'form.serverannnounce'}));
-		}
-	    }
-	}
-	$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
+        if ($env{'form.serveraction'}) {
+            my $rc;
+            my $message;
+            foreach my $key (keys(%env)) {
+                if ($key=~/^form\.postto\_(\w+[\w\-]*)/) {
+                     $rc = &Apache::lonnet::postannounce
+                           ($1,$env{'form.serverannnounce'});
+                    if ($rc eq 'ok') {
+                        $message .= 
+                            &Apache::lonhtmlcommon::confirm_success(
+                                &mt('Announcement posted to [_1]',$1))
+                               .'<br />';
+                    } else {
+                        $message .=
+                            &Apache::lonhtmlcommon::confirm_success(
+                                &mt('Posting announcement to [_1] failed: [_2]'
+                                    ,$1,$rc), 1)
+                               .'<br />';
+                    }
+                }
+            }
+            $r->print(&Apache::loncommon::confirmwrapper($message));
+        }
+	$r->print('<form name="serveranno" method="post" action="">'
+                 .'<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 = 
@@ -609,7 +635,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)),
@@ -631,7 +663,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();
@@ -640,18 +672,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.' '.&show_timezone().'</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'}
+                 .'&amp;year='.$todayhash{'year'}.'">'.&mt('Current Month').'</a>'
+		 .&Apache::loncommon::end_page());
 	return OK;
     }
 
@@ -689,20 +724,19 @@ SERVERANNOUNCE
     }
 
     $r->print(
- '<a href="/adm/announcements?month='.$pm.'&year='.$py.
+ '<a href="/adm/announcements?month='.$pm.'&amp;year='.$py.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
- '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
+ '<a href="/adm/announcements?month='.$fm.'&amp;year='.$fy.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
  '&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>');
+ '&amp;year='.$todayhash{'year'}.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><div>'.
+        '<table class="'.$class.'"><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;
 
@@ -737,22 +771,23 @@ SERVERANNOUNCE
         }
     }
 # ------------------------------------------------------------------- End table
-    $r->print('</table>');
+    $r->print('</table></div>');
 # ----------------------------------------------------------------- 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.
+ '<a href="/adm/announcements?month='.$pm.'&amp;year='.$py.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
- '<a href="/adm/announcements?month='.$fm.'&year='.$fy.
+ '<a href="/adm/announcements?month='.$fm.'&amp;year='.$fy.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
- '&year='.$todayhash{'year'}.
+ '&amp;year='.$todayhash{'year'}.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.
- ($pickdatemode?'</font>':'').&Apache::loncommon::end_page());
-    $r->print('<a href="/adm/announcements.ics">'.&mt('Download your Calendar as iCalendar File').'</a>');
+ ($pickdatemode?'</font>':'').
+ '<a href="/adm/announcements.ics">'.&mt('Download your Calendar as iCalendar File').'</a>'.
+    &Apache::loncommon::end_page());
     return OK;
 }