--- loncom/interface/lonannounce.pm	2013/05/25 21:45:42	1.86
+++ 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.86 2013/05/25 21:45:42 raeburn Exp $
+# $Id: lonannounce.pm,v 1.88 2017/02/16 18:17:49 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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;
 	      }
 	    }