Index: openacs-4/packages/survey/lib/portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/lib/portlet.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/survey/lib/portlet.adp	21 Jan 2005 17:24:28 -0000	1.1
@@ -0,0 +1,12 @@
+<if @display_empty_p@ true or @active:rowcount@ gt 0>
+<div<if @id@ not nil> id="@id@"</if><if @class@ not nil> class="@class@"</if>>
+<h4><a href="@base_url@">@package_name@</a></h4>
+<if @active:rowcount@ eq 0><em>None active</em></if><else>
+<ul>
+<multiple name="active">
+  <li><a href="@active.url@">@active.name@</a>
+</multiple>
+</ul>
+</else>
+</div>
+</if>
\ No newline at end of file
Index: openacs-4/packages/survey/lib/portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/lib/portlet.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/survey/lib/portlet.tcl	21 Jan 2005 17:24:28 -0000	1.1
@@ -0,0 +1,51 @@
+# include fragment to display the active surveys in a package
+#
+# @author Tom Ayles (tom@beatniq.net)
+# @creation-date 2004-02-17
+# @cvs-id $Id: portlet.tcl,v 1.1 2005/01/21 17:24:28 jeffd Exp $
+#
+# parameters:
+#  package_id - the ID of the surveys package to query
+#  base_url - the base URL of the package
+#  display_empty_p - if true, display when empty (default 1)
+#  class - CSS CLASS attribute value
+#  id - CSS ID attribute value
+#  cache - cache period, default 0 meaning no cache
+
+if { ![exists_and_not_null package_id]
+     && ![exists_and_not_null base_url] } {
+    error "must specify package_id and/or base_url"
+}
+
+if { ![exists_and_not_null cache] } {
+    set cache 0
+}
+
+if { ![exists_and_not_null display_empty_p] } {
+    set display_empty_p 1
+}
+
+if { ![exists_and_not_null base_url] } {
+    set base_url [lindex [site_node::get_url_from_object_id \
+                              -object_id $package_id] 0]
+}
+if { ![exists_and_not_null package_id] } {
+    set package_id [site_node::get_element \
+                        -url $base_url -element object_id]
+}
+set package_name [apm_instance_name_from_id $package_id]
+
+set script "# /packages/survey/lib/portlet.tcl
+db_list_of_lists ls {} -bind { package_id $package_id }"
+
+multirow create active survey_id name url
+
+foreach row [util_memoize $script $cache] {
+    set survey_id [lindex $row 0]
+    set name [lindex $row 1]
+    set url "${base_url}respond?survey_id=$survey_id"
+
+    multirow append active $survey_id $name $url
+}
+
+ad_return_template
Index: openacs-4/packages/survey/lib/portlet.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/lib/portlet.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/survey/lib/portlet.xql	21 Jan 2005 17:24:28 -0000	1.1
@@ -0,0 +1,10 @@
+<queryset>
+
+<fullquery name="ls"><querytext>
+SELECT survey_id, name
+FROM surveys
+WHERE package_id = :package_id AND enabled_p = 't'
+ORDER BY lower(name), name
+</querytext></fullquery>
+
+</queryset>
\ No newline at end of file
Index: openacs-4/packages/survey/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/survey/www/index.adp	22 Dec 2003 21:57:40 -0000	1.6
+++ openacs-4/packages/survey/www/index.adp	21 Jan 2005 17:24:28 -0000	1.7
@@ -1,6 +1,5 @@
 <master>
 <property name="title">#survey.Surveys#</property>
-<property name="context_bar">@context_bar;noquote@</property>
 <if @admin_p@ eq "1"><p style="text-align: right;"><a href="admin/">#survey.lt_img_srcgraphicsadming#</a></if>
     <ul>
       
Index: openacs-4/packages/survey/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/survey/www/index.tcl	16 Sep 2002 00:00:23 -0000	1.1
+++ openacs-4/packages/survey/www/index.tcl	21 Jan 2005 17:24:28 -0000	1.2
@@ -15,8 +15,6 @@
 
 set package_id [ad_conn package_id]
 
-set context_bar [ad_context_bar]
-
 set user_id [ad_maybe_redirect_for_registration]
 
 set admin_p [ad_permission_p $package_id admin]
Index: openacs-4/packages/survey/www/one-respondent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-respondent.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/survey/www/one-respondent.adp	13 Jan 2005 13:58:45 -0000	1.7
+++ openacs-4/packages/survey/www/one-respondent.adp	21 Jan 2005 17:24:28 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#survey.lt_Answers_to_survey_nam#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
     @description;noquote@
     <p>
