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 {