Index: openacs-4/contrib/packages/survey/catalog/survey.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/catalog/Attic/survey.en_US.ISO-8859-1.xml,v
diff -u -r1.8 -r1.9
--- openacs-4/contrib/packages/survey/catalog/survey.en_US.ISO-8859-1.xml	13 Jan 2005 13:54:38 -0000	1.8
+++ openacs-4/contrib/packages/survey/catalog/survey.en_US.ISO-8859-1.xml	16 Mar 2005 12:26:31 -0000	1.9
@@ -3,6 +3,7 @@
 
   <msg key="--_Please_Choose_--">-- Please Choose --</msg>
   <msg key="-__Created_by">-  Created by</msg>
+  <msg key="Created_by">Created by</msg>
   <msg key="_on_creation_date">, on %creation_date%</msg>
   <msg key="Accessibility">Accessibility:</msg>
   <msg key="Action_on_submit">Action on submit</msg>
@@ -299,7 +300,7 @@
   <msg key="lt_The_response_to_quest_1">The response to \&quot;$question_text\&quot; must be an integer. Your answer was \&quot;$response_value\&quot;.</msg>
   <msg key="lt_There_has_been_1_resp">There has been 1 response.</msg>
   <msg key="lt_There_have_been_n">There have been %n_responses% responses.</msg>
-  <msg key="lt_There_have_been_n_res">There have been $n_responses responses.</msg>
+  <msg key="lt_There_have_been_n_res">There have been %n_responses% responses.</msg>
   <msg key="lt_There_isare_n_resp">There %isare% %n_responses% %resp% to this question.  Editing a question with responses is not recommnded. No record of the original question will remain.  Proceed with caution.</msg>
   <msg key="lt_There_isare_n_respons">There $isare $n_responses $resp to this question.  Editing a question with responses is not recommended. No record of the original question will remain.  Proceed with caution.</msg>
   <msg key="lt_There_was_an_error_wh">There was an error while trying to delete the question:</msg>
@@ -321,6 +322,7 @@
   <msg key="lt_This_survey_is_not_ed">This survey is not editable</msg>
   <msg key="lt_This_will_remove_resp">This will remove $response_count responses</msg>
   <msg key="lt_This_will_remove_respo">This will remove %response_count% responses</msg>
+  <msg key="lt_to_this_survey">to this survey.</msg>
   <msg key="lt_to_the_survey_index_p">to the survey index page.</msg>
   <msg key="lt_to_the_surveyindex_pa">to the survey
 	index page.</msg>
@@ -423,6 +425,7 @@
   <msg key="Submit">Submit</msg>
   <msg key="Submit_response">Submit response</msg>
   <msg key="Summary">Summary</msg>
+  <msg key="send_authenticated_link">Send authenticated link</msg>
   <msg key="survey_admin_add_question">Survey Administration: Add a Question (cont.)</msg>
   <msg key="survey_admin_create_survey">Survey Administration: Create New Survey</msg>
   <msg key="Survey_Description">Survey Description</msg>
Index: openacs-4/contrib/packages/survey/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/Attic/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/index.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/index.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#survey.Surveys#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 <if @admin_p@ eq "1"><p style="text-align: right;"><a href="admin/"><img src="graphics/admin.gif" border="0" alt="Administer Surveys"></a></if>
     <ul>
       
Index: openacs-4/contrib/packages/survey/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/Attic/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/index.tcl	1 Mar 2005 00:01:21 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/index.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -15,7 +15,7 @@
 
 set package_id [ad_conn package_id]
 
-set context_bar [ad_context_bar]
+set context {}
 
 # Allow public surveys
 # set user_id [auth::require_login]
Index: openacs-4/contrib/packages/survey/www/one-respondent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/Attic/one-respondent.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/one-respondent.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/one-respondent.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Answers to @survey_name@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
     @description@
     <p>
Index: openacs-4/contrib/packages/survey/www/one-respondent.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/Attic/one-respondent.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/one-respondent.tcl	1 Mar 2005 00:01:21 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/one-respondent.tcl	16 Mar 2005 12:26:31 -0000	1.4
@@ -37,7 +37,7 @@
 set survey_name $survey_info(name)
 set description $survey_info(description)
 set editable_p $survey_info(editable_p)