Index: openacs-4/packages/survey/www/one-respondent.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-respondent.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/one-respondent.tcl	13 Jan 2005 13:58:45 -0000	1.4
+++ openacs-4/packages/survey/www/one-respondent.tcl	21 Jan 2005 17:24:28 -0000	1.5
@@ -38,8 +38,9 @@
 set description $survey_info(description)
 set description_html_p $survey_info(description_html_p)
 set editable_p $survey_info(editable_p)
-set context_bar [ad_context_bar "[_ survey.Responses]"]
 
+set context [_ survey.Responses]
+
 if {$description_html_p != "t" } {
     set description [ad_text_to_html $description]
 }
Index: openacs-4/packages/survey/www/one-survey.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-survey.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/survey/www/one-survey.adp	22 May 2003 15:14:45 -0000	1.5
+++ openacs-4/packages/survey/www/one-survey.adp	21 Jan 2005 17:24:28 -0000	1.6
@@ -1,6 +1,5 @@
 <master>
 <property name="title">#survey.Surveys#</property>
-<property name="context_bar">@context_bar;noquote@</property>
 <if @admin_p@ eq "1"><p style="text-align: right;"><a href="admin/">#survey.lt_img_srcgraphicsadming_1#</a></p></if>
     <ul>
       
Index: openacs-4/packages/survey/www/one-survey.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/one-survey.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/survey/www/one-survey.tcl	16 Sep 2002 00:00:23 -0000	1.1
+++ openacs-4/packages/survey/www/one-survey.tcl	21 Jan 2005 17:24:28 -0000	1.2
@@ -15,8 +15,6 @@
 
 set package_id [ad_conn package_id]
 
-set context_bar [ad_context_bar]
-
 set user_id [ad_maybe_redirect_for_registration]
 
 set take_survey_p [ad_permission_p $survey_id survey_take_survey]
Index: openacs-4/packages/survey/www/process-response.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/process-response.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/process-response.adp	22 May 2003 15:14:45 -0000	1.4
+++ openacs-4/packages/survey/www/process-response.adp	21 Jan 2005 17:24:28 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
 <property name=title>#survey.Response_Submitted#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
     <blockquote>
      <p> #survey.lt_Response_submitted_Th#</p>
 	<p><a href=".">#survey.Return#</a> #survey.lt_to_the_survey_index_p#</p>
Index: openacs-4/packages/survey/www/process-response.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/process-response.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/survey/www/process-response.tcl	12 Mar 2003 01:05:39 -0000	1.12
+++ openacs-4/packages/survey/www/process-response.tcl	21 Jan 2005 17:24:28 -0000	1.13
@@ -283,7 +283,7 @@
     ad_returnredirect "$return_url"
            ad_script_abort
 } else {
-     set context_bar [ad_context_bar "[_ survey.lt_Response_Submitted_for]"]
+     set context [_ survey.lt_Response_Submitted_for]
      ad_return_template
 }	
     
Index: openacs-4/packages/survey/www/respond.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/respond.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/survey/www/respond.adp	26 Jan 2004 15:39:48 -0000	1.6
+++ openacs-4/packages/survey/www/respond.adp	21 Jan 2005 17:24:28 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
 <property name=title>#survey.One_Survey_name#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
       <form enctype=multipart/form-data method="post" action="process-response">
 	<if @initial_response_id@ not nil><input type="hidden"
Index: openacs-4/packages/survey/www/respond.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/respond.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/survey/www/respond.tcl	13 Jan 2005 13:58:45 -0000	1.6
+++ openacs-4/packages/survey/www/respond.tcl	21 Jan 2005 17:24:28 -0000	1.7
@@ -58,7 +58,7 @@
 
 ad_require_permission $survey_id survey_take_survey
 
