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.26 -r1.27
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	15 Dec 2006 22:45:20 -0000	1.26
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp	15 May 2007 20:14:23 -0000	1.27
@@ -17,31 +17,36 @@
     #
 
 %>
+<if @config.shaded_p@ false>
 
-  <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@">
 
-<if @config.shaded_p@ false>
-  <table border="0" width="100%">
+  <table id="valign-hack" border="0" width="100%">
     <tr>
-      <td valign="top">
+      <td valign="top" width="200">
 
 	<include src="/packages/calendar/www/mini-calendar" 
-          base_url="@ad_conn_url@" 
           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/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" title="#calendar-portlet.Add_an_item#">#calendar-portlet.Add_an_item#</a></li></if>
-          <if @admin_p@><li> <a href="calendar/calendar-item-types?calendar_id=@force_calendar_id@" title="#calendar-portlet.Manage_Item_Types#">#calendar-portlet.Manage_Item_Types#</a></li></if>
-        </ul>
       </td>
+
       <td valign=top>
 
+
  <switch @view@>
    <case value="day">
      <include src="/packages/calendar/www/view-one-day-display" 
@@ -51,12 +56,13 @@
      page_num=@page_num@
      hour_template="@hour_template;noquote@" 
      item_template="@item_template;noquote@"
+     calendar_id_list=@list_of_calendar_ids@ 
      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@">
+     return_url="@encoded_return_url;noquote@">
    </case>
 
   <case value="list">
@@ -70,7 +76,7 @@
      url_template="@url_template;noquote@" 
      url_stub_callback="@url_stub_callback;noquote@" 
      page_num=@page_num@
-     sort_by=@sort_by@> 
+     return_url="@encoded_return_url;noquote@">
   </case>
   
   <case value="week">
@@ -82,8 +88,10 @@
      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>
+     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"
@@ -95,15 +103,18 @@
      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@">
+     show_calendar_name_p="@show_calendar_name_p;noquote@"
+     return_url="@encoded_return_url;noquote@"
+     export=@export@>
   </case>
  </switch>
       </td>
     </tr>
   </table>
+
 </if>
 <else>
-  <br>
+  <small>
+    #new-portal.when_portlet_shaded#
+  </small>
 </else>
-
-