Index: openacs-4/packages/curriculum-central/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/index.adp	20 Nov 2005 23:51:11 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/index.adp	30 Nov 2005 04:55:20 -0000	1.2
@@ -2,5 +2,6 @@
 <property name="title">@page_title;noquote@</property>
 <property name="context">@context;noquote@</property>
 
-<a href="faculties" class="button">Faculties</a> - #curriculum-central.create_faculties# <p />
-<a href="streams" class="button">Streams</a> - #curriculum-central.create_streams#
+<a href="faculties" class="button">#curriculum-central.faculties#</a> - #curriculum-central.create_faculties# <p />
+<a href="staff" class="button">#curriculum-central.staff#</a> - #curriculum-central.add_staff# <p />
+<a href="streams" class="button">#curriculum-central.streams#</a> - #curriculum-central.create_streams#
Index: openacs-4/packages/curriculum-central/www/admin/no-faculties.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/no-faculties.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/curriculum-central/www/admin/no-faculties.adp	30 Nov 2005 04:55:20 -0000	1.1
@@ -0,0 +1,5 @@
+<master>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+
+#curriculum-central.need_to_create_faculty#
Index: openacs-4/packages/curriculum-central/www/admin/streams-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/streams-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/streams-postgresql.xql	20 Nov 2005 23:51:11 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/streams-postgresql.xql	30 Nov 2005 04:55:20 -0000	1.2
@@ -12,6 +12,7 @@
 	       FROM cc_users
 	       WHERE user_id = s.coordinator_id) AS stream_coordinator
 	   FROM cc_stream s
+	   WHERE package_id = :package_id
 	   [template::list::orderby_clause -orderby -name "streams"]
      </querytext>
    </fullquery>
Index: openacs-4/packages/curriculum-central/www/admin/streams.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-central/www/admin/streams.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum-central/www/admin/streams.tcl	20 Nov 2005 23:51:11 -0000	1.1
+++ openacs-4/packages/curriculum-central/www/admin/streams.tcl	30 Nov 2005 04:55:20 -0000	1.2
@@ -10,7 +10,13 @@
 
 set page_title "[_ curriculum-central.streams_admin]"
 set context [list [_ curriculum-central.streams_admin]]
+set package_id [ad_conn package_id]
 
+if { ![curriculum_central::faculty::faculties_exist_p] } {
+    ad_return_template "no-faculties"
+    return
+}
+
 set elements {
     edit {
 	sub_class narrow