Index: openacs-4/packages/calendar/www/mini-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.tcl,v
diff -u -N -r1.16.2.3 -r1.16.2.4
--- openacs-4/packages/calendar/www/mini-calendar.tcl	9 Mar 2007 17:18:30 -0000	1.16.2.3
+++ openacs-4/packages/calendar/www/mini-calendar.tcl	11 Mar 2007 01:05:53 -0000	1.16.2.4
@@ -6,7 +6,7 @@
     set date [dt_sysdate]
 } 
 
-ad_form -name go-to-date -method get -has_submit 1 -action $base_url  -export [lappend list_of_vars page_num] -form {
+ad_form -name go-to-date -method get -has_submit 1 -action $base_url  -export [lappend list_of_vars page_num] -html {class inline-form} -form {
     {date:text,nospell,optional
 	{label ""}
 	{html {size 10}}
@@ -208,4 +208,4 @@
     {new_date:date
         {label ""}
         {format {MM DD YYYY}}}
-}
\ No newline at end of file
+}
Index: openacs-4/packages/calendar/www/view-week-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.adp,v
diff -u -N -r1.13.2.3 -r1.13.2.4
--- openacs-4/packages/calendar/www/view-week-display.adp	9 Mar 2007 19:29:17 -0000	1.13.2.3
+++ openacs-4/packages/calendar/www/view-week-display.adp	11 Mar 2007 01:05:53 -0000	1.13.2.4
@@ -1,11 +1,17 @@
 <table class="cal-table-display" cellpadding="1" cellspacing="2" width="99%">
 <tr>
-	<td align="center">
+	<td>
+		<table width="@week_width@@width_units@">
+			<tr>
+				<td align="center">
 		<h1>
 		  <a href="@previous_week_url@" title="#calendar.prev_week#"><img src="/resources/calendar/images/left.gif" alt="#calendar.prev_week#"/></a>
 		  &nbsp;#calendar.Week_of# @week_start_month@ @week_start_day@ @week_start_year@ &ndash; @week_end_month@ @week_end_day@ @week_end_year@&nbsp;
 		  <a href="@next_week_url@" title="#calendar.next_week#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_week#" /></a>
 		</h1>
+              </td>
+          </tr>
+        </table>
 	</td>
 </tr>
 <tr>
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -N -r1.29.2.3 -r1.29.2.4
--- openacs-4/packages/calendar/www/view.adp	10 Mar 2007 19:44:46 -0000	1.29.2.3
+++ openacs-4/packages/calendar/www/view.adp	11 Mar 2007 01:05:53 -0000	1.29.2.4
@@ -6,10 +6,7 @@
 
 <include src="/packages/calendar/www/navbar" view="@view@" base_url="@ad_conn_url@" date="@date@">
 
-  <table id="valign-hack" border="0" width="100%">
-    <tr>
-      <td valign="top" width="200">
-<!--  <div id="viewadp-mini-calendar"> -->
+  <div id="viewadp-mini-calendar">
     <if @view@ eq "list">
       <include src="mini-calendar" base_url="view" view="@view@" date="@date@" period_days="@period_days@">
     </if>
@@ -32,11 +29,9 @@
     <p>
     <include src="cal-options">	
     </p>
-<!--   </div> -->
-            </td>
+   </div>
 
-      <td valign=top>
-<!--  <div id="events">    -->
+  <div id="events">
     <if @view@ eq "list">
       <include src="view-list-display" start_date=@start_date@ return_url="@return_url@"
       end_date=@end_date@ date=@date@ period_days=@period_days@ sort_by=@sort_by@
@@ -58,7 +53,4 @@
       <include src="view-month-display" date=@date@ return_url="@return_url@"
       show_calendar_name_p=@show_calendar_name_p@>
     </if>
-<!--   </div> -->
-            </td>
-          </tr>
-        </table>
+   </div>