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.12 -r1.13
--- openacs-4/packages/calendar/www/view-month-display.adp	19 Feb 2004 17:58:37 -0000	1.12
+++ openacs-4/packages/calendar/www/view-month-display.adp	26 Feb 2004 12:43:23 -0000	1.13
@@ -42,7 +42,9 @@
                       <div class="cal-month-event">
                         <if @items.time_p@ true>@items.ansi_start_time@</if>
                         <a href=@items.event_url@>@items.event_name@</a>
-                        <span class="cal-text-grey-sml"> [@items.calendar_name@]</span>
+                        <if @show_calendar_name_p@>
+                          <span class="cal-text-grey-sml"> [@items.calendar_name@]</span>
+                        </if>
                       </div>
                     </if>
                   </group>
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 -r1.8 -r1.9
--- openacs-4/packages/calendar/www/view-week-display.adp	19 Feb 2004 17:58:37 -0000	1.8
+++ openacs-4/packages/calendar/www/view-week-display.adp	26 Feb 2004 12:43:23 -0000	1.9
@@ -44,7 +44,9 @@
             <if @items.no_time_p@ true>
             </span>
             </if>
-            <span class="cal-text-grey-sml">[@items.calendar_name@]</span>
+            <if @show_calendar_name_p@>
+              <span class="cal-text-grey-sml">[@items.calendar_name@]</span>
+            </if>
             </td>
             </tr>
            </if>
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/calendar/www/view.adp	25 Feb 2004 13:07:08 -0000	1.27
+++ openacs-4/packages/calendar/www/view.adp	26 Feb 2004 12:43:23 -0000	1.28
@@ -33,21 +33,25 @@
   <div id="events">   
     <if @view@ eq "list">
       <include src="view-list-display" start_date=@start_date@ 
-      end_date=@end_date@ date=@date@ period_days=@period_days@ sort_by=@sort_by@> 
+      end_date=@end_date@ date=@date@ period_days=@period_days@ sort_by=@sort_by@
+      show_calendar_name_p=@show_calendar_name_p@> 
     </if>
     
     
     <if @view@ eq "day">
-      <include src="view-one-day-display" date="@date@" start_hour=0 end_hour=23>
+      <include src="view-one-day-display" date="@date@" start_hour=0 end_hour=23
+      show_calendar_name_p=@show_calendar_name_p@>
     </if>
     
     <if @view@ eq "week">
-      <include src="view-week-display" date="@date@">
+      <include src="view-week-display" date="@date@"
+      show_calendar_name_p=@show_calendar_name_p@>
     </if>
     
     
     <if @view@ eq "month">
-      <include src="view-month-display" date=@date@>
+      <include src="view-month-display" date=@date@
+      show_calendar_name_p=@show_calendar_name_p@>
     </if>
   </div>
 
Index: openacs-4/packages/calendar/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/calendar/www/view.tcl	25 Feb 2004 13:07:08 -0000	1.20
+++ openacs-4/packages/calendar/www/view.tcl	26 Feb 2004 12:43:23 -0000	1.21
@@ -27,6 +27,8 @@
 
 set admin_p [permission::permission_p -object_id $package_id -privilege calendar_admin]
 
+set show_calendar_name_p [parameter::get -parameter Show_Calendar_Name_p -default 1]
+
 set date [calendar::adjust_date -date $date]
 
 if {$view == "list"} {