Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	26 Sep 2003 06:54:44 -0000	1.12
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	26 Sep 2003 09:46:42 -0000	1.13
@@ -19,18 +19,58 @@
 %>
 
 <if @config.shaded_p@ ne "t">
-  <if @view@ eq "day">
-  <include src="/packages/calendar/www/view-one-day-display" 
-  base_url=@base_url@
-  date="@date@" start_display_hour=7 end_display_hour=22
-  hour_template="@hour_template;noquote@" item_add_template="@item_add_template;noquote@"
-  prev_nav_template="@previous_link;noquote@"
-  next_nav_template="@next_link;noquote@"
-  calendar_id_list="@list_of_calendar_ids@">
-  </if>
-  <else>
-@cal_stuff;noquote@
-</else>
+ <switch @view@>
+   <case value="day">
+     <include src="/packages/calendar/www/view-one-day-display" 
+     date="@date@" 
+     start_display_hour=7 
+     end_display_hour=22
+     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="list">
+     <include src="/packages/calendar/www/view-list-display" 
+     start_date=@start_date@ 
+     end_date=@end_date@ 
+     date=@current_date@ 
+     period_days=@period_days@
+     calendar_id_list=@list_of_calendar_ids@ 
+     url_template="@url_template;noquote@" 
+     url_stub_callback="@url_stub_callback;noquote@" 
+     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@">
+  </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@">
+  </case>
+ </switch>
+
 </if>
 <else>
 &nbsp;