Index: openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.adp	14 Aug 2008 19:46:07 -0000	1.2
+++ openacs-4/packages/calendar-includelet/lib/calendar-full-includelet.adp	1 Sep 2008 00:51:02 -0000	1.3
@@ -1,81 +1,91 @@
-  <style type="text/css" media="all">
-    @import "/resources/calendar/calendar.css";
-  </style>
+<include src="/packages/calendar/www/navbar"
+  date="@date@"
+  period_days="@period_days@"
+  base_url="@ad_conn_url@"
+  page_num="@page_num@"
+  view="@view@">
 
-<table border="0" width="100%">
+<table id="valign-hack" border="0" width="100%">
   <tr>
-    <td valign="top">
+    <td valign="top" style="width: 200px">
 
-	<include src="/packages/calendar/www/mini-calendar" 
-        base_url="@ad_conn_url@" 
+      <include src="/packages/calendar/www/mini-calendar" 
         view="@view@" 
         date="@date@" 
         page_num="@page_num@">
+ 
+      <if @create_p@> 
+        <a href="@add_item_url@" title="#calendar-portlet.Add_an_item#" class="button">#calendar-portlet.Add_an_item#</a>
+      </if>
+      <if @admin_p@>
+        <a href="@calendar_url@calendar-item-types?calendar_id=@force_calendar_id@" title="#calendar-portlet.Manage_Item_Types#" class="button">#calendar-portlet.Manage_Item_Types#</a>
+      </if>
 
-      <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-includelet.Add_an_item#</a></if>
-        <if @admin_p@><li> <a href="calendar/calendar-item-types?calendar_id=@force_calendar_id@">#calendar-includelet.Manage_Item_Types#</a></if>
-      </ul>
     </td>
+
     <td valign=top>
 
- <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>
+      <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@"
+           calendar_id_list=@calendar_id@ 
+           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@" 
+           return_url="@encoded_return_url;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@
-   item_template="@item_template;noquote@"
-   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>
+        <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=@calendar_id@ 
+           url_template="@url_template;noquote@" 
+           url_stub_callback="@url_stub_callback;noquote@" 
+           page_num=@page_num@
+           return_url="@encoded_return_url;noquote@">
+        </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="week">
+           <include src="/packages/calendar/www/view-week-display" 
+           date="@current_date@"
+           calendar_id_list=@calendar_id@ 
+           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@"
+           return_url="@encoded_return_url;noquote@"
+           url_stub_callback="@url_stub_callback;noquote@"
+           export=@export@>
+         </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>
+        <case value="month">
+           <include src="/packages/calendar/www/view-month-display"
+           date=@current_date@
+           calendar_id_list=@calendar_id@ 
+           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@"
+           show_calendar_name_p="@show_calendar_name_p;noquote@"
+           return_url="@encoded_return_url;noquote@"
+           export=@export@>
+        </case>
+      </switch>
     </td>
   </tr>
 </table>