-set context_bar [ad_context_bar "[_ survey.Responses]"]
+set context [list [_ survey.Responses]]
 db_multirow -extend {answer_summary} responses responses_select {} {
     set answer_summary [survey_answer_summary_display $response_id 1] 
 }
Index: openacs-4/contrib/packages/survey/www/one-survey.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/Attic/one-survey.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/one-survey.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/one-survey.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#survey.Surveys#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 <if @admin_p@ eq "1"><p style="text-align: right;"><a href="admin/"><img src="graphics/admin.gif" border="0" alt="Admin"></a></p></if>
     <ul>
       
Index: openacs-4/contrib/packages/survey/www/one-survey.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/Attic/one-survey.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/one-survey.tcl	1 Mar 2005 00:01:21 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/one-survey.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -15,7 +15,7 @@
 
 set package_id [ad_conn package_id]
 
-set context_bar [ad_context_bar]
+set context {}
 
 set user_id [auth::require_login]
 
Index: openacs-4/contrib/packages/survey/www/process-response.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/Attic/process-response.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/process-response.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/process-response.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -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><if @return_url@ eq ""><a href=".">#survey.Return#</a> #survey.lt_to_the_surveyindex_pa#</if>
Index: openacs-4/contrib/packages/survey/www/process-response.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/Attic/process-response.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/contrib/packages/survey/www/process-response.tcl	10 Mar 2005 21:23:19 -0000	1.9
+++ openacs-4/contrib/packages/survey/www/process-response.tcl	16 Mar 2005 12:26:31 -0000	1.10
@@ -345,6 +345,6 @@
     ad_returnredirect "$return_url"
     ad_script_abort
 } else {
-    set context_bar [ad_context_bar "[_ survey.lt_Response_Submitted_fo]"]
+    set context [list [_ survey.lt_Response_Submitted_fo]]
     ad_return_template
 }	
Index: openacs-4/contrib/packages/survey/www/respond.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/Attic/respond.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/respond.adp	1 Mar 2004 11:03:48 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/respond.adp	16 Mar 2005 12:26:31 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name=title>One Survey: @name;noquote@</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 @status_bar;noquote@
 <span style="color: #f00;">*</span> #survey.lt_denotes_a_required_qu#               
 <formtemplate id="take_survey" style="@style@"></formtemplate>
Index: openacs-4/contrib/packages/survey/www/respond.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/Attic/respond.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/survey/www/respond.tcl	1 Mar 2005 00:01:21 -0000	1.5
+++ openacs-4/contrib/packages/survey/www/respond.tcl	16 Mar 2005 12:26:31 -0000	1.6
@@ -62,7 +62,7 @@
 
 ad_require_permission $survey_id write
 
-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/contrib/packages/survey/www/admin/block-question-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/block-question-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/block-question-add.adp	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/block-question-add.adp	16 Mar 2005 12:26:31 -0000	1.2
@@ -2,7 +2,7 @@
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>@survey_info.name;noquote@: New Question</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
     <formtemplate id="create_question"></formtemplate>
 
Index: openacs-4/contrib/packages/survey/www/admin/block-question-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/block-question-add.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/block-question-add.tcl	1 Mar 2004 10:42:10 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/block-question-add.tcl	16 Mar 2005 12:26:31 -0000	1.4
@@ -42,7 +42,7 @@
 }
 
 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/contrib/packages/survey/www/admin/condition-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/condition-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/condition-add.adp	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/condition-add.adp	16 Mar 2005 12:26:31 -0000	1.2
@@ -1,8 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>@survey_info.name;noquote@: Branching Condition</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
     <formtemplate id="add_condition"></formtemplate>
 
Index: openacs-4/contrib/packages/survey/www/admin/condition-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/condition-add.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/condition-add.tcl	1 Mar 2004 10:58:00 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/condition-add.tcl	16 Mar 2005 12:26:31 -0000	1.4
@@ -10,7 +10,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_Section]"]
+set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] [_ survey.Add_A_Section]]
 
 db_1row branch_info ""
 
