Index: openacs-4/packages/calendar-portlet/sql/oracle/calendar-full-portlet-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/sql/oracle/calendar-full-portlet-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar-portlet/sql/oracle/calendar-full-portlet-create.sql	9 May 2002 23:59:51 -0000	1.3
+++ openacs-4/packages/calendar-portlet/sql/oracle/calendar-full-portlet-create.sql	10 May 2002 20:21:58 -0000	1.4
@@ -61,6 +61,14 @@
 	value => 't'
 );	
 
+    portal_datasource.set_def_param(
+        datasource_id => ds_id,
+        config_required_p => 't',
+        configured_p => 'f',
+        key => 'scoped_p',
+        value => 't'
+    );
+
   -- user_editable_p 
   portal_datasource.set_def_param (
 	datasource_id => ds_id,
Index: openacs-4/packages/calendar-portlet/sql/oracle/calendar-portlet-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/sql/oracle/calendar-portlet-create.sql,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/calendar-portlet/sql/oracle/calendar-portlet-create.sql	9 May 2002 23:59:51 -0000	1.18
+++ openacs-4/packages/calendar-portlet/sql/oracle/calendar-portlet-create.sql	10 May 2002 20:21:58 -0000	1.19
@@ -88,6 +88,15 @@
 );	
 
 
+    portal_datasource.set_def_param(
+        datasource_id => ds_id,
+        config_required_p => 't',
+        configured_p => 'f',
+        key => 'scoped_p',
+        value => 't'
+    );
+
+
   -- calendar-specific params
 
   -- calendar_id must be configured 
@@ -249,3 +258,4 @@
 
 @calendar-full-portlet-create.sql
 @calendar-admin-portlet-create.sql
+@calendar-list-portlet-create.sql
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.15 -r1.16
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	26 Apr 2002 21:43:14 -0000	1.15
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	10 May 2002 20:21:58 -0000	1.16
@@ -36,6 +36,13 @@
 }
 set list_of_calendar_ids $config(calendar_id)
 
+set scoped_p $config(scoped_p)
+if {$scoped_p == "t"} {
+    set show_calendar_name_p 1
+} else {
+    set show_calendar_name_p 0
+}
+
 if {[llength $list_of_calendar_ids] > 1} {
     set force_calendar_id [calendar_have_private_p -return_id 1 [ad_conn user_id]]
 } else {
@@ -85,7 +92,8 @@
             -hour_template $hour_template \
             -date $current_date -start_hour 7 -end_hour 22 \
             -calendar_id_list $list_of_calendar_ids \
-            -url_stub_callback "calendar_portlet_display::get_url_stub"]
+            -url_stub_callback "calendar_portlet_display::get_url_stub" \
+            -show_calendar_name_p $show_calendar_name_p]
 } 
 
 if {$view == "week"} {
@@ -96,7 +104,8 @@
             -calendar_id_list $list_of_calendar_ids \
             -url_stub_callback "calendar_portlet_display::get_url_stub" \
             -prev_week_template "<a href=\"?date=\$last_week&view=week&page_num=$page_num\">&lt;</a>" \
-            -next_week_template "<a href=\"?date=\$next_week&view=week&page_num=$page_num\">&gt;</a>"
+            -next_week_template "<a href=\"?date=\$next_week&view=week&page_num=$page_num\">&gt;</a>" \
+            -show_calendar_name_p $show_calendar_name_p
     ]
 }
 
@@ -107,15 +116,17 @@
             -date $current_date \
             -item_add_template $item_add_template \
             -calendar_id_list $list_of_calendar_ids \
-            -url_stub_callback "calendar_portlet_display::get_url_stub"]
+            -url_stub_callback "calendar_portlet_display::get_url_stub" \
+            -show_calendar_name_p $show_calendar_name_p]
 }
 
 if {$view == "list"} {
     set cal_stuff [calendar::list_display \
             -item_template $item_template \
             -date $current_date \
             -calendar_id_list $list_of_calendar_ids \
-            -url_stub_callback "calendar_portlet_display::get_url_stub"]
+            -url_stub_callback "calendar_portlet_display::get_url_stub" \
+            -show_calendar_name_p $show_calendar_name_p]
 }
 
 if {$view == "year"} {
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	16 Apr 2002 05:30:34 -0000	1.14
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	10 May 2002 20:21:58 -0000	1.15
@@ -29,6 +29,13 @@
 set view $config(default_view)
 set list_of_calendar_ids $config(calendar_id)
 
+set scoped_p $config(scoped_p)
+if {$scoped_p == "t"} {
+    set show_calendar_name_p 1
+} else {
+    set show_calendar_name_p 0
+}
+
 if {[llength $list_of_calendar_ids] > 1} {
     set force_calendar_id [calendar_have_private_p -return_id 1 [ad_conn user_id]]
 } else {
@@ -66,7 +73,8 @@
             -hour_template $hour_template \
             -date $current_date -start_hour 7 -end_hour 22 \
             -calendar_id_list $list_of_calendar_ids \
-            -url_stub_callback "calendar_portlet_display::get_url_stub"]
+            -url_stub_callback "calendar_portlet_display::get_url_stub" \
+            -show_calendar_name_p $show_calendar_name_p]
     
 }
 
@@ -75,7 +83,8 @@
             -item_template $item_template \
             -date $current_date \
             -calendar_id_list $list_of_calendar_ids \
-            -url_stub_callback "calendar_portlet_display::get_url_stub"]
+            -url_stub_callback "calendar_portlet_display::get_url_stub" \
+            -show_calendar_name_p $show_calendar_name_p]
 }
 
 if {$view == "month"} {
@@ -85,15 +94,17 @@
             -date $current_date \
             -item_add_template $item_add_template \
             -calendar_id_list $list_of_calendar_ids \
-            -url_stub_callback "calendar_portlet_display::get_url_stub"]
+            -url_stub_callback "calendar_portlet_display::get_url_stub" \
+            -show_calendar_name_p $show_calendar_name_p]
 }
 
 if {$view == "list"} {
     set cal_stuff [calendar::list_display \
             -item_template $item_template \
             -date $current_date \
             -calendar_id_list $list_of_calendar_ids \
-            -url_stub_callback "calendar_portlet_display::get_url_stub"]
+            -url_stub_callback "calendar_portlet_display::get_url_stub" \
+            -show_calendar_name_p $show_calendar_name_p]
 }