Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/calendar/www/view.adp	16 Aug 2006 17:52:14 -0000	1.29
+++ openacs-4/packages/calendar/www/view.adp	15 May 2007 20:14:21 -0000	1.30
@@ -1,9 +1,11 @@
 <master>
 <property name="title">#calendar.Calendars#</property>
-
 <property name="header_stuff">
   <link href="/resources/calendar/calendar.css" rel="stylesheet" type="text/css">
 </property>
+
+<include src="/packages/calendar/www/navbar" view="@view@" base_url="@ad_conn_url@" date="@date@">
+
   <div id="viewadp-mini-calendar">
     <if @view@ eq "list">
       <include src="mini-calendar" base_url="view" view="@view@" date="@date@" period_days="@period_days@">
@@ -12,32 +14,30 @@
       <include src="mini-calendar" base_url="view" view="@view@" date="@date@">
     </else>
     <p>
-    <a href="cal-item-new?date=@date@&view=@view@&return_url=@return_url;noquote@" title="#calendar.Add_Item#">
-    <img border=0 align="left" valign="top" src="/resources/acs-subsite/add.gif" alt="#calendar.Add_Item#">#calendar.Add_Item#</a>
+    <a href="@add_item_url@" title="#calendar.Add_Item#"><img border=0 align="left" src="/resources/acs-subsite/add.gif" alt="">#calendar.Add_Item#</a>
     </p>
   
     <p>
     @notification_chunk;noquote@
     </p>
     <p>
     <if @admin_p@ true>
-      <a href="admin/">#calendar.lt_Calendar_Administrati#</a>
+      <a href="admin/" title="#calendar.lt_Calendar_Administrati#">#calendar.lt_Calendar_Administrati#</a>
     </if>
     </p>
   
     <p>
     <include src="cal-options">	
     </p>
-  </div>
+   </div>
 
-  <div id="events">   
+  <div id="events">
     <if @view@ eq "list">
       <include src="view-list-display" start_date=@start_date@ return_url="@return_url@"
       end_date=@end_date@ date=@date@ period_days=@period_days@ sort_by=@sort_by@
-      show_calendar_name_p=@show_calendar_name_p@> 
+      show_calendar_name_p=@show_calendar_name_p@ export=@export@> 
     </if>
-    
-    
+
     <if @view@ eq "day">
       <include src="view-one-day-display" date="@date@" start_hour=0 end_hour=23 return_url="@return_url@"
       show_calendar_name_p=@show_calendar_name_p@>
@@ -53,6 +53,4 @@
       <include src="view-month-display" date=@date@ return_url="@return_url@"
       show_calendar_name_p=@show_calendar_name_p@>
     </if>
-  </div>
-
-
+   </div>