Index: openacs-4/contrib/packages/survey/www/admin/description-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/description-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/description-edit.adp	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/description-edit.adp	16 Mar 2005 12:26:31 -0000	1.2
@@ -1,7 +1,7 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>@survey_name;noquote@: Edit Description</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 <formtemplate id="edit-survey"></formtemplate>
Index: openacs-4/contrib/packages/survey/www/admin/description-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/description-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/description-edit.tcl	14 Feb 2004 19:57:59 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/description-edit.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -35,6 +35,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/contrib/packages/survey/www/admin/import-responses.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/import-responses.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/import-responses.adp	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/import-responses.adp	16 Mar 2005 12:26:31 -0000	1.2
@@ -1,7 +1,7 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>@survey_name;noquote@: Import responses</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 <formtemplate id="pick-fields"></formtemplate>
Index: openacs-4/contrib/packages/survey/www/admin/import-responses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/import-responses.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/import-responses.tcl	14 Feb 2004 19:57:59 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/import-responses.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -32,7 +32,7 @@
     ad_script_abort
 }
 set survey_name $survey_info(name)
-set context_bar [ad_context_bar [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.Import_responses]"]
+set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] [_ survey.Import_responses]]
 
 if {[info exists csvfile(tmpfile)]} {
     # preserve the file for future use
Index: openacs-4/contrib/packages/survey/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/index.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/index.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
 
 <property name=title>#survey.lt_Survey_Administration#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 <property name="link_all">1</property>
 
 <ul>
Index: openacs-4/contrib/packages/survey/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/index.tcl	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/index.tcl	16 Mar 2005 12:26:31 -0000	1.2
@@ -11,7 +11,7 @@
 
 }
 
-set context_bar [ad_context_bar]
+set context {}
 
 set package_id [ad_conn package_id]
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/packages/survey/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/packages/survey/www/admin/name-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/name-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/name-edit.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/name-edit.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,8 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>@survey_name;noquote@: Edit Name</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 #survey.Edit_and_submit_to_ch#
 <formtemplate id="edit-name"></formtemplate>
Index: openacs-4/contrib/packages/survey/www/admin/name-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/name-edit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/name-edit.tcl	13 Jan 2005 13:54:40 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/name-edit.tcl	16 Mar 2005 12:26:31 -0000	1.4
@@ -42,7 +42,7 @@
     ad_script_abort
 }
 
-set context_bar [ad_context_bar "[_ survey.Edit_Name]"]
+set context [list [list "one?[export_vars survey_id]" $survey_name] [_ survey.Edit_Name]]
 
 ad_return_template
 
Index: openacs-4/contrib/packages/survey/www/admin/one-respondent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/one-respondent.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/one-respondent.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/one-respondent.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,9 +1,9 @@
-<master src="master">
+<master>
 
 <property name="survey_id">@survey_id@</property>
 <property name="survey_name@">@survey_info.name;noquote@</property>
 <property name="title">One Respondent: @first_names;noquote@ @last_name;noquote@</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">
Index: openacs-4/contrib/packages/survey/www/admin/one-respondent.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/one-respondent.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/one-respondent.tcl	14 Feb 2004 19:57:59 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/one-respondent.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -31,7 +31,7 @@
     return
 }
 
