--- loncom/interface/lonannounce.pm	2012/08/21 14:36:27	1.85
+++ 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.85 2012/08/21 14:36:27 raeburn Exp $
+# $Id: lonannounce.pm,v 1.88 2017/02/16 18:17:49 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,14 +68,14 @@ sub editfield {
 
     $r->print(<<ENDFORM);
 <h2>$lt{'annon'} $help</h2>
-<form name="anno" method="post">
+<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
 }
 
@@ -117,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=~/^\[(.*)\]\./) {
@@ -228,7 +228,7 @@ sub normalcell {
 	       && ($env{'form.pickdate'} ne 'yes')
 	       && (!$internalflag)) {
                $output.='<input type="checkbox" name="remove_'.$start.'_'.
-		   $end.'">';
+		   $end.'" />';
                $showedcheck{$start.'_'.$end}=1;
 	      }
 	    }
@@ -592,7 +592,7 @@ ENDDOCUMENT
             }
             $r->print(&Apache::loncommon::confirmwrapper($message));
         }
-	$r->print('<form name="serveranno" method="post">'
+	$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 />'
@@ -775,7 +775,7 @@ ENDDOCUMENT
 # ----------------------------------------------------------------- Check marks
     undef(%showedcheck);
 # --------------------------------------------------------------- Remove button
-    if ($allowed) { $r->print('<br /><input type="button" onClick="removesub()" value="'.&mt('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.'&amp;year='.$py.