Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl	29 Apr 2002 18:05:35 -0000	1.20
+++ openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl	15 May 2002 20:32:11 -0000	1.21
@@ -1,4 +1,15 @@
 
+# /packages/acs-datetime/tcl/acs-calendar-procs.tcl
+
+ad_library {
+
+    Library for calendar display widgets
+
+    @author  ron@arsdigita.com
+    @created 2000-11-21
+    @cvs-id  $Id$
+}
+
 ad_proc dt_widget_week { 
     {
 	-calendar_details "" 
@@ -361,6 +372,28 @@
 }
 
 
+
+ad_proc -public dt_widget_list {
+    {-calendar_details:required}
+    {-item_template {$item}}
+    {-start_date ""}
+    {-end_date ""}
+    {-order_by ""}
+    {-url_template {?order_by=$order_by}}
+} {
+    create a listing widget for lists
+} {
+    set return_html "<ul>\n"
+    for {set i 0} {$i < [ns_set size $calendar_details]} {incr i} {
+        set item [ns_set value $calendar_details $i]
+        append return_html "<li> $item\n"
+    }
+
+    append return_html "</ul>"
+
+    return $return_html
+}
+    
         
 #
 # Additional Utility Procs
Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl	13 Mar 2002 22:50:53 -0000	1.5
+++ openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl	15 May 2002 20:32:11 -0000	1.6
@@ -31,6 +31,7 @@
 	-prev_month_template "" 
 	-prev_next_links_in_title 0 
 	-fill_all_days 0 
+        -show_calendar_name_p 1
     }
 } {
     Returns a calendar for a specific month, with details supplied by
@@ -90,7 +91,7 @@
     # Write out the header and the days of the week
 
     append output "
-    <table bgcolor=$master_bgcolor cellpadding=3 cellspacing=1 border=0 width=$calendar_width>
+    <table bgcolor=$master_bgcolor cellpadding=3 cellspacing=0 border=1 width=$calendar_width>
     <tr bgcolor=$header_bgcolor> $title </tr>
     <tr bgcolor=$day_header_bgcolor>\n"
 
@@ -105,11 +106,12 @@
 
     append output "</tr><tr>\n"
 
-    if { $fill_all_days == 0 } {
-	for { set n 1} { $n < $first_day_of_month } { incr n } {
-	    append output "<td bgcolor=$empty_bgcolor align=right valign=top></td>\n"
-	}
-    }
+    # This is not necessary (ben)
+#      if { $fill_all_days == 0 } {
+#  	for { set n 1} { $n < $first_day_of_month } { incr n } {
+#  	    append output "<td bgcolor=$empty_bgcolor align=right valign=top></td>\n"
+#  	}
+#      }
 
     set day_of_week 1
     set julian_date $first_julian_date
@@ -150,7 +152,7 @@
 		append output "[subst $day_number_template]&nbsp;"
 	    }
 	} else {
-	    append output "<td bgcolor=$day_bgcolor align=right valign=top>[subst $day_number_template]&nbsp;"
+	    append output "<td bgcolor=$day_bgcolor align=left valign=top>[subst $day_number_template]&nbsp;"
 	}
 
 	if { (!$skip_day) && $large_calendar_p == 1 } {
Index: openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs-oracle.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql	14 May 2002 05:06:29 -0000	1.8
+++ openacs-4/packages/calendar/tcl/calendar-display-procs-oracle.xql	15 May 2002 20:32:19 -0000	1.9
@@ -7,6 +7,8 @@
       <querytext>
       
 	select   to_char(start_date, 'j') as start_date,
+                 to_char(start_date, 'HH:MIpm') as start_time,
+                 to_char(end_date, 'HH:MIpm') as end_time,
 	         nvl(e.name, a.name) as name,
 	         nvl(e.description, a.description) as description,
                  nvl(e.status_summary, a.status_summary) as status_summary,
@@ -24,6 +26,7 @@
 	         from    cal_items
 	         where   on_which_calendar = :calendar_id
          )
+         order by start_date,end_date
 	
       </querytext>
 </fullquery>
Index: openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql	14 May 2002 05:06:29 -0000	1.2
+++ openacs-4/packages/calendar/tcl/calendar-display-procs-postgresql.xql	15 May 2002 20:32:19 -0000	1.3
@@ -7,6 +7,8 @@
       <querytext>
       
 	select   to_char(start_date, 'J') as start_date,