-set context_bar [ad_context_bar "[_ survey.One_Respondent]"]
+set context [list [_ survey.One_Respondent]]
  
 
 db_multirow -extend {response_display} responses get_responses {} {
Index: openacs-4/contrib/packages/survey/www/admin/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/one.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/one.adp	13 Jan 2005 13:54:40 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/one.adp	16 Mar 2005 12:26:31 -0000	1.4
@@ -2,14 +2,10 @@
 <property name="survey_id">@survey_id;noquote@</property>
 
 <property name="title">One Survey: @survey_info.name;noquote@</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>
+<p>#survey.Created_by# <a href="@user_link@">@survey_info.creator_name@</a>#survey._on_creation_date#</p>
 
-<font size=+1><b>@survey_info.name;noquote@</b></font> #survey.-__Created_by# <a href="@user_link@">@survey_info.creator_name@</a>#survey._on_creation_date#</h2>
-
-<br /><br />
-
 <table class="table-display" cellpadding=2 cellspacing=0>
  <tr class="even">
   <td> </td>
Index: openacs-4/contrib/packages/survey/www/admin/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/one.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/one.tcl	13 Jan 2005 13:54:40 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/one.tcl	16 Mar 2005 12:26:31 -0000	1.4
@@ -61,7 +61,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)"
 
 # form for response upload
 ad_form -name import_responses -action import-responses -html {enctype multipart/form-data} -form {
Index: openacs-4/contrib/packages/survey/www/admin/predefined-question-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/predefined-question-admin.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/predefined-question-admin.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/predefined-question-admin.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
 
 <property name=title>#survey.lt_Survey_Administration#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 <property name="link_all">1</property>
 
 <ul>
Index: openacs-4/contrib/packages/survey/www/admin/predefined-question-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/predefined-question-admin.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/predefined-question-admin.tcl	14 Feb 2004 19:57:59 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/predefined-question-admin.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -10,7 +10,7 @@
 
 set package_id [ad_conn package_id]
 set user_id [ad_get_user_id]
-set context_bar [ad_context_bar "[_ survey.Predefined_Questions]"]
+set context [list [_ survey.Predefined_Questions]]
 # require sitewide admin
 ad_require_permission [acs_magic_object "security_context_root"] "admin"
 
Index: openacs-4/contrib/packages/survey/www/admin/predefined-question-ae-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/predefined-question-ae-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/predefined-question-ae-2.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/predefined-question-ae-2.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
 
 <property name=title>#survey.lt_Survey_Administration#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 <property name="link_all">1</property>
 
 <formtemplate id="predef">
Index: openacs-4/contrib/packages/survey/www/admin/predefined-question-ae-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/predefined-question-ae-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/packages/survey/www/admin/predefined-question-ae-2.tcl	1 Mar 2004 11:00:51 -0000	1.5
+++ openacs-4/contrib/packages/survey/www/admin/predefined-question-ae-2.tcl	16 Mar 2005 12:26:31 -0000	1.6
@@ -13,7 +13,7 @@
 
 set package_id [ad_conn package_id]
 set user_id [ad_get_user_id]
-set context_bar [ad_context_bar "[_ survey.Predefined_Questions]"]
+set context [list [_ survey.Predefined_Questions]]
 # require sitewide admin
 ad_require_permission [acs_magic_object "security_context_root"] "admin"
 
Index: openacs-4/contrib/packages/survey/www/admin/predefined-question-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/predefined-question-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/predefined-question-ae.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/predefined-question-ae.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
 
 <property name=title>#survey.lt_Survey_Administration#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 <property name="link_all">1</property>
 
 <formtemplate id="predef">
Index: openacs-4/contrib/packages/survey/www/admin/predefined-question-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/predefined-question-ae.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/predefined-question-ae.tcl	14 Feb 2004 19:57:59 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/predefined-question-ae.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -10,7 +10,7 @@
 
 set package_id [ad_conn package_id]
 set user_id [ad_get_user_id]
-set context_bar [ad_context_bar "[_ survey.Predefined_Questions]"]
+set context [list [_ survey.Predefined_Questions]]
 # require sitewide admin
 ad_require_permission [acs_magic_object "security_context_root"] "admin"
 
Index: openacs-4/contrib/packages/survey/www/admin/predefined-question.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/predefined-question.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/predefined-question.adp	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/predefined-question.adp	16 Mar 2005 12:26:31 -0000	1.2
@@ -1,8 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>@survey_info.name;noquote@: New Question</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
     <formtemplate id="create_question"></formtemplate>
 
Index: openacs-4/contrib/packages/survey/www/admin/predefined-question.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/predefined-question.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/predefined-question.tcl	14 Feb 2004 19:57:59 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/predefined-question.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -38,7 +38,7 @@
 }	    
 		
 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/contrib/packages/survey/www/admin/question-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/question-add-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/question-add-2.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/question-add-2.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,8 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>#survey.survey_admin_add_question#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 
     <formtemplate id="create-question-2"></formtemplate>
Index: openacs-4/contrib/packages/survey/www/admin/question-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/question-add-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/question-add-2.tcl	13 Jan 2005 13:54:40 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/question-add-2.tcl	16 Mar 2005 12:26:31 -0000	1.4
@@ -185,6 +185,6 @@
 }
 
 
-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/contrib/packages/survey/www/admin/question-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/question-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/question-add.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/question-add.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,12 +1,12 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>@survey_info.name;noquote@: New Question</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
     <formtemplate id="create_question"></formtemplate>
 
     <a href="@catalogue_link;noquote@">#survey.lt_Add_a_question_from_t#</a>
 
-</form>
 
+
Index: openacs-4/contrib/packages/survey/www/admin/question-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/question-add.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/question-add.tcl	13 Jan 2005 13:54:40 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/question-add.tcl	16 Mar 2005 12:26:31 -0000	1.4
@@ -12,8 +12,7 @@
 } {
     section_id:integer
     {after:integer ""}
-    {return_url ""}
-    
+    {return_url ""}    
 }
 
 set package_id [ad_conn package_id]
