--- loncom/interface/lonannounce.pm 2006/01/12 23:36:45 1.43
+++ loncom/interface/lonannounce.pm 2006/03/23 22:32:10 1.48
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Announce
#
-# $Id: lonannounce.pm,v 1.43 2006/01/12 23:36:45 albertel Exp $
+# $Id: lonannounce.pm,v 1.48 2006/03/23 22:32:10 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -64,7 +64,7 @@ $help
| $lt{'end'}: | $enddateform |
-
+
ENDFORM
}
@@ -106,15 +106,21 @@ 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->randomout()) { next; }
+ 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->randomout()) { next; }
+ if ($res && $res->randomout()) { next; }
}
$realm=&mt('Resource').': '.&Apache::lonnet::gettitle($middle);
}
@@ -360,12 +366,8 @@ sub handler {
'dlsav' => -1 ));
my $weekday=$firstday{'weekday'};
# ------------------------------------------------------------ Print the screen
- my $html=&Apache::lonxml::xmlbegin();
- $r->print(<
-The LearningOnline Network with CAPA
-
-
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().
'');
} 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 +505,8 @@ SERVERANNOUNCE
if (($year<1970) || ($year>2037)) {
$r->print('No calendar available for this date.
'.
'Current Month