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.13.6.1 -r1.13.6.2
--- openacs-4/packages/calendar/www/view-month-display.adp	19 Jun 2005 07:49:35 -0000	1.13.6.1
+++ openacs-4/packages/calendar/www/view-month-display.adp	12 Sep 2005 04:34:44 -0000	1.13.6.2
@@ -43,7 +43,7 @@
                         <if @items.time_p@ true>@items.ansi_start_time@</if>
                         <a href=@items.event_url@>@items.event_name@</a>
                         <if @show_calendar_name_p@>
-                          <span class="cal-text-grey-sml"> [@items.calendar_name@]</span>
+                          <span class="cal-text-grey-sml"><if @items.show_calendar_name_p@>[@items.calendar_name@]</if> </span>
                         </if>
                       </div>
                     </if>
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.17.2.1 -r1.17.2.2
--- openacs-4/packages/calendar/www/view-month-display.tcl	19 Jun 2005 07:49:35 -0000	1.17.2.1
+++ openacs-4/packages/calendar/www/view-month-display.tcl	12 Sep 2005 04:34:44 -0000	1.17.2.2
@@ -88,6 +88,7 @@
 
 
 # Create the multirow that holds the calendar information
+# NOTE: added show_calendarname_p to determine if we want to show the calendar name in [ ]
 multirow create items \
     event_name \
     event_url \
@@ -101,7 +102,8 @@
     outside_month_p \
     time_p \
     add_url \
-    day_url
+    day_url \
+    show_calendar_name_p
 
 # 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 ]
@@ -126,7 +128,8 @@
 	t \
 	"" \
 	"" \
-	""
+	"" \
+        t
 }
 
 set current_day $first_julian_date_of_month
@@ -178,7 +181,8 @@
 		f \
 		0 \
                 "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \
-		$day_link
+		$day_link \
+                t 
         } 
     }
 
@@ -222,7 +226,8 @@
 	f \
 	$time_p \
         "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \
-	$day_link
+	$day_link \
+        t
 }
 
 # Add cells for remaining days inside the month
@@ -252,7 +257,8 @@
 	f \
         0 \
 	"${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \
-	$day_link
+	$day_link \
+        t
 }
 
 # Add cells for remaining days outside the month
@@ -273,6 +279,7 @@
 	    t \
 	    0 \
 	    "" \
-	    ""
+	    "" \
+            t
     }
 }