@@ -50,8 +49,9 @@
 }	    
 		
 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?survey_id=$survey_id" $survey_info(name)] [_ survey.Add_A_Question]]
 
+
 if {[ad_parameter allow_question_deactivation_p] == 1} {
     ad_form -extend -name create_question -form {
         {active:text(radio)     {label "[_ survey.Active]"} {options {{[_ survey.Yes] t} {[_ survey.No] f}}} {value t}}
@@ -65,8 +65,8 @@
     {required_p:text(radio)     {label "[_ survey.Required]"} {options {{[_ survey.Yes] t} {[_ survey.No] f}}} {value t}}
 }
 set catalogue_link "predefined-question?[export_url_vars section_id after]"
-ad_return_template
 
 
 
 
+
Index: openacs-4/contrib/packages/survey/www/admin/question-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/question-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/question-delete.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/question-delete.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,9 +1,9 @@
-<master src="master">
+<master>
 
 <property name="survey_id">@survey_id@</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/contrib/packages/survey/www/admin/question-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/question-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/question-delete.tcl	14 Feb 2004 19:57:59 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/question-delete.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -102,6 +102,6 @@
         ad_script_abort
     }
 
-set context_bar [ad_context_bar "<#_ Delete Question"]    
+set context [list [_ survey.Delete_Question]]
 ad_return_template
 
Index: openacs-4/contrib/packages/survey/www/admin/question-modify-text.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/question-modify-text.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/question-modify-text.adp	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/question-modify-text.adp	16 Mar 2005 12:26:31 -0000	1.2
@@ -1,8 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>@survey_name;noquote@: Modify Question Text</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 <formtemplate id="modify_question"></formtemplate>
 
Index: openacs-4/contrib/packages/survey/www/admin/question-modify-text.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/question-modify-text.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/question-modify-text.tcl	14 Feb 2004 19:57:59 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/question-modify-text.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -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/contrib/packages/survey/www/admin/question-modify.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/question-modify.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/question-modify.adp	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/question-modify.adp	16 Mar 2005 12:26:31 -0000	1.2
@@ -1,8 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>@survey_name;noquote@: Modify Question Text</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 <formtemplate id="modify_question"></formtemplate>
 
Index: openacs-4/contrib/packages/survey/www/admin/question-modify.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/question-modify.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/survey/www/admin/question-modify.tcl	13 Jan 2005 13:54:40 -0000	1.4
+++ openacs-4/contrib/packages/survey/www/admin/question-modify.tcl	16 Mar 2005 12:26:31 -0000	1.5
@@ -191,6 +191,7 @@
 }
 
 
-set context_bar [ad_context_bar "[_ survey.Modify_Question]"]
 
+set context [list [list "one?survey_id=$survey_id" $survey_info(name)] [_ survey.Modify_Question]]
+
 ad_return_template
Index: openacs-4/contrib/packages/survey/www/admin/report.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/report.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/report.adp	13 Jan 2005 13:54:40 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/report.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,9 +1,9 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name="title">@survey_name;noquote@: Report Template</property>
 
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <table class="table-display">
 <tr class="odd">
Index: openacs-4/contrib/packages/survey/www/admin/report.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/report.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/report.tcl	13 Jan 2005 13:54:40 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/report.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -22,7 +22,7 @@
 
 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]]
 
 # If there is already a report for this survey load it.
 
Index: openacs-4/contrib/packages/survey/www/admin/respond.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/respond.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/respond.adp	13 Jan 2005 13:54:40 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/respond.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name=title>One Survey: @name;noquote@</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 @status_bar;noquote@
 <div align="center">
Index: openacs-4/contrib/packages/survey/www/admin/respond.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/respond.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/respond.tcl	1 Mar 2005 00:01:21 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/respond.tcl	16 Mar 2005 12:26:31 -0000	1.4
@@ -62,7 +62,7 @@
 
 ad_require_permission $survey_id write
 
