--- loncom/interface/lonannounce.pm 2009/11/04 20:01:24 1.80
+++ loncom/interface/lonannounce.pm 2010/02/13 16:47:38 1.81
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Announce
#
-# $Id: lonannounce.pm,v 1.80 2009/11/04 20:01:24 raeburn Exp $
+# $Id: lonannounce.pm,v 1.81 2010/02/13 16:47:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -420,6 +420,7 @@ sub picklink {
sub dialscript {
return (<
+//
ENDDIA
}
@@ -506,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='&pickdate=yes&formname='.$env{'form.formname'}.
+ '&element='.$env{'form.element'};
# --------------------------------------------- Find out first day of the month
my $tk = &Apache::loncommon::maketime( 'day' => 1,
@@ -522,6 +524,7 @@ sub handler {
# ------------------------------------------------------------ Print the screen
my $js = <
+//
ENDDOCUMENT
@@ -667,7 +671,7 @@ ENDDOCUMENT
.&mt('No calendar available for this date.')
.'
'
.''.&mt('Current Month').''
+ .'&year='.$todayhash{'year'}.'">'.&mt('Current Month').''
.&Apache::loncommon::end_page());
return OK;
}
@@ -706,14 +710,14 @@ ENDDOCUMENT
}
$r->print(
- ''.&mt('Previous Month').' '.
- ''.&mt('Next Month').''.
' '.&mt('Current Month').''.
- '
');
+ '&year='.$todayhash{'year'}.
+ ($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').''.
+ '
');
for (my $i=0; $i<@localdays; $i++) {
$r->print(''.&mt($localdays[$i]).' | ');
}
@@ -753,22 +757,23 @@ ENDDOCUMENT
}
}
# ------------------------------------------------------------------- End table
- $r->print('
');
+ $r->print('
');
# ----------------------------------------------------------------- Check marks
undef(%showedcheck);
# --------------------------------------------------------------- Remove button
if ($allowed) { $r->print('
'.
&Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').''); }
$r->print(''.
- ''.&mt('Previous Month').' '.
- ''.&mt('Next Month').''.
' '.&mt('Current Month').'
'.
- ($pickdatemode?'':'').&Apache::loncommon::end_page());
- $r->print(''.&mt('Download your Calendar as iCalendar File').'');
+ ($pickdatemode?'':'').
+ ''.&mt('Download your Calendar as iCalendar File').''.
+ &Apache::loncommon::end_page());
return OK;
}