Index: openacs-4/packages/calendar-includelet/lib/calendar-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-includelet.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar-includelet/lib/calendar-includelet.adp	30 Jul 2008 11:50:21 -0000	1.1
+++ openacs-4/packages/calendar-includelet/lib/calendar-includelet.adp	8 Sep 2008 20:13:37 -0000	1.2
@@ -3,57 +3,42 @@
 </style>
 
  <switch @view@>
- <case value="day">
-   <include src="/packages/calendar/www/view-one-day-display" 
-   date="@date@" 
-   start_display_hour=7 
-   end_display_hour=22
-   page_num=@page_num@
-   hour_template="@hour_template;noquote@" 
-   item_template="@item_template;noquote@"
-   item_add_template="@item_add_template;noquote@"
-   prev_nav_template="@previous_link;noquote@"
-   next_nav_template="@next_link;noquote@"
-   base_url="@base_url@calendar/"
-   url_stub_callback="@url_stub_callback;noquote@" 
-   calendar_id_list="@list_of_calendar_ids@">
- </case>
+   <case value="day">
+     <include src="/packages/calendar/www/view-one-day-display" 
+       date="@date@" 
+       start_display_hour="7"
+       end_display_hour="22"
+       page_num="@page_num@"
+       base_url="@base_url@"
+       calendar_url="@calendar_url@"
+       calendar_id_list="@calendar_id@">
+   </case>
 
   <case value="list">
     <include src="/packages/calendar/www/view-list-display" 
-    start_date=@start_date@ 
-    end_date=@end_date@ 
-    date=@current_date@ 
-    period_days=@period_days@
-    item_template="@item_template;noquote@"
-    calendar_id_list=@list_of_calendar_ids@ 
-    page_num=@page_num@
-    url_template="@url_template;noquote@" 
-    url_stub_callback="@url_stub_callback;noquote@" 
-    sort_by=@sort_by@> 
+      start_date="@start_date@"
+      end_date="@end_date@"
+      date="@date@"
+      period_days="@period_days@"
+      calendar_id_list="@calendar_id@"
+      page_num="@page_num@"
+      sort_by="@sort_by@"> 
   </case>
  
   <case value="week">
     <include src="/packages/calendar/www/view-week-display" 
-    date="@current_date@"
-    calendar_id_list=@list_of_calendar_ids@ 
-    base_url="@base_url@calendar/"
-    item_template="@item_template;noquote@"
-    page_num=@page_num@
-    prev_week_template="@prev_week_template;noquote@"
-    next_week_template="@next_week_template;noquote@"
-    url_stub_callback="@url_stub_callback;noquote@">
+      date="@date@"
+      calendar_id_list="@calendar_id@"
+      page_num="@page_num@"
+      calendar_url="@calendar_url@">
   </case>
 
   <case value="month">
     <include src="/packages/calendar/www/view-month-display"
-    date=@current_date@
-    calendar_id_list=@list_of_calendar_ids@ 
-    item_template="@item_template;noquote@"
-    base_url="@base_url@calendar/"
-    page_num=@page_num@
-    prev_month_template="@prev_month_template;noquote@"
-    next_month_template="@next_month_template;noquote@"
-    url_stub_callback="@url_stub_callback;noquote@">
+      date="@date@"
+      calendar_id_list="@calendar_id@"
+      base_url="@base_url@calendar/"
+      page_num="@page_num@"
+      calendar_url="@calendar_url@">
   </case>
 </switch>