-set context_bar [ad_context_bar "$name"]
+set context $name
 set button_label "[_ survey.Submit_response]"
 if {$editable_p == "t"} {
     if {$response_id > 0} {
Index: openacs-4/packages/survey/www/admin/description-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/description-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/description-edit.adp	22 May 2003 15:15:06 -0000	1.3
+++ openacs-4/packages/survey/www/admin/description-edit.adp	21 Jan 2005 17:24:28 -0000	1.4
@@ -2,6 +2,6 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name=title>#survey.lt_survey_name_Edit_Desc#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 <formtemplate id="edit-survey"></formtemplate>
Index: openacs-4/packages/survey/www/admin/description-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/description-edit.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/description-edit.tcl	12 Mar 2003 01:05:52 -0000	1.4
+++ openacs-4/packages/survey/www/admin/description-edit.tcl	21 Jan 2005 17:24:28 -0000	1.5
@@ -51,6 +51,6 @@
     ad_script_abort
 }
 
-set context_bar [ad_context_bar [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.Edit_Description]"]
+set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.Edit_Description]"]
 
 ad_return_template
Index: openacs-4/packages/survey/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/index.adp	22 May 2003 15:15:06 -0000	1.3
+++ openacs-4/packages/survey/www/admin/index.adp	21 Jan 2005 17:24:28 -0000	1.4
@@ -1,7 +1,6 @@
 <master>
 
 <property name=title>#survey.lt_Survey_Administration#</property>
-<property name=context_bar>@context_bar;noquote@</property>
 <property name="link_all">1</property>
 <ul>
 <multiple name=surveys>
Index: openacs-4/packages/survey/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/survey/www/admin/index.tcl	16 Sep 2002 00:00:24 -0000	1.1
+++ openacs-4/packages/survey/www/admin/index.tcl	21 Jan 2005 17:24:28 -0000	1.2
@@ -11,8 +11,6 @@
 
 }
 
-set context_bar [ad_context_bar]
-
 set package_id [ad_conn package_id]
 
 # bounce the user if they don't have permission to admin surveys
Index: openacs-4/packages/survey/www/admin/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/master.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/survey/www/admin/master.adp	22 Dec 2003 21:57:47 -0000	1.6
+++ openacs-4/packages/survey/www/admin/master.adp	21 Jan 2005 17:24:28 -0000	1.7
@@ -2,6 +2,9 @@
 <if @context_bar@ not nil>
 <property name="context_bar">@context_bar;noquote@</property>
 </if>
+<if @context;noquote@ not nil>
+<property name="context">@context;noquote@</property>
+</if>
 <if @title@ not nil>
 <property name="title">@title;noquote@</property>
 </if>
Index: openacs-4/packages/survey/www/admin/name-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/name-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/name-edit.adp	22 May 2003 15:15:06 -0000	1.3
+++ openacs-4/packages/survey/www/admin/name-edit.adp	21 Jan 2005 17:24:28 -0000	1.4
@@ -2,7 +2,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name=title>#survey.lt_survey_name_Edit_Name#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 #survey.lt_Edit_and_submit_to_ch#
 <formtemplate id="edit-name"></formtemplate>
Index: openacs-4/packages/survey/www/admin/name-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/name-edit.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/name-edit.tcl	13 Jan 2005 13:58:45 -0000	1.4
+++ openacs-4/packages/survey/www/admin/name-edit.tcl	21 Jan 2005 17:24:28 -0000	1.5
@@ -45,7 +45,7 @@
     ad_script_abort
 }
 
-set context_bar [ad_context_bar "[_ survey.Edit_Name]"]
+set context [_ survey.Edit_Name]
 
 ad_return_template
 
Index: openacs-4/packages/survey/www/admin/no-responses.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/no-responses.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/survey/www/admin/no-responses.adp	15 Oct 2003 06:26:42 -0000	1.5
+++ openacs-4/packages/survey/www/admin/no-responses.adp	21 Jan 2005 17:24:28 -0000	1.6
@@ -1,9 +1,7 @@
 <master>
 <property name="survey_id">@survey_id;noquote@</property>
 <property name="title">#survey.lt_No_Responses_for_surv#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
-<h3>#survey.lt_No_Responses_for_surv#</h3>
-
     <a href="one.tcl?survey_id=@survey_id@">#survey.lt_Return_to_survey_admi#</a>
 
Index: openacs-4/packages/survey/www/admin/one-respondent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one-respondent.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/survey/www/admin/one-respondent.adp	13 Jan 2005 13:58:45 -0000	1.6
+++ openacs-4/packages/survey/www/admin/one-respondent.adp	21 Jan 2005 17:24:28 -0000	1.7
@@ -5,7 +5,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 <property name="survey_name@">;noquote@survey_info.name@</property>
 <property name="title">#survey.lt_One_Respondent_first_#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 <table class=table-display cellspacing=0 cellpadding=5>
 <tr class="table-header"><td>
   #survey.Here_is_what# <a href="/shared/community-member?user_id=@user_id@">@first_names@ @last_name@</a> #survey.lt_had_to_say_in_respons#
Index: openacs-4/packages/survey/www/admin/one-respondent.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one-respondent.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/one-respondent.tcl	13 Jan 2005 13:58:45 -0000	1.3
+++ openacs-4/packages/survey/www/admin/one-respondent.tcl	21 Jan 2005 17:24:28 -0000	1.4
@@ -37,7 +37,7 @@
     return
 }
 
