[LON-CAPA-cvs] cvs: loncom /interface lonannounce.pm

albertel lon-capa-cvs@mail.lon-capa.org
Tue, 21 Mar 2006 20:45:35 -0000


albertel		Tue Mar 21 15:45:35 2006 EDT

  Modified files:              
    /loncom/interface	lonannounce.pm 
  Log:
  - start_page
  
  
Index: loncom/interface/lonannounce.pm
diff -u loncom/interface/lonannounce.pm:1.46 loncom/interface/lonannounce.pm:1.47
--- loncom/interface/lonannounce.pm:1.46	Wed Mar 15 16:55:43 2006
+++ loncom/interface/lonannounce.pm	Tue Mar 21 15:45:35 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Announce
 #
-# $Id: lonannounce.pm,v 1.46 2006/03/15 21:55:43 albertel Exp $
+# $Id: lonannounce.pm,v 1.47 2006/03/21 20:45:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -367,11 +367,8 @@
     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";
@@ -383,15 +380,17 @@
 	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;
@@ -507,7 +506,8 @@
     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(
@@ -572,8 +572,7 @@
  '&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;
 }