+                 to_char(start_date, 'HH:MIpm') as start_time,
+                 to_char(end_date, 'HH:MIpm') as end_time,
 	         coalesce(e.name, a.name) as name,
 	         coalesce(e.description, a.description) as description,
                  coalesce(e.status_summary, a.status_summary) as status_summary,
@@ -24,7 +26,7 @@
 	         from    cal_items
 	         where   on_which_calendar = :calendar_id
          )
-	
+         order by start_date,end_date	
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/calendar/tcl/calendar-display-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/Attic/calendar-display-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/calendar/tcl/calendar-display-procs.tcl	14 May 2002 05:06:29 -0000	1.21
+++ openacs-4/packages/calendar/tcl/calendar-display-procs.tcl	15 May 2002 20:32:19 -0000	1.22
@@ -21,6 +21,9 @@
         {-item_add_template ""}
         {-date ""}
         {-url_stub_callback ""}
+        {-show_calendar_name_p 1}
+        {-prev_month_template ""}
+        {-next_month_template ""}
     } {
         Creates a month widget with events for that month
 
@@ -52,8 +55,16 @@
 
             db_foreach select_monthly_items {} {
                 set item "$name"
-                set item "[subst $item_template]<br>"
+                set item "[subst $item_template]"
 
+                if {![dt_no_time_p -start_time $start_time -end_time $end_time]} {
+                    set item "<font size=-2><b>$start_time</b></font> $item"
+                }
+                
+                if {$show_calendar_name_p} {
+                    append item " <font size=-2>($calendar_name)</font>"
+                }
+
                 # DRB: This ugly hack was added for dotlrn-events, to give us a way to
                 # flag event status in red in accordance with the spec.  When calendar
                 # is rewritten we should come up with a way for objects derived from
@@ -63,6 +74,8 @@
                     append item " <font color=\"red\">$status_summary</font> "
                 }
 
+                append item "<br>"
+
                 ns_set put $items $start_date $item
             }            
         }
@@ -71,10 +84,23 @@
         if {[empty_string_p $item_add_template]} {
             set day_number_template "<font size=1>$day_template</font>"
         } else {
-            set day_number_template "<font size=1>$item_add_template &nbsp; &nbsp; $day_template</font>"
+            set day_number_template "<font size=1>$day_template &nbsp; &nbsp; $item_add_template</font>"
         }
 
-        return [dt_widget_month -calendar_details $items -date $date -day_number_template $day_number_template]
+        return [dt_widget_month -calendar_details $items -date $date \
+                -master_bgcolor black \
+                -header_bgcolor lavender \
+                -header_text_color black \
+                -header_text_size "+1" \
+                -day_header_bgcolor lavender \
+                -day_bgcolor white \
+                -today_bgcolor #FFF8DC \
+                -empty_bgcolor lightgrey \
+                -day_text_color black \
+                -prev_next_links_in_title 1 \
+                -prev_month_template $prev_month_template \
+                -next_month_template $next_month_template \
+                -day_number_template $day_number_template]
     }
 
     ad_proc -public one_week_display {
Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	10 May 2002 20:21:58 -0000	1.16
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	15 May 2002 20:32:01 -0000	1.17
@@ -111,12 +111,14 @@
 
 if {$view == "month"} {
     set cal_stuff [calendar::one_month_display \
-            -item_template $item_template \
-            -day_template "<a href=?julian_date=\$julian_date&page_num=$page_num>\$day_number</a>" \
+            -item_template "<font size=-2>$item_template</font>" \
+            -day_template "<font size=-1><b><a href=?julian_date=\$julian_date&page_num=$page_num>\$day_number</a></b></font>" \
             -date $current_date \
-            -item_add_template $item_add_template \
+            -item_add_template "<font size=-3>$item_add_template</font>" \
             -calendar_id_list $list_of_calendar_ids \
             -url_stub_callback "calendar_portlet_display::get_url_stub" \
+            -prev_month_template "<a href=?view=month&date=\$ansi_date&page_num=$page_num>&lt;</a>" \
+            -next_month_template "<a href=?view=month&date=\$ansi_date&page_num=$page_num>&gt;</a>" \
             -show_calendar_name_p $show_calendar_name_p]
 }