-set context_bar [ad_context_bar "[_ survey.One_Respondent]"]
+set context [_ survey.One_Respondent]
  
 
 db_multirow -extend {response_display} responses get_responses {} {
Index: openacs-4/packages/survey/www/admin/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/survey/www/admin/one.adp	26 Jan 2004 15:39:48 -0000	1.8
+++ openacs-4/packages/survey/www/admin/one.adp	21 Jan 2005 17:24:28 -0000	1.9
@@ -2,7 +2,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name="title">#survey.lt_One_Survey_survey_inf#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 <p><a href=".">#survey.lt_Main_Survey_Administr#</a></p>
 <font size=+1><b>@survey_info.name@</b></font> #survey.-__Created_by# <a href="@user_link@">@survey_info.creator_name@</a>#survey._on_creation_date#</h2>
 <table class="table-display" cellpadding=2 cellspacing=0>
Index: openacs-4/packages/survey/www/admin/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/survey/www/admin/one.tcl	13 Jan 2005 13:58:45 -0000	1.6
+++ openacs-4/packages/survey/www/admin/one.tcl	21 Jan 2005 17:24:28 -0000	1.7
@@ -68,7 +68,7 @@
 # Questions summary.   
 # We need to get the questions for ALL sections.
 
-set context_bar [ad_context_bar $survey_info(name)]
+set context $survey_info(name)
 
 db_multirow -extend { question_display } questions survey_questions "" {set question_display [survey_question_display $question_id]}
 
Index: openacs-4/packages/survey/www/admin/process-response.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/process-response.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/survey/www/admin/process-response.adp	13 Jan 2005 13:58:45 -0000	1.2
+++ openacs-4/packages/survey/www/admin/process-response.adp	21 Jan 2005 17:24:28 -0000	1.3
@@ -1,7 +1,7 @@
 <master src=./master>
 <property name="survey_id">@survey_id@</property>
 <property name=title>#survey.lt_Response_submitted_Th#</property>
-<property name=context_bar>@context_bar@</property>
+<property name=context>@context;noquote@</property>
     <blockquote>
      <p>#survey.lt_Response_submitted_Th#</p>
 	<p><a href="one-respondent?survey_id=@survey_id@&user_id=@initial_creation_user_id@">#survey.lt_Return_to_survey_admi#</a>.</p>
Index: openacs-4/packages/survey/www/admin/process-response.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/process-response.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/survey/www/admin/process-response.tcl	13 Jan 2005 13:58:45 -0000	1.2
+++ openacs-4/packages/survey/www/admin/process-response.tcl	21 Jan 2005 17:24:28 -0000	1.3
@@ -317,7 +317,7 @@
     ad_returnredirect "$return_url"
            ad_script_abort
 } else {
-     set context_bar [ad_context_bar "Response Submitted for $survey_name"]
+     set context "Response Submitted for $survey_name"
      ad_return_template
 }	
     
Index: openacs-4/packages/survey/www/admin/question-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-add-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/question-add-2.adp	22 May 2003 15:15:06 -0000	1.3
+++ openacs-4/packages/survey/www/admin/question-add-2.adp	21 Jan 2005 17:24:28 -0000	1.4
@@ -2,7 +2,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name=title>#survey.lt_Survey_Administration_1#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 
     <formtemplate id="create-question-2"></formtemplate>
Index: openacs-4/packages/survey/www/admin/question-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-add-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/question-add-2.tcl	12 Mar 2003 01:05:52 -0000	1.3
+++ openacs-4/packages/survey/www/admin/question-add-2.tcl	21 Jan 2005 17:24:28 -0000	1.4
@@ -178,6 +178,6 @@
 ad_form -extend -name create-question-2 -form {
     {presentation_alignment:text(radio) {options {{"[_ survey.Beside_the_question]" beside} {"[_ survey.Below_the_question]" below}}} {value below} {label "[_ survey.lt_Presentation_Alignmen]"}}
 }
-set context_bar [ad_context_bar [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.Add_A_Question]"]
+set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.Add_A_Question]"]
 
 ad_return_template
Index: openacs-4/packages/survey/www/admin/question-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/question-add.adp	22 Dec 2003 21:57:47 -0000	1.4
+++ openacs-4/packages/survey/www/admin/question-add.adp	21 Jan 2005 17:24:28 -0000	1.5
@@ -2,7 +2,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name=title>#survey.lt_survey_infoname_New_Q#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 <property name="focus">create_question.question_text</property>
 
 <formtemplate id="create_question"></formtemplate>
