--- loncom/interface/lonannounce.pm	2008/09/20 22:18:05	1.71.2.1
+++ loncom/interface/lonannounce.pm	2008/12/15 16:37:44	1.76
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.71.2.1 2008/09/20 22:18:05 raeburn Exp $
+# $Id: lonannounce.pm,v 1.76 2008/12/15 16:37:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,14 +53,17 @@ sub editfield {
     my $enddateform = &Apache::lonhtmlcommon::date_setter('anno',
                                                           'enddate',
                                                           $end);
-    my $help=&Apache::loncommon::help_open_menu('Calendar Add Announcement','Calendar_Add_Announcement',274,'Communication Tools');
-    my %lt=&Apache::lonlocal::texthash('post' => 'Post Announcement',
+    #my $help=&Apache::loncommon::help_open_menu('Calendar Add Announcement','Calendar_Add_Announcement',274,'Communication Tools');
+    my $help=&Apache::loncommon::help_open_topic('Calendar_Add_Announcement');
+    
+    my %lt=&Apache::lonlocal::texthash('annon' => 'Course Announcements',
+                                       'post' => 'Post Announcement',
 				       'start' => 'Starting date',
 				       'end' => 'Ending date',
 				       'incrss' => 'Include in course RSS newsfeed');
 
     $r->print(<<ENDFORM);
-$help
+<h2>$lt{'annon'} $help</h2>
 <form name="anno" method="post">
 <input type="hidden" value='' name="action" />
 <table><tr><td>$lt{'start'}:</td><td>$startdateform</td></tr>
@@ -535,8 +538,8 @@ ENDDOCUMENT
 		  &dialscript().
 		  '<font size="1">');
     } else {
-       $r->print(&Apache::loncommon::start_page("Announcements and Calendar",
-						$js));
+        my $brcrum = [{href=>"/adm/announcements",text=>"Announcements and Calendar"}];
+        $r->print(&Apache::loncommon::start_page("Announcements and Calendar",$js,{'bread_crumbs' => $brcrum}));
     }
 # does this user have privileges to post, etc?
     my $allowed=0;
@@ -567,27 +570,27 @@ ENDDOCUMENT
 		}
 	    }
 	}
-	$r->print(<<SERVERANNOUNCE);
-<form name="serveranno" method="post">
-<h3>Post Server Announcements</h3>
-Post announcements to the system login and roles screen<br />
-<i>(leave blank to delete announcement)</i><br />
-<textarea name="serverannnounce" cols="60" rows="5"></textarea><br />
-Check machines:<br />
-SERVERANNOUNCE
+	$r->print('<form name="serveranno" method="post">'
+                 .'<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 />'
+                 .'<textarea name="serverannnounce" cols="60" rows="5"></textarea><br />'
+                 .&mt('Check machines:').'<br />'
+        );
 # list servers
     my %hostname = &Apache::lonnet::all_hostnames();
     foreach my $host (sort(keys(%hostname))) {
 	if (&Apache::lonnet::allowed('psa',
 				     &Apache::lonnet::host_domain($host))) {
-	    $r->print ('<br /><label><input type="checkbox" name="postto_'.$host.'" /> '.
+	    $r->print ('<label><input type="checkbox" name="postto_'.$host.'" /> '.
 		       $host.' <tt>'.$hostname{$host}.'</tt> '.
 		       '</label><a href="http://'.$hostname{$host}.
-		       '/announcement.txt?time='.time.'" target="annowin">current</a>');
+		       '/announcement.txt?time='.time.'" target="annowin">'.
+                       &mt('Current Announcement').'</a><br />');
 	}
     }
     $r->print(
-  '<br /><input type="submit" name="serveraction" value="Post"></form><hr />');
+  '<br /><input type="submit" name="serveraction" value="'.&mt('Post').'"></form><hr />');
     }
     if ($allowed) {
         my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
@@ -640,18 +643,21 @@ SERVERANNOUNCE
     if ($pm<1) { ($pm,$py)=(12,$year-1); }
     if ($fm>12){ ($fm,$fy)=(1,$year+1); }
 
-    $r->print('<h1>'.('',&mt('January'),&mt('February'),&mt('March'),
+    $r->print('<h2>'.&mt('Calendar').'</h2>'
+             .'<h3>'.('',&mt('January'),&mt('February'),&mt('March'),
 		      &mt('April'),&mt('May'),
 		      &mt('June'),&mt('July'),&mt('August'),
                       &mt('September'),&mt('October'),
                       &mt('November'),&mt('December'))[$month].' '.
-	              $year.' '.&show_timezone().'</h1>');
+	              $year.' '.&show_timezone().'</h3>');
 # Reached the end of times, give up
     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>'.
-		  &Apache::loncommon::end_page());
+	$r->print('<p class="LC_warning">'
+                 .&mt('No calendar available for this date.')
+                 .'</p>'
+                 .'<a href="/adm/announcements?month='.$todayhash{'month'}
+                 .'&year='.$todayhash{'year'}.'">'.&mt('Current Month').'</a>'
+		 .&Apache::loncommon::end_page());
 	return OK;
     }
 
@@ -660,8 +666,7 @@ SERVERANNOUNCE
 	$class .= " LC_calendar_pickdate";
     }
 # ------------------------------------------------ Determine first day of a week
-#    my $datelocale =  &Apache::lonlocal::getdatelocale();
-    my $datelocale;
+    my $datelocale =  &Apache::lonlocal::getdatelocale();
     my $days_in_week = 7;
     my $startweek = 0;
     if (ref($datelocale)) {
@@ -703,7 +708,6 @@ SERVERANNOUNCE
     }
     $r->print('</tr>');
 
-    my $tk=&Apache::loncommon::maketime(%firstday);
     my $outp;
     my $nm;
 
@@ -742,7 +746,7 @@ SERVERANNOUNCE
 # ----------------------------------------------------------------- Check marks
     undef(%showedcheck);
 # --------------------------------------------------------------- Remove button
-    if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="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.'&year='.$py.