-set context_bar [ad_context_bar "$name"]
+set context [list "$name"]
 set button_label "[_ survey.Submit_response]"
 if {$editable_p == "t"} {
     if {$response_id > 0} {
Index: openacs-4/contrib/packages/survey/www/admin/respondents.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/respondents.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/respondents.adp	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/respondents.adp	16 Mar 2005 12:26:31 -0000	1.2
@@ -1,7 +1,7 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name="title">@survey_name;noquote@: Respondents</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 @respondents_table;noquote@
Index: openacs-4/contrib/packages/survey/www/admin/respondents.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/respondents.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/respondents.tcl	14 Feb 2004 19:57:59 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/respondents.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -25,7 +25,7 @@
 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 {
     {first_names "[_ survey.First_Name]" {upper(first_names) $order} {<td><a href="one-respondent?[export_vars {user_id survey_id}]">$first_names</a></td>}}
Index: openacs-4/contrib/packages/survey/www/admin/response-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/response-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/response-delete.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/response-delete.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,9 +1,9 @@
-<master src="master">
+<master>
 
 <property name="survey_id">@survey_id@</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/contrib/packages/survey/www/admin/response-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/response-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/response-delete.tcl	14 Feb 2004 19:57:59 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/response-delete.tcl	16 Mar 2005 12:26:31 -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 [list [_ survey.Delete_Response]]
Index: openacs-4/contrib/packages/survey/www/admin/response-drill-down.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/response-drill-down.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/response-drill-down.adp	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/response-drill-down.adp	16 Mar 2005 12:26:31 -0000	1.2
@@ -1,8 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>People who answered @response_text@</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 @survey_name@ responders who answered @response_text@
 when asked @question_text@:
Index: openacs-4/contrib/packages/survey/www/admin/response-drill-down.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/response-drill-down.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/response-drill-down.tcl	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/response-drill-down.tcl	16 Mar 2005 12:26:31 -0000	1.2
@@ -49,9 +49,9 @@
 
 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]" "Responses"] \
-     "One Response"]
+		 [_ survey.One_Response]]
 
 ad_return_template
Index: openacs-4/contrib/packages/survey/www/admin/responses.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/responses.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/responses.adp	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/responses.adp	16 Mar 2005 12:26:31 -0000	1.2
@@ -1,8 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>@survey_name;noquote@: Responses</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
 @response_sentence@
 <p>
Index: openacs-4/contrib/packages/survey/www/admin/responses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/responses.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/responses.tcl	13 Jan 2005 13:54:40 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/responses.tcl	16 Mar 2005 12:26:31 -0000	1.4
@@ -75,11 +75,11 @@
 set n_responses [db_string survey_number_responses {} ]
 
 if { $n_responses == 1 } {
-    set response_sentence "[_ survey.lt_There_has_been_1_resp] $n_responses"
+    set response_sentence [_ survey.lt_There_has_been_1_resp]
 } else {
- 	set response_sentence "[_ survey.lt_There_have_been_n_res] $n_responses"
+    set response_sentence [_ survey.lt_There_have_been_n_res]
 }
 
-set context_bar [ad_context_bar [list "one?[export_url_vars survey_id]" $survey_info(name)] "Responses"]
+set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] [_ survey.Responses]]
 
 ad_return_template
Index: openacs-4/contrib/packages/survey/www/admin/section-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/section-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/section-add.adp	19 Sep 2003 16:48:04 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/section-add.adp	16 Mar 2005 12:26:31 -0000	1.2
@@ -1,9 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>@survey_info.name@: New Section</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
     <formtemplate id="create_section"></formtemplate>
 
-</form>
Index: openacs-4/contrib/packages/survey/www/admin/section-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/section-add.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/section-add.tcl	13 Jan 2005 13:54:40 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/section-add.tcl	16 Mar 2005 12:26:31 -0000	1.4
@@ -45,7 +45,7 @@
 }
 
 get_survey_info -survey_id $survey_id
-set context_bar [ad_context_bar [list "one?[export_url_vars survey_id]" $survey_info(name)] "[_ survey.Add_A_Section]"]
+set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] [_ survey.Add_A_Section]]
 
 ad_return_template
 
Index: openacs-4/contrib/packages/survey/www/admin/section-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/section-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/section-delete.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/section-delete.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,9 +1,9 @@
-<master src="master">
+<master>
 
 <property name="survey_id">@survey_id@</property>
 
 <property name="title">#survey.DELETE_Section#</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="warning"></formtemplate>
 
Index: openacs-4/contrib/packages/survey/www/admin/section-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/section-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/section-delete.tcl	14 Feb 2004 19:57:59 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/section-delete.tcl	16 Mar 2005 12:26:31 -0000	1.3
@@ -42,7 +42,8 @@
 	    {survey_id:text(hidden) {value $survey_id}}
 	    {warning:text(inform) {label "Warning"} {value "[_ survey.lt_Unable_to_delete_sect]"}}
 	}