Index: openacs-4/packages/survey/www/admin/question-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-add.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/question-add.tcl	12 Mar 2003 01:05:52 -0000	1.4
+++ openacs-4/packages/survey/www/admin/question-add.tcl	21 Jan 2005 17:24:28 -0000	1.5
@@ -43,7 +43,7 @@
 
 get_survey_info -section_id $section_id
 set survey_id $survey_info(survey_id)
-set context_bar [ad_context_bar [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.Add_A_Question]"]
+set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.Add_A_Question]"]
 
 if {[ad_parameter allow_question_deactivation_p] == 1} {
     ad_form -extend -name create_question -form {
Index: openacs-4/packages/survey/www/admin/question-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/question-delete.adp	22 May 2003 15:15:06 -0000	1.3
+++ openacs-4/packages/survey/www/admin/question-delete.adp	21 Jan 2005 17:24:28 -0000	1.4
@@ -3,6 +3,6 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name="title">#survey.DELETE_Question#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="confirm_delete"></formtemplate>
Index: openacs-4/packages/survey/www/admin/question-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-delete.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/question-delete.tcl	12 Mar 2003 01:05:52 -0000	1.4
+++ openacs-4/packages/survey/www/admin/question-delete.tcl	21 Jan 2005 17:24:28 -0000	1.5
@@ -79,6 +79,6 @@
         ad_script_abort
     }
 
-set context_bar [ad_context_bar "[_ survey.Delete_Question]"]    
+set context [_ survey.Delete_Question]
 ad_return_template
 
Index: openacs-4/packages/survey/www/admin/question-modify-text.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-modify-text.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/question-modify-text.adp	22 May 2003 15:15:06 -0000	1.3
+++ openacs-4/packages/survey/www/admin/question-modify-text.adp	21 Jan 2005 17:24:28 -0000	1.4
@@ -2,7 +2,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name=title>#survey.lt_survey_name_Modify_Qu#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 <formtemplate id="modify_question"></formtemplate>
 
Index: openacs-4/packages/survey/www/admin/question-modify-text.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-modify-text.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/question-modify-text.tcl	12 Mar 2003 01:05:52 -0000	1.3
+++ openacs-4/packages/survey/www/admin/question-modify-text.tcl	21 Jan 2005 17:24:28 -0000	1.4
@@ -35,6 +35,6 @@
 
 }
 
-set context_bar [ad_context_bar [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.lt_Modify_a_Questions_Te]"]
+set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.lt_Modify_a_Questions_Te]"]
 
 ad_return_template
Index: openacs-4/packages/survey/www/admin/question-modify.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-modify.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/question-modify.adp	22 May 2003 15:15:06 -0000	1.3
+++ openacs-4/packages/survey/www/admin/question-modify.adp	21 Jan 2005 17:24:28 -0000	1.4
@@ -2,7 +2,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name=title>#survey.lt_survey_name_Modify_Qu#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 <formtemplate id="modify_question"></formtemplate>
 
Index: openacs-4/packages/survey/www/admin/question-modify.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/question-modify.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/question-modify.tcl	12 Mar 2003 01:05:52 -0000	1.3
+++ openacs-4/packages/survey/www/admin/question-modify.tcl	21 Jan 2005 17:24:28 -0000	1.4
@@ -141,6 +141,6 @@
 }
 
 
-set context_bar [ad_context_bar "[_ survey.Modify_Question]"]
+set context [_ survey.Modify_Question]
 
 ad_return_template
Index: openacs-4/packages/survey/www/admin/respond.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/respond.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/survey/www/admin/respond.adp	13 Jan 2005 13:58:45 -0000	1.2
+++ openacs-4/packages/survey/www/admin/respond.adp	21 Jan 2005 17:24:28 -0000	1.3
@@ -2,7 +2,7 @@
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>#survey.lt_survey_name_Responses_1#</property>
-<property name=context_bar>@context_bar@</property>
+<property name=context>@context;noquote@</property>
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
       <form enctype=multipart/form-data method="post" action="process-response">
 	<if @initial_response_id@ not nil><input type="hidden"
Index: openacs-4/packages/survey/www/admin/respond.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/respond.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/survey/www/admin/respond.tcl	13 Jan 2005 13:58:45 -0000	1.2
+++ openacs-4/packages/survey/www/admin/respond.tcl	21 Jan 2005 17:24:28 -0000	1.3
@@ -56,7 +56,7 @@
 }
 
 # XXX TODO - person name
