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.17 -r1.18
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	15 May 2007 20:14:23 -0000	1.17
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	11 Sep 2008 14:13:42 -0000	1.18
@@ -27,13 +27,7 @@
      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_url="@calendar_url@"
      calendar_id_list="@list_of_calendar_ids@">
    </case>
 
@@ -46,38 +40,28 @@
       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@" 
+      calendar_url="@calendar_url@"
       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@"
+      calendar_url="@calendar_url@"
       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@"
-      url_stub_callback="@url_stub_callback;noquote@">
     </case>
   </switch>
 </if>
 <else>
   <small>
     #new-portal.when_portlet_shaded#
   </small>
-</else>
\ No newline at end of file
+</else>