Index: openacs-4/packages/calendar/www/cal-item-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/calendar/www/cal-item-new.adp	11 Dec 2003 21:39:59 -0000	1.14
+++ openacs-4/packages/calendar/www/cal-item-new.adp	15 Feb 2004 12:16:23 -0000	1.15
@@ -37,22 +37,13 @@
   }
 </script>
 
-<table width="95%">
+  <div id="viewadp-mini-calendar">
+    <include src="mini-calendar" base_url="view" view="@view@" date="@ansi_date@">
+  </div>
 
-  <tr>
-    <td valign=top width=150>
-      <p>
-      <include src="mini-calendar" base_url="view" view="day" date="@ansi_date@">
-      <p>
-	<include src="cal-options" calendar_list="@calendar_list;noquote@">	
-    </td>	
-
-    <td valign=top> 
+  <div id="events">   
     <formtemplate id="cal_item"></formtemplate>
-
-    </td>
-  </tr>
-</table>
+  </div>
 </if>
 
 <script language="JavaScript">
Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/calendar/www/cal-item-new.tcl	10 Jan 2004 18:59:50 -0000	1.22
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	15 Feb 2004 12:16:23 -0000	1.23
@@ -14,6 +14,7 @@
     {julian_date ""}
     {start_time ""}
     {end_time ""}
+    {view "month"}
 }
 auth::require_login
 
Index: openacs-4/packages/calendar/www/view-month-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/calendar/www/view-month-display.adp	30 Dec 2003 23:30:09 -0000	1.10
+++ openacs-4/packages/calendar/www/view-month-display.adp	15 Feb 2004 12:16:25 -0000	1.11
@@ -1,17 +1,9 @@
-<table CELLPADDING=0 CELLSPACING=0 width="100%">
+<table cellpadding="0" cellspacing="0" width="100%">
   <tr>
-    <td class="cla-no-border" colspan="7">
-
-      <table width="100%" cellpadding=0 cellspacing=0 border=0 class="cal-table-display">
-        <tr class="cal-table-header" bgcolor=lavender>
-          <td class="cal-month-title-text">
-            @prev_month_url;noquote@
-            <b>@month_string@ @year@</b>
-            @next_month_url;noquote@
-          </td>
-        </tr>
-      </table>
-
+    <td class="cal-month-title-text" colspan="7">
+      @prev_month_url;noquote@
+      @month_string@ @year@
+      @next_month_url;noquote@
     </td>
   </tr>
   <tr>
@@ -20,48 +12,45 @@
       <table class="cal-month-table" cellpadding="2" cellspacing="2" border="5">
         <tbody>
           <tr>
-
             <multiple name="weekday_names">
               <td width="14%" class="cal-month-day-title">
                 @weekday_names.weekday_short@
               </td>
             </multiple>
-
           </tr>
-          <tr>
 
+          <tr>
             <multiple name="days_of_a_month">
-              <if @days_of_a_month.beginning_of_week_p@ eq "t">
+              <if @days_of_a_month.beginning_of_week_p@ true>
                 <tr>
               </if>
 
-              <if @days_of_a_month.outside_month_p@ eq "t">
+              <if @days_of_a_month.outside_month_p@ true>
                 <td class="cal-month-day-inactive">&nbsp;</td>
               </if>     
               <else>
-                <if @days_of_a_month.today_p@ eq "t">
-                  <td class="cal-month-today" onclick="javascript:location.href='@base_url@cal-item-new?date=@days_of_a_month.ansi_start_date@&start_time=&end_time=';">
+                <if @days_of_a_month.today_p@ true>
+                  <td class="cal-month-today" onclick="javascript:location.href='@days_of_a_month.url@';">
                 </if>
                 <else>
-                  <td class="cal-month-day" onclick="javascript:location.href='@base_url@cal-item-new?date=@days_of_a_month.ansi_start_date@&start_time=&end_time=';">
+                  <td class="cal-month-day" onclick="javascript:location.href='@days_of_a_month.url@';">
                 </else>
 
                   <a href="?view=day&date=@days_of_a_month.ansi_start_date@@page_num@">@days_of_a_month.day_number@</a>
 
                   <group column="ansi_start_date">
-                    <if @days_of_a_month.item_id@ ne "">
+                    <if @days_of_a_month.calendar_item@ ne "">
                       <div class="cal-month-event">
                         <if @days_of_a_month.time_p@ true>@days_of_a_month.ansi_start_time@</if>