-	set context_bar [ad_context_bar "[_ survey.Delete_Section]"]    
+
+	set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] [_ survey.Delete_Section]]
 	ad_return_template
 	set error 1
     }
@@ -52,7 +53,7 @@
 	{survey_id:text(hidden) {value $survey_id}}
 	{warning:text(inform) {label "Warning"} {value "[_ survey.lt_Unable_to_delete_sect_1]"}}
     }
-    set context_bar [ad_context_bar "[_ survey.Delete_Section]"]    
+    set context [list [list "one?[export_url_vars survey_id]" $survey_info(name)] [_ survey.Delete_Section]]
     ad_return_template
     set error 1
 }
Index: openacs-4/contrib/packages/survey/www/admin/section-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/section-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/section-edit.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/section-edit.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,8 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>@survey_info.name;noquote@: Edit Section</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
     <formtemplate id="modify_section"></formtemplate>
 
Index: openacs-4/contrib/packages/survey/www/admin/section-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/section-edit.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/survey/www/admin/section-edit.tcl	13 Jan 2005 13:54:40 -0000	1.4
+++ openacs-4/contrib/packages/survey/www/admin/section-edit.tcl	16 Mar 2005 12:26:31 -0000	1.5
@@ -63,6 +63,6 @@
     set template_exists "f"
 }
 
-set context_bar [ad_context_bar "[_ survey.Edit_Section]"]
+set context [list [_ survey.Edit_Section]]
 
 ad_return_template
Index: openacs-4/contrib/packages/survey/www/admin/section-template-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/section-template-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/section-template-ae.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/section-template-ae.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,8 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>Edit Section: @section_info.name;noquote@</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 
     <formtemplate id="edit_template"></formtemplate>
 
Index: openacs-4/contrib/packages/survey/www/admin/section-template-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/section-template-ae.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/section-template-ae.tcl	16 Mar 2004 12:01:59 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/section-template-ae.tcl	16 Mar 2005 12:26:31 -0000	1.4
@@ -83,7 +83,7 @@
 
 survey_section_add_to_form preview_section $section_id
 
-set context_bar [ad_context_bar "[_ survey.Edit_Section]"]
+set context [list [_ survey.Edit_Section]]
 
 set style "survey/standard"
 db_0or1row get_style ""
Index: openacs-4/contrib/packages/survey/www/admin/send-mail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/send-mail.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/send-mail.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/send-mail.adp	16 Mar 2005 12:26:31 -0000	1.3
@@ -1,9 +1,9 @@
-<master src="master">
+<master>
 
 <property name="survey_id">@survey_id@</property>
 
 <property name="title">Send Mail Re: @survey_name;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
     <formtemplate id="send-mail"></formtemplate>
   
Index: openacs-4/contrib/packages/survey/www/admin/send-mail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/send-mail.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/send-mail.tcl	13 Jan 2005 13:54:40 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/send-mail.tcl	16 Mar 2005 12:26:32 -0000	1.4
@@ -99,6 +99,6 @@
     ad_script_abort
 }
 
-set context_bar [ad_context_bar "[_ survey.Send_Mail]"]
+set context [list [_ survey.Send_Mail]]
 ad_return_template
 
Index: openacs-4/contrib/packages/survey/www/admin/survey-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/survey-copy.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/survey-copy.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/survey-copy.adp	16 Mar 2005 12:26:32 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
 <property name="survey_id">@survey_id@</property>
 <property name="title">Copy: @title_name;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="copy_survey"></formtemplate>
 
Index: openacs-4/contrib/packages/survey/www/admin/survey-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/survey-copy.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/survey-copy.tcl	15 Feb 2004 13:56:12 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/survey-copy.tcl	16 Mar 2005 12:26:32 -0000	1.3
@@ -34,5 +34,5 @@
 }
 
 
-set context_bar [ad_context_bar "[_ survey.Copy_title_name_1]"]
+set context [list [_ survey.Copy_title_name_1]]
 ad_return_template
