--- loncom/interface/lonannounce.pm	2006/01/13 15:28:36	1.44
+++ loncom/interface/lonannounce.pm	2006/03/21 20:45:35	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.44 2006/01/13 15:28:36 albertel Exp $
+# $Id: lonannounce.pm,v 1.47 2006/03/21 20:45:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -64,7 +64,7 @@ $help
 <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> -->
+<label><input type="checkbox" name="rsspost" /> $lt{'incrss'}</label>
 <br /><input type="button" onClick="trysubmit()" value="$lt{'post'}" /><hr />
 ENDFORM
 }
@@ -106,12 +106,18 @@ sub readcalendar {
 		my $realm=&mt('All Resources');
 		if ($middle=~/^(.+)\_\_\_\(all\)$/) {
 		    my $map_url=$1;
+		    if (!$can_see_hidden && !$navmap) {
+			next;
+		    }
 		    if (!$can_see_hidden) {
 			my $res = $navmap->getResourceByUrl($map_url);
 			if ($res && $res->randomout()) { next; }
 		    }
 		    $realm=&mt('Folder/Map').': '.&Apache::lonnet::gettitle($map_url);
 		} elsif ($middle) {
+		    if (!$can_see_hidden && !$navmap) {
+			next;
+		    }
 		    if (!$can_see_hidden) {
 			my $res = $navmap->getBySymb($middle);
 			if ($res && $res->randomout()) { next; }
@@ -361,11 +367,8 @@ sub handler {
     my $weekday=$firstday{'weekday'};
 # ------------------------------------------------------------ Print the screen
     my $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<ENDDOCUMENT);
-$html
-<head>
-<title>The LearningOnline Network with CAPA</title>
-<script>
+    my $js = <<ENDDOCUMENT;
+<script type="text/javascript">
 
     function trysubmit() {
         document.anno.action.value="new";
@@ -377,15 +380,17 @@ $html
 	document.anno.submit();
     }
 </script>
-</head>
 ENDDOCUMENT
+
     if ($pickdatemode) {
 # no big header in pickdate mode
-	$r->print(&Apache::loncommon::bodytag("Pick a Date",'','',1).
+	$r->print(&Apache::loncommon::start_page("Pick a Date",$js,
+						 {'only_body' => 1,}).
 		  &dialscript().
 		  '<font size="1">');
     } else {
-       $r->print(&Apache::loncommon::bodytag("Announcements and Calendar"));
+       $r->print(&Apache::loncommon::start_page("Announcements and Calendar",
+						$js));
     }
 # does this user have privileges to post, etc?
     my $allowed=0;
@@ -501,7 +506,8 @@ SERVERANNOUNCE
     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></body></html>');
+ '&year='.$todayhash{'year'}.'">Current Month</a>'.
+		  &Apache::loncommon::end_page());
 	return OK;
     }
     $r->print(
@@ -566,8 +572,7 @@ SERVERANNOUNCE
  '&nbsp;&nbsp;&nbsp;<a href="/adm/announcements?month='.$todayhash{'month'}.
  '&year='.$todayhash{'year'}.
  ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.
- ($pickdatemode?'</font>':'').
- '</body></html>');
+ ($pickdatemode?'</font>':'').&Apache::loncommon::end_page());
     return OK;
 } 
 