-set context_bar [ad_context_bar "$survey_name"]
+set context $survey_name
 
 # XXX TODO - check how the correct reponse get's filled
 #  with the correct response esp if there is more than
Index: openacs-4/packages/survey/www/admin/respondents.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/respondents.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/respondents.adp	7 Jul 2003 13:46:39 -0000	1.4
+++ openacs-4/packages/survey/www/admin/respondents.adp	21 Jan 2005 17:24:28 -0000	1.5
@@ -2,7 +2,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name="title">#survey.lt_survey_name_Responden#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 @respondents_table;noquote@
 
Index: openacs-4/packages/survey/www/admin/respondents.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/respondents.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/survey/www/admin/respondents.tcl	13 Jan 2005 13:58:45 -0000	1.6
+++ openacs-4/packages/survey/www/admin/respondents.tcl	21 Jan 2005 17:24:28 -0000	1.7
@@ -25,14 +25,14 @@
 get_survey_info -survey_id $survey_id
 set survey_name $survey_info(name)
 
-set context_bar [ad_context_bar [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.Respondents]"]
+set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] [_ survey.Respondents]]
 
 set table_def [list \
-		   [list first_names "[_ survey.First_Name]" {upper(first_names) $order} {<td><a href="one-respondent?[export_vars {user_id survey_id}]">$first_names</a></td>}] \
-		   [list last_name "[_ survey.Last_Name]" "" {<td><a href="one-respondent?[export_vars {user_id survey_id}]">$last_name</a></td>}] \
-		   [list email "[_ survey.Email_Address]" "" {<td><a href="one-respondent?[export_vars {user_id survey_id}]">$email</a></td>}] \
-		   [list actions "[_ survey.Actions]" no_sort {<td><a href="one-respondent?[export_vars {user_id survey_id}]"><img src="../graphics/view.gif" border="0" alt="[_ survey.View]"></a></td>}] \
-		   ]
+		   [list first_names [_ survey.First_Name] {upper(first_names) $order} {<td><a href="one-respondent?[export_vars {user_id survey_id}]">$first_names</a></td>}] \
+		   [list last_name [_ survey.Last_Name] "" {<td><a href="one-respondent?[export_vars {user_id survey_id}]">$last_name</a></td>}] \
+		   [list email [_ survey.Email_Address] "" {<td><a href="one-respondent?[export_vars {user_id survey_id}]">$email</a></td>}] \
+		   [list actions [_ survey.Actions] no_sort {<td><a href="one-respondent?[export_vars {user_id survey_id}]"><img src="../graphics/view.gif" border="0" alt="[_ survey.View]"></a></td>}] \
+                  ]
 
 set respondents_table [ad_table -Torderby $orderby -Textra_vars {survey_id} -Tmissing_text "[_ survey.No_data_found]" select_respondents {}  $table_def]
 
Index: openacs-4/packages/survey/www/admin/response-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/response-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/response-delete.adp	22 May 2003 15:15:06 -0000	1.3
+++ openacs-4/packages/survey/www/admin/response-delete.adp	21 Jan 2005 17:24:28 -0000	1.4
@@ -3,6 +3,6 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name="title">#survey.lt_DELETE_Survey_Respons#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="confirm_delete"></formtemplate>
Index: openacs-4/packages/survey/www/admin/response-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/response-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/survey/www/admin/response-delete.tcl	12 Mar 2003 01:05:52 -0000	1.2
+++ openacs-4/packages/survey/www/admin/response-delete.tcl	21 Jan 2005 17:24:28 -0000	1.3
@@ -36,4 +36,4 @@
     ad_returnredirect "one-respondent?[export_vars {survey_id user_id}]"
 }
 
-set context_bar [ad_context_bar "[_ survey.Delete_Response]"]
+set context [_ survey.Delete_Response]
Index: openacs-4/packages/survey/www/admin/response-drill-down.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/response-drill-down.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/response-drill-down.adp	22 May 2003 15:15:06 -0000	1.3
+++ openacs-4/packages/survey/www/admin/response-drill-down.adp	21 Jan 2005 17:24:28 -0000	1.4
@@ -2,7 +2,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name=title>#survey.lt_People_who_answered_r#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 #survey.lt_survey_name_responder#
 