Index: openacs-4/contrib/packages/survey/www/admin/survey-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/survey-create.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/survey-create.adp	13 Jan 2005 13:54:40 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/survey-create.adp	16 Mar 2005 12:26:32 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
 
 <property name=title>#survey.survey_admin_create_survey#</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 <br /> <br />
 <formtemplate id="create_survey">
 </formtemplate>
Index: openacs-4/contrib/packages/survey/www/admin/survey-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/survey-create.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/survey/www/admin/survey-create.tcl	13 Jan 2005 13:54:40 -0000	1.3
+++ openacs-4/contrib/packages/survey/www/admin/survey-create.tcl	16 Mar 2005 12:26:32 -0000	1.4
@@ -119,7 +119,7 @@
 
 # function to insert survey type-specific form html
 
-set context_bar [ad_context_bar "[_ survey.Create_Survey]"]
+set context [list [_ survey.Create_Survey]]
 
 ad_return_template
 
Index: openacs-4/contrib/packages/survey/www/admin/survey-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/survey-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/survey-delete.adp	19 Sep 2003 16:48:05 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/survey-delete.adp	16 Mar 2005 12:26:32 -0000	1.2
@@ -1,7 +1,7 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name="title">DELETE: @survey_info.name;noquote@</property>
-<property name="context_bar">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="confirm_delete"></formtemplate>
Index: openacs-4/contrib/packages/survey/www/admin/survey-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/survey-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/survey-delete.tcl	15 Feb 2004 13:56:12 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/survey-delete.tcl	16 Mar 2005 12:26:32 -0000	1.3
@@ -42,4 +42,4 @@
     }
 }
 
-set context_bar [ad_context_bar "[_ survey.Delete_Survey]"]
+set context [list [_ survey.Delete_Survey]]
Index: openacs-4/contrib/packages/survey/www/admin/survey-preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/survey-preview.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/survey-preview.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/survey-preview.adp	16 Mar 2005 12:26:32 -0000	1.3
@@ -1,8 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</property>
 
 <property name=title>Preview One Survey: @name;noquote@</property>
-<property name=context_bar>@context_bar;noquote@</property>
+<property name=context>@context;noquote@</property>
 <a href="@return_url;noquote@">#survey.Return#</a>
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
         <tr>
Index: openacs-4/contrib/packages/survey/www/admin/survey-preview.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/survey-preview.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/survey-preview.tcl	15 Feb 2004 13:56:12 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/survey-preview.tcl	16 Mar 2005 12:26:32 -0000	1.3
@@ -41,7 +41,7 @@
     set editable_p $survey_info(editable_p)
     set display_type $survey_info(display_type)
 
-set context_bar [ad_context_bar "[_ survey.Preview_name]"]
+set context [list [_ survey.Preview_name]]
 
 set rownum 0
     
Index: openacs-4/contrib/packages/survey/www/admin/user-responses-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/user-responses-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/user-responses-delete.adp	7 Feb 2004 12:39:50 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/user-responses-delete.adp	16 Mar 2005 12:26:32 -0000	1.3
@@ -1,8 +1,8 @@
-<master src="master">
+<master>
 <property name="survey_id">@survey_id@</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/contrib/packages/survey/www/admin/user-responses-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/user-responses-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/user-responses-delete.tcl	15 Feb 2004 13:56:12 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/user-responses-delete.tcl	16 Mar 2005 12:26:32 -0000	1.3
@@ -41,4 +41,4 @@
     ad_script_abort
 }
 
-set context_bar [ad_context_bar "[_ survey.Delete_Response]"]
+set context [list [_ survey.Delete_Response]]
Index: openacs-4/contrib/packages/survey/www/admin/view-text-responses.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/view-text-responses.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/www/admin/view-text-responses.adp	19 Sep 2003 16:48:05 -0000	1.1
+++ openacs-4/contrib/packages/survey/www/admin/view-text-responses.adp	16 Mar 2005 12:26:32 -0000	1.2
@@ -1,9 +1,9 @@
-<master src="master">
+<master>
 
 <property name="survey_id">@survey_id@</property>
 
 <property name="title">@survey_name;noquote@: Responses to Question</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/contrib/packages/survey/www/admin/view-text-responses.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/www/admin/Attic/view-text-responses.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/survey/www/admin/view-text-responses.tcl	15 Feb 2004 13:56:12 -0000	1.2
+++ openacs-4/contrib/packages/survey/www/admin/view-text-responses.tcl	16 Mar 2005 12:26:32 -0000	1.3
@@ -38,4 +38,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]]