Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	26 Sep 2003 09:46:42 -0000	1.20
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	26 Sep 2003 12:27:23 -0000	1.21
@@ -22,12 +22,19 @@
     @import "/resources/calendar/calendar.css";
   </style>
 
-<if @config.shaded_p@ ne "t">
-  <table border=0 width="100%">
+<if @config.shaded_p@ false>
+  <table border="0" width="100%">
     <tr>
-      <td valign=top width=180>
-	<include src="/packages/calendar/www/mini-calendar" base_url="@base_url@" view="@view@" date="@date@" page_num=@page_num@>
+      <td valign="top">
+
+	<include src="/packages/calendar/www/mini-calendar" 
+          base_url="@base_url@" 
+          view="@view@" 
+          date="@date@" 
+          page_num="@page_num@">
+
         <p align="left">
+
         <ul align="left">
           <if @create_p@><li> <a href="calendar/cal-item-new?date=@current_date@&start_time=&end_time=&time_p=1">#calendar-portlet.Add_an_item#</a></if>
           <if @admin_p@><li> <a href="calendar/calendar-item-types?calendar_id=@force_calendar_id@">#calendar-portlet.Manage_Item_Types#</a></if>
@@ -60,6 +67,7 @@
      calendar_id_list=@list_of_calendar_ids@ 
      url_template="@url_template;noquote@" 
      url_stub_callback="@url_stub_callback;noquote@" 
+     page_num=@page_num@
      sort_by=@sort_by@> 
   </case>
   
Index: openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp	26 Sep 2003 09:46:42 -0000	1.5
+++ openacs-4/packages/calendar-portlet/www/calendar-list-portlet.adp	26 Sep 2003 12:27:23 -0000	1.6
@@ -18,12 +18,17 @@
 
 %>
 
+<style type="text/css" media="all">
+  @import "/resources/calendar/calendar.css";
+</style>
+
 <if @config.shaded_p@ ne "t">
   <include src="/packages/calendar/www/view-list-display" 
   start_date=@start_date@ 
   end_date=@end_date@ 
   date=@current_date@ 
   period_days=@period_days@
+  page_num=@page_num@
   calendar_id_list=@list_of_calendar_ids@ 
   url_template="@url_template;noquote@" 
   url_stub_callback="@url_stub_callback;noquote@" 
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.13 -r1.14
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	26 Sep 2003 09:46:42 -0000	1.13
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.adp	26 Sep 2003 12:27:23 -0000	1.14
@@ -19,6 +19,10 @@
 %>
 
 <if @config.shaded_p@ ne "t">
+  <style type="text/css" media="all">
+    @import "/resources/calendar/calendar.css";
+  </style>
+
  <switch @view@>
    <case value="day">
      <include src="/packages/calendar/www/view-one-day-display" 
@@ -35,43 +39,43 @@
      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="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@ 
+      page_num=@page_num@
+      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>
-
+    <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;
+  &nbsp;
 </else>