-                        <a
-                        href=cal-item-view?cal_item_id=@days_of_a_month.item_id@>@days_of_a_month.full_item;noquote@</a>
+                        <a href=@days_of_a_month.item_url@>@days_of_a_month.calendar_item;noquote@</a>
                         <span class="cal-text-grey-sml"> [@days_of_a_month.calendar_name@]</span>
                       </div>
                     </if>
                   </group>
 
                 </td>
               </else>
-              <if @days_of_a_month.end_of_week_p@ eq "t">
+              <if @days_of_a_month.end_of_week_p@ true>
                 </tr>
               </if>
             </multiple>
Index: openacs-4/packages/calendar/www/view-month-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/calendar/www/view-month-display.tcl	21 Jan 2004 11:41:11 -0000	1.14
+++ openacs-4/packages/calendar/www/view-month-display.tcl	15 Feb 2004 12:16:25 -0000	1.15
@@ -28,9 +28,11 @@
 }
 
 if {[exists_and_not_null calendar_id_list]} {
-    set calendars_clause "and on_which_calendar in ([join $calendar_id_list ","]) and (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id))"
+    set calendars_clause "and on_which_calendar in ([join $calendar_id_list ","]) \
+      and (cals.private_p='f' or (cals.private_p='t' and cals.owner_id= :user_id))"
 } else {
-    set calendars_clause "and ((cals.package_id= :package_id and cals.private_p='f') or (cals.private_p='t' and cals.owner_id= :user_id))"
+    set calendars_clause "and ((cals.package_id= :package_id and cals.private_p='f') \
+      or (cals.private_p='t' and cals.owner_id= :user_id))"
 }
 
 dt_get_info $date
@@ -48,21 +50,24 @@
 if { [info exists prev_month_template] } {
     set prev_month_url "[subst $prev_month_template]"
 } else {
-    set prev_month_url "<a href=\"view?calendar_list=&view=month&date=[ad_urlencode $prev_month]\"><img src=\"/resources/acs-subsite/left.gif\" alt=\"back one month\" border=\"0\"></a>"
+    set prev_month_url "<a href=\"view?calendar_list=&view=month&\
+      date=[ad_urlencode $prev_month]\"><img src=\"/resources/acs-subsite/left.gif\"\
+      alt=\"back one month\" border=\"0\"></a>"
 }
     
 
 if { [info exists next_month_template] } {
     set next_month_url "[subst $next_month_template]"
 } else {
-    set next_month_url "<a href=\"view?calendar_list=&view=month&date=[ad_urlencode $next_month]\"><img src=\"/resources/acs-subsite/right.gif\" alt=\"forward one month\" border=\"0\"</a>"
+    set next_month_url "<a href=\"view?calendar_list=&view=month&\
+      date=[ad_urlencode $next_month]\"><img src=\"/resources/acs-subsite/right.gif\"\
+      alt=\"forward one month\" border=\"0\"</a>"
 }
 
 
 set first_day_of_week [lc_get firstdayofweek]
 set last_day_of_week [expr [expr $first_day_of_week + 7] % 7]
 
-
 set week_days [lc_get abday]
 multirow create weekday_names weekday_short
 for {set i 0} {$i < 7} {incr i} {
@@ -76,20 +81,19 @@
 set last_date_in_month [dt_julian_to_ansi $last_julian_date_in_month]
 set last_date_in_month_system [lc_time_conn_to_system "$last_date_in_month 23:59:59"]
 
-set number_day_cells 0
-
 set day_number $first_day
 
 set today_ansi_list [dt_ansi_to_list $today_date]
 set today_julian_date [dt_ansi_to_julian [lindex $today_ansi_list 0] [lindex $today_ansi_list 1] [lindex $today_ansi_list 2]]
 
 
-multirow create days_of_a_month calendar_item item_id ansi_start_date ansi_start_time day_number calendar_name beginning_of_week_p end_of_week_p today_p outside_month_p full_item time_p
+# Create the multirow that holds the calendar information
+multirow create days_of_a_month calendar_item item_url ansi_start_date \
+  ansi_start_time day_number calendar_name beginning_of_week_p end_of_week_p \
+  today_p outside_month_p time_p url
 
-
-# Calculate number of greyed days
+# Calculate number of greyed days and then add them to the calendar mulitrow
 set greyed_days_before_month [expr [expr [dt_first_day_of_month $this_year $this_month]] -1 ]
-# Adjust for i18n
 set greyed_days_before_month [expr [expr $greyed_days_before_month + 7 - $first_day_of_week] % 7]
 
 for {set current_day 0} {$current_day < $greyed_days_before_month} {incr current_day} {
@@ -98,27 +102,25 @@
     } else {
         set beginning_of_week_p f
     }
-    multirow append days_of_a_month "" "" [dt_julian_to_ansi [expr $first_julian_date_of_month + $current_day -1]] "" "" "" $beginning_of_week_p f "" t  ""
+    multirow append days_of_a_month "" "" \
+      [dt_julian_to_ansi [expr $first_julian_date_of_month + $current_day -1]] \
+      "" "" "" $beginning_of_week_p f "" t  "" "" 
 }
 
 set current_day $first_julian_date_of_month
 