Index: openacs-4/packages/survey/www/admin/response-drill-down.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/response-drill-down.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/survey/www/admin/response-drill-down.tcl	12 Mar 2003 01:05:52 -0000	1.2
+++ openacs-4/packages/survey/www/admin/response-drill-down.tcl	21 Jan 2005 17:24:28 -0000	1.3
@@ -49,7 +49,7 @@
 
 db_multirow user_responses all_users_for_response {}
 
-set context_bar [ad_context_bar \
+set context [list \
      [list "one?[export_url_vars survey_id]" $survey_info(name)] \
      [list "responses?[export_url_vars survey_id]" "[_ survey.Responses]"] \
      "[_ survey.One_Response]"]
Index: openacs-4/packages/survey/www/admin/responses-export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/responses-export.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/survey/www/admin/responses-export.tcl	13 Jan 2005 13:58:46 -0000	1.8
+++ openacs-4/packages/survey/www/admin/responses-export.tcl	21 Jan 2005 17:24:28 -0000	1.9
@@ -23,7 +23,7 @@
 ns_log notice "DAVEB: n_responses=$n_responses"
 if {$n_responses==0} {
     get_survey_info -survey_id $survey_id
-    set context_bar [ad_context_bar [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.CSV_Export]"]
+    set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.CSV_Export]"]
     ad_return_template "no-responses"
     return
 }
Index: openacs-4/packages/survey/www/admin/responses.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/responses.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/responses.adp	7 Jul 2003 13:46:40 -0000	1.4
+++ openacs-4/packages/survey/www/admin/responses.adp	21 Jan 2005 17:24:28 -0000	1.5
@@ -2,7 +2,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name=title>#survey.lt_survey_name_Responses#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 @return_html;noquote@
 <p>
Index: openacs-4/packages/survey/www/admin/responses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/responses.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/survey/www/admin/responses.tcl	12 Mar 2003 01:05:52 -0000	1.2
+++ openacs-4/packages/survey/www/admin/responses.tcl	21 Jan 2005 17:24:28 -0000	1.3
@@ -87,6 +87,6 @@
  	set response_sentence "[_ survey.lt_There_have_been_n]"
 }
 
-set context_bar [ad_context_bar [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.Responses]"]
+set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.Responses]"]
 
 ad_return_template
Index: openacs-4/packages/survey/www/admin/send-mail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/send-mail.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/send-mail.adp	22 May 2003 15:15:06 -0000	1.3
+++ openacs-4/packages/survey/www/admin/send-mail.adp	21 Jan 2005 17:24:28 -0000	1.4
@@ -3,7 +3,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name="title">#survey.lt_Send_Mail_Re_survey_n#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
     <formtemplate id="send-mail"></formtemplate>
   
Index: openacs-4/packages/survey/www/admin/send-mail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/send-mail.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/send-mail.tcl	12 Mar 2003 01:05:52 -0000	1.4
+++ openacs-4/packages/survey/www/admin/send-mail.tcl	21 Jan 2005 17:24:28 -0000	1.5
@@ -100,6 +100,6 @@
     ad_script_abort
 }
 
-set context_bar [ad_context_bar "[_ survey.Send_Mail]"]
+set context [_ survey.Send_Mail]
 ad_return_template
 
Index: openacs-4/packages/survey/www/admin/survey-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-copy.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/survey-copy.adp	22 May 2003 15:15:06 -0000	1.4
+++ openacs-4/packages/survey/www/admin/survey-copy.adp	21 Jan 2005 17:24:28 -0000	1.5
@@ -1,7 +1,7 @@
 <master>
 <property name="survey_id">@survey_id;noquote@</property>
 <property name="title">#survey.Copy_title_name#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="copy_survey"></formtemplate>
 
Index: openacs-4/packages/survey/www/admin/survey-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-copy.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/survey-copy.tcl	12 Mar 2003 01:05:52 -0000	1.3
+++ openacs-4/packages/survey/www/admin/survey-copy.tcl	21 Jan 2005 17:24:28 -0000	1.4
@@ -33,5 +33,5 @@
 }
 
 
-set context_bar [ad_context_bar "[_ survey.Copy] $title_name"]
+set context "[_ survey.Copy] $title_name"
 ad_return_template
Index: openacs-4/packages/survey/www/admin/survey-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-create.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/survey-create.adp	22 Dec 2003 21:57:47 -0000	1.4
+++ openacs-4/packages/survey/www/admin/survey-create.adp	21 Jan 2005 17:24:28 -0000	1.5
@@ -1,7 +1,7 @@
 <master>
 
 <property name=title>#survey.lt_Survey_Administration_2#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 <property name="focus">create_survey.name</property>
 
 <formtemplate id="create_survey">
