Index: openacs-4/packages/assessment/www/asm-admin/catalog-browse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-browse.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/catalog-browse.adp	9 Feb 2005 11:00:26 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/catalog-browse.adp	11 Apr 2005 19:01:55 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <listtemplate name="objects"></listtemplate>
 
Index: openacs-4/packages/assessment/www/asm-admin/catalog-browse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-browse.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/assessment/www/asm-admin/catalog-browse.tcl	21 Feb 2005 14:32:56 -0000	1.4
+++ openacs-4/packages/assessment/www/asm-admin/catalog-browse.tcl	11 Apr 2005 19:01:49 -0000	1.5
@@ -21,9 +21,11 @@
     {orderby:optional "title,asc"}
     {page:optional 1}
     {search_again_url:optional ""}
+} -properties {
+    title:onevalue
+    context:onevalue
 }
 
-
 set package_id [ad_conn package_id]
 permission::require_permission -object_id $package_id -privilege create
 permission::require_permission -object_id $assessment_id -privilege admin
@@ -39,10 +41,10 @@
 if {[info exists section_id]} {
     db_1row section_title {}
     set page_title "[_ assessment.Search_Item_1]"
-    set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] "[_ assessment.Search_Item]"]
+    set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] "[_ assessment.Search_Results]"]
 } else {
     set page_title "[_ assessment.Search_Section_1]"
-    set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] "[_ assessment.Search_Section]"]
+    set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] "[_ assessment.Search_Results]"]
 }
 
 set package_id [ad_conn package_id]
Index: openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp	1 Feb 2005 22:00:10 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/catalog-item-add.adp	11 Apr 2005 19:00:53 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 <property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 
 <h3>#assessment.Items#</h3>
Index: openacs-4/packages/assessment/www/asm-admin/catalog-item-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-item-add.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/catalog-item-add.tcl	9 Feb 2005 11:00:26 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/catalog-item-add.tcl	11 Apr 2005 19:00:48 -0000	1.4
@@ -15,6 +15,10 @@
     after:integer
     as_item_id:integer,multiple,optional
     item_ids:optional
+} -properties {
+    page_title:onevalue
+    context:onevalue
+    items:multirow
 }
 
 set package_id [ad_conn package_id]
@@ -31,7 +35,7 @@
 
 db_1row section_title {}
 set page_title "[_ assessment.Search_Item_1]"
-set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] "[_ assessment.Search_Item]"]
+set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] "[_ assessment.Search_Item]"]
 
 if {[info exists as_item_id]} {
     set item_ids $as_item_id
Index: openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp	1 Feb 2005 22:00:10 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/catalog-section-add.adp	11 Apr 2005 19:01:13 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 <property name="title">@page_title;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 
 <multiple name="sections">
Index: openacs-4/packages/assessment/www/asm-admin/catalog-section-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/catalog-section-add.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/catalog-section-add.tcl	9 Feb 2005 11:00:26 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/catalog-section-add.tcl	11 Apr 2005 19:01:19 -0000	1.4
@@ -13,6 +13,10 @@
     after:integer
     section_id:integer,multiple,optional
     section_ids:optional
+} -properties {
+    title:onevalue
+    context:onevalue
+    sections:multirow
 }
 
 set package_id [ad_conn package_id]
@@ -28,7 +32,7 @@
 }
 
 set page_title "[_ assessment.Search_Section_1]"
-set context_bar [ad_context_bar [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] "[_ assessment.Search_Section]"]
+set context [list [list index [_ assessment.admin]] [list [export_vars -base one-a {assessment_id}] $assessment_data(title)] "[_ assessment.Search_Section]"]
 
 if {[info exists section_id]} {
     set section_ids $section_id