-# Set the necessary variables for the unified calendar query in views.xql.
-if {[string match [db_type] "postgresql"]} {
-    set interval_limitation_clause " to_timestamp(:first_date_of_month_system,'YYYY-MM-DD HH24:MI:SS')  and      to_timestamp(:last_date_in_month_system, 'YYYY-MM-DD HH24:MI:SS')"
-} else {
-    set interval_limitation_clause " to_date(:first_date_of_month_system,'YYYY-MM-DD HH24:MI:SS')  and      to_date(:last_date_in_month_system, 'YYYY-MM-DD HH24:MI:SS')"
-}
 set order_by_clause " order by ansi_start_date, ansi_end_date"
 set additional_limitations_clause ""
 set additional_select_clause ""
+set interval_limitation_clause [db_map dbqd.calendar.www.views.month_interval_limitation]
 
 db_foreach dbqd.calendar.www.views.select_items {} {
     # Convert from system timezone to user timezone
     set ansi_start_date [lc_time_system_to_conn $ansi_start_date]
     set ansi_end_date [lc_time_system_to_conn $ansi_end_date]
 
-    if { [string equal $ansi_start_date $ansi_end_date] && [string equal [lc_time_fmt $ansi_start_date "%T"] "00:00:00"] } {
+    if { [string equal $ansi_start_date $ansi_end_date] && \
+      [string equal [lc_time_fmt $ansi_start_date "%T"] "00:00:00"] } {
         set time_p 0
     } else {
         set time_p 1
@@ -131,8 +133,17 @@
 
     if {$current_day < $julian_start_date} {
         for {} {$current_day < $julian_start_date} {incr current_day} {
-            array set display_information [calendar::get_month_multirow_information -current_day $current_day -today_julian_date $today_julian_date -first_julian_date_of_month $first_julian_date_of_month]
-            multirow append days_of_a_month "" "" [dt_julian_to_ansi $current_day] "" $display_information(day_number) "" $display_information(beginning_of_week_p) $display_information(end_of_week_p) $display_information(today_p) f "" 0
+            array set display_information \
+                [calendar::get_month_multirow_information \
+                     -current_day $current_day \
+                     -today_julian_date $today_julian_date \
+                     -first_julian_date_of_month $first_julian_date_of_month]
+            multirow append days_of_a_month "" "" [dt_julian_to_ansi $current_day] \
+                "" $display_information(day_number) "" \
+                $display_information(beginning_of_week_p) \
+                $display_information(end_of_week_p) \
+                $display_information(today_p) f 0  \
+                "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time"
         } 
     }
 
@@ -156,21 +167,40 @@
     set item "$name"
     set full_item "[subst $item_template]"
 
-    array set display_information [calendar::get_month_multirow_information -current_day $current_day -today_julian_date $today_julian_date -first_julian_date_of_month $first_julian_date_of_month]
-    multirow append days_of_a_month $name $item_id [dt_julian_to_ansi $current_day] $ansi_start_time $display_information(day_number) $calendar_name $display_information(beginning_of_week_p) $display_information(end_of_week_p) $display_information(today_p)  f  $full_item $time_p
+    array set display_information \
+        [calendar::get_month_multirow_information \
+             -current_day $current_day \
+             -today_julian_date $today_julian_date \
+             -first_julian_date_of_month $first_julian_date_of_month]
+
+    multirow append days_of_a_month $full_item \
+        "cal-item-view?cal_item_id=$item_id" [dt_julian_to_ansi $current_day] \
+        $ansi_start_time $display_information(day_number) $calendar_name \
+        $display_information(beginning_of_week_p) \
+        $display_information(end_of_week_p) \
+        $display_information(today_p)  f  $time_p \
+        "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time"
 }
 
-
+# Add cells for remaining days inside the month
 for {} {$current_day <= $last_julian_date_in_month} {incr current_day} {
-    array set display_information [calendar::get_month_multirow_information -current_day $current_day -today_julian_date $today_julian_date -first_julian_date_of_month $first_julian_date_of_month]
-    multirow append days_of_a_month "" "" [dt_julian_to_ansi $current_day] "" $display_information(day_number) "" $display_information(beginning_of_week_p) $display_information(end_of_week_p) $display_information(today_p) f "" 0
-    incr number_day_cells
+    array set display_information \
+        [calendar::get_month_multirow_information \
+             -current_day $current_day \
+             -today_julian_date $today_julian_date \
+             -first_julian_date_of_month $first_julian_date_of_month]
+
+    multirow append days_of_a_month "" "" [dt_julian_to_ansi $current_day] ""\
+        $display_information(day_number) "" $display_information(beginning_of_week_p) \
+        $display_information(end_of_week_p) $display_information(today_p) f \
+        0 "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time"
 }
 
+# Add cells for remaining days outside the month
 set remaining_days [expr [expr $first_day_of_week + 6 - $current_day % 7] % 7]
 
 if {$remaining_days > 0} {
     for {} {$current_day <= [expr $last_julian_date_in_month + $remaining_days]} {incr current_day} {
-        multirow append days_of_a_month "" "" "" "" "" "" f f "" t "" 0
+        multirow append days_of_a_month "" "" "" "" "" "" f f "" t 0
     }
 }
Index: openacs-4/packages/calendar/www/view-one-day-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/calendar/www/view-one-day-display.tcl	21 Jan 2004 11:41:11 -0000	1.26
+++ openacs-4/packages/calendar/www/view-one-day-display.tcl	15 Feb 2004 12:16:25 -0000	1.27
@@ -1,7 +1,7 @@
 # Show calendar items per one day.
 #
 # Parameters:
-#shour_tem
+# hour_item
 # date (YYYY-MM-DD) - optional
 # start_display_hour and end_display_hour
 
@@ -34,10 +34,6 @@
     set show_calendar_name_p 1
 }
 
-if {![exists_and_not_null base_url]} {
-    set base_url ""
-}
-
 if { ![info exists start_display_hour]} {
     set start_display_hour 0
 }
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/calendar/www/view.adp	14 Feb 2004 18:40:55 -0000	1.24
+++ openacs-4/packages/calendar/www/view.adp	15 Feb 2004 12:16:25 -0000	1.25
@@ -8,7 +8,7 @@
     <include src="mini-calendar" base_url="view" view="@view@" date="@date@">
 
     <p>
-    <a href="cal-item-new?date=@date@" title="#calendar.Add_Item#">
+    <a href="cal-item-new?date=@date@&view=@view@" title="#calendar.Add_Item#">
     <img border=0 align="left" valign="top" src="/resources/acs-subsite/add.gif" alt="#calendar.Add_Item#">#calendar.Add_Item#</a>
     </p>
   
Index: openacs-4/packages/calendar/www/views-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/views-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/views-oracle.xql	21 Jan 2004 11:41:11 -0000	1.2
+++ openacs-4/packages/calendar/www/views-oracle.xql	15 Feb 2004 12:16:25 -0000	1.3
@@ -45,4 +45,11 @@
 </querytext>
 </fullquery>
 
+<partialquery name="month_interval_limitation">      
+ <querytext>
+    to_date(:first_date_of_month_system,'YYYY-MM-DD HH24:MI:SS') 
+    and to_date(:last_date_in_month_system, 'YYYY-MM-DD HH24:MI:SS')
+</querytext>
+</partialquery>
+
 </queryset>
Index: openacs-4/packages/calendar/www/views-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/views-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/views-postgresql.xql	10 Jan 2004 00:19:03 -0000	1.1
+++ openacs-4/packages/calendar/www/views-postgresql.xql	15 Feb 2004 12:16:25 -0000	1.2
@@ -46,4 +46,13 @@
 </querytext>
 </fullquery>
 
+<partialquery name="month_interval_limitation">      
+ <querytext>
+    to_timestamp(:first_date_of_month_system,'YYYY-MM-DD HH24:MI:SS')
+    and to_timestamp(:last_date_in_month_system, 'YYYY-MM-DD HH24:MI:SS')
+</querytext>
+</partialquery>
+
+
+
 </queryset>
Index: openacs-4/packages/calendar/www/resources/calendar.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/calendar.css,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/resources/calendar.css	14 Feb 2004 18:40:56 -0000	1.3
+++ openacs-4/packages/calendar/www/resources/calendar.css	15 Feb 2004 12:16:26 -0000	1.4
@@ -7,6 +7,15 @@
 
 }
 
+.cal-month-title-text {
+        font-size: 140%;
+        font-weight: bold;
+        background-color: #003366;
+        text-align: center;
+        color: #FFFFFF;
+}
+
+
 .cal-table-header a {
 	color: #0055AA;
 }
@@ -65,6 +74,7 @@
 	BACKGROUND: #cccccc;
         cursor: pointer;
 }
+
 .cal-month-today {
 	font-weight: bold;
 	background-color: #003366;