Index: openacs-4/packages/survey/www/admin/survey-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-create.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/survey/www/admin/survey-create.tcl	13 Jan 2005 13:58:46 -0000	1.6
+++ openacs-4/packages/survey/www/admin/survey-create.tcl	21 Jan 2005 17:24:28 -0000	1.7
@@ -83,7 +83,7 @@
 
 # function to insert survey type-specific form html
 
-set context_bar [ad_context_bar "[_ survey.Create_Survey]"]
+set context [_ survey.Create_Survey]
 
 ad_return_template
 
Index: openacs-4/packages/survey/www/admin/survey-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/survey-delete.adp	22 May 2003 15:15:06 -0000	1.3
+++ openacs-4/packages/survey/www/admin/survey-delete.adp	21 Jan 2005 17:24:28 -0000	1.4
@@ -4,7 +4,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name="title">#survey.lt_DELETE_survey_infonam#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="confirm_delete"></formtemplate>
 
Index: openacs-4/packages/survey/www/admin/survey-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-delete.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/survey-delete.tcl	12 Mar 2003 01:05:52 -0000	1.3
+++ openacs-4/packages/survey/www/admin/survey-delete.tcl	21 Jan 2005 17:24:28 -0000	1.4
@@ -42,4 +42,4 @@
     }
 }
 
-set context_bar [ad_context_bar "[_ survey.Delete_Survey]"]
+set context [_ survey.Delete_Survey]
Index: openacs-4/packages/survey/www/admin/survey-preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-preview.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/survey/www/admin/survey-preview.adp	26 Jan 2004 15:39:48 -0000	1.4
+++ openacs-4/packages/survey/www/admin/survey-preview.adp	21 Jan 2005 17:24:28 -0000	1.5
@@ -2,7 +2,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name=title>#survey.lt_Preview_One_Survey_na#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 <a href="@return_url@">#survey.Return#</a>
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
       <form enctype="multipart/form-data" >
Index: openacs-4/packages/survey/www/admin/survey-preview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-preview.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/survey-preview.tcl	13 Jan 2005 13:58:46 -0000	1.3
+++ openacs-4/packages/survey/www/admin/survey-preview.tcl	21 Jan 2005 17:24:28 -0000	1.4
@@ -47,7 +47,7 @@
    } 
    
 
-set context_bar [ad_context_bar "[_ survey.Preview] $name"]
+set context [list "[_ survey.Preview] $name"]
 
 # build a list containing the HTML (generated with survey_question_display) for each question
 set rownum 0
Index: openacs-4/packages/survey/www/admin/user-responses-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/user-responses-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/user-responses-delete.adp	22 May 2003 15:15:06 -0000	1.3
+++ openacs-4/packages/survey/www/admin/user-responses-delete.adp	21 Jan 2005 17:24:28 -0000	1.4
@@ -4,6 +4,6 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name="title">#survey.lt_DELETE_Survey_Respons#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="confirm_delete"></formtemplate>
Index: openacs-4/packages/survey/www/admin/user-responses-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/user-responses-delete.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/survey/www/admin/user-responses-delete.tcl	12 Mar 2003 01:05:52 -0000	1.3
+++ openacs-4/packages/survey/www/admin/user-responses-delete.tcl	21 Jan 2005 17:24:28 -0000	1.4
@@ -41,4 +41,4 @@
     ad_script_abort
 }
 
-set context_bar [ad_context_bar "[_ survey.Delete_Response]"]
+set context [_ survey.Delete_Response]
Index: openacs-4/packages/survey/www/admin/view-text-responses.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/view-text-responses.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/survey/www/admin/view-text-responses.adp	13 Jan 2005 13:58:46 -0000	1.5
+++ openacs-4/packages/survey/www/admin/view-text-responses.adp	21 Jan 2005 17:24:28 -0000	1.6
@@ -3,7 +3,7 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name="title">#survey.lt_survey_name_Responses_1#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 @question_text@ 
 <hr />
 <if @responses:rowcount@ eq 0>
Index: openacs-4/packages/survey/www/admin/view-text-responses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/view-text-responses.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/survey/www/admin/view-text-responses.tcl	12 Mar 2003 01:05:52 -0000	1.2
+++ openacs-4/packages/survey/www/admin/view-text-responses.tcl	21 Jan 2005 17:24:28 -0000	1.3
@@ -40,4 +40,4 @@
 
 db_multirow responses all_responses_to_question {}
 
-set context_bar [ad_context_bar [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.lt_Responses_to_Question]"]
+set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.lt_Responses_to_Question]"]