Index: openacs-4/packages/simple-survey/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/index.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/simple-survey/www/index.adp 25 Feb 2002 20:27:41 -0000 1.3 +++ openacs-4/packages/simple-survey/www/index.adp 5 Sep 2002 21:41:58 -0000 1.4 @@ -1,14 +1,14 @@ - -Surveys -@context_bar@ - + + Surveys + @context@ + + No surveys active + + + + Index: openacs-4/packages/simple-survey/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/index.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/simple-survey/www/index.tcl 29 Mar 2002 17:32:03 -0000 1.3 +++ openacs-4/packages/simple-survey/www/index.tcl 5 Sep 2002 21:41:58 -0000 1.4 @@ -15,7 +15,7 @@ set package_id [ad_conn package_id] -set context_bar [list "Surveys"] +set context [list "Surveys"] set user_id [ad_maybe_redirect_for_registration] Index: openacs-4/packages/simple-survey/www/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/Attic/master.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/simple-survey/www/master.adp 29 Mar 2002 17:32:03 -0000 1.3 +++ openacs-4/packages/simple-survey/www/master.adp 5 Sep 2002 21:41:58 -0000 1.4 @@ -1,8 +1,11 @@ @title@ +@context@ +

@title@

- - <%= [eval ad_context_bar $context_bar] %> + + <%= [eval ad_context_bar $context] %> -

+

+ Index: openacs-4/packages/simple-survey/www/one-respondent.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one-respondent.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/one-respondent.adp 20 Apr 2001 20:51:22 -0000 1.1 +++ openacs-4/packages/simple-survey/www/one-respondent.adp 5 Sep 2002 21:41:58 -0000 1.2 @@ -1,10 +1,7 @@ - - - @survey_name@ - - -

@survey_name@

- + +One Survey: @name@ +one survey + @description@

@@ -26,4 +23,3 @@ - \ No newline at end of file Index: openacs-4/packages/simple-survey/www/one-respondent.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one-respondent.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/simple-survey/www/one-respondent.tcl 15 Jun 2001 00:45:42 -0000 1.2 +++ openacs-4/packages/simple-survey/www/one-respondent.tcl 5 Sep 2002 21:41:58 -0000 1.3 @@ -42,7 +42,7 @@ set survey_name $survey(name) set description $survey(description) -set context_bar [list [list "index" "Surveys"] [list "one?[export_url_vars survey_id]" "One survey"] "Responses"] +set context [list [list "index" "Surveys"] [list "one?[export_url_vars survey_id]" "One survey"] "Responses"] if { ![empty_string_p $group_id] } { set limit_to_sql "group_id = :group_id" Index: openacs-4/packages/simple-survey/www/one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one.adp,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/simple-survey/www/one.adp 15 Mar 2002 05:42:09 -0000 1.5 +++ openacs-4/packages/simple-survey/www/one.adp 5 Sep 2002 21:41:58 -0000 1.6 @@ -1,6 +1,6 @@ - + One Survey: @name@ -@context_bar@ +@context@ Index: openacs-4/packages/simple-survey/www/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/simple-survey/www/one.tcl 29 Mar 2002 17:32:03 -0000 1.4 +++ openacs-4/packages/simple-survey/www/one.tcl 5 Sep 2002 21:41:58 -0000 1.5 @@ -40,7 +40,7 @@ db_1row survey_info "select name, description, single_response_p, single_editable_p, display_type from survsimp_surveys where survey_id = :survey_id" -set context_bar [list [list "./" "Surveys"] "$name"] +set context [list [list "./" "Surveys"] "$name"] set num_responses [db_string responses_count { select count(response_id) Index: openacs-4/packages/simple-survey/www/process-response.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/process-response.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/simple-survey/www/process-response.adp 25 Feb 2002 20:27:41 -0000 1.3 +++ openacs-4/packages/simple-survey/www/process-response.adp 5 Sep 2002 21:41:58 -0000 1.4 @@ -1,6 +1,7 @@ - -Response Submitted -@context_bar@ -
- Response submitted. Thank you. -
+ +Response Submitted for @survey_name@ +@context@ + + +Response submitted for @survey_name@. Thank you. + Index: openacs-4/packages/simple-survey/www/process-response.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/process-response.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/simple-survey/www/process-response.tcl 25 Feb 2002 20:27:41 -0000 1.3 +++ openacs-4/packages/simple-survey/www/process-response.tcl 5 Sep 2002 21:41:58 -0000 1.4 @@ -329,10 +329,9 @@ if {[info exists return_url] && ![empty_string_p $return_url]} { ad_returnredirect "$return_url" - return + ad_script_abort } else { - set context_bar [ad_context_bar_ws_or_index [list "./" "Surveys"] "Response Submitted for $survey_name"] - ad_return_template + set context [list "Response Submitted"] } } @@ -353,25 +352,22 @@ if {[info exists return_url] && ![empty_string_p $return_url]} { - db_release_unused_handles ad_returnredirect $return_url - } eval $logic db_release_unused_handles + ad_script_abort } default { if {[info exists return_url] && ![empty_string_p $return_url]} { ad_returnredirect "$return_url" - return + ad_script_abort } else { - set context_bar [ad_context_bar_ws_or_index [list "./" "Surveys"] "Response Submitted for $survey_name"] - - ad_return_template + set context {"Response Submitted"} } } } Index: openacs-4/packages/simple-survey/www/admin/description-edit-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/description-edit-2.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/description-edit-2.adp 25 Feb 2002 20:28:14 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/description-edit-2.adp 5 Sep 2002 21:42:01 -0000 1.2 @@ -1,6 +1,6 @@ Edit Description Confirmation -@context_bar@ +@context@ Here is how your survey description will appear:

Index: openacs-4/packages/simple-survey/www/admin/description-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/description-edit-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/simple-survey/www/admin/description-edit-2.tcl 25 Feb 2002 20:27:41 -0000 1.2 +++ openacs-4/packages/simple-survey/www/admin/description-edit-2.tcl 5 Sep 2002 21:42:01 -0000 1.3 @@ -35,7 +35,7 @@ } if {$checked_p == "f"} { - set context_bar [ad_context_bar_ws_or_index [list "index.tcl" "Simple Survey Admin"] [list "one.tcl?[export_url_vars survey_id]" "Administer Survey"] "Confirm Description"] + set context [list [list "one.tcl?[export_url_vars survey_id]" "Administer Survey"] "Confirm Description"] switch $desc_html { "t" { Index: openacs-4/packages/simple-survey/www/admin/description-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/description-edit.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/description-edit.adp 25 Feb 2002 20:28:14 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/description-edit.adp 5 Sep 2002 21:42:01 -0000 1.2 @@ -1,6 +1,6 @@ @survey_name@: Edit Description -@context_bar@ +@context@

Edit and submit to change the description for this survey: Index: openacs-4/packages/simple-survey/www/admin/description-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/description-edit.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/simple-survey/www/admin/description-edit.tcl 18 Mar 2002 16:58:06 -0000 1.4 +++ openacs-4/packages/simple-survey/www/admin/description-edit.tcl 5 Sep 2002 21:42:01 -0000 1.5 @@ -23,7 +23,4 @@ set html_p_set [ns_set create] ns_set put $html_p_set desc_html $desc_html -set context_bar [list [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Description"] - - -ad_return_template +set context [list [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Description"] Index: openacs-4/packages/simple-survey/www/admin/edit-logic.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/edit-logic.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/edit-logic.tcl 20 Apr 2001 20:51:22 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/edit-logic.tcl 5 Sep 2002 21:42:01 -0000 1.2 @@ -41,7 +41,7 @@ doc_return 200 text/html "[ad_header "Edit Survey Logic"]

$survey_name

-[ad_context_bar_ws_or_index [list "index.tcl" "Simple Survey Admin"] [list "one.tcl?[export_url_vars survey_id]" "Administer Survey"] "Edit Logic"] +[ad_context_bar [list "index.tcl" "Simple Survey Admin"] [list "one.tcl?[export_url_vars survey_id]" "Administer Survey"] "Edit Logic"]
Index: openacs-4/packages/simple-survey/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/index.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/index.adp 18 Feb 2002 20:48:01 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/index.adp 5 Sep 2002 21:42:01 -0000 1.2 @@ -1,6 +1,6 @@ Survey Administration -@context_bar@ +@context@
    Index: openacs-4/packages/simple-survey/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/index.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/simple-survey/www/admin/index.tcl 18 Mar 2002 16:58:06 -0000 1.4 +++ openacs-4/packages/simple-survey/www/admin/index.tcl 5 Sep 2002 21:42:01 -0000 1.5 @@ -11,7 +11,7 @@ } -set context_bar [list "Survey Admin"] +set context [list "Survey Admin"] set package_id [ad_conn package_id] @@ -24,5 +24,3 @@ from survsimp_surveys where package_id= :package_id order by enabled_p desc, upper(name)" - -ad_return_template Index: openacs-4/packages/simple-survey/www/admin/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/Attic/master.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/simple-survey/www/admin/master.adp 18 Mar 2002 16:58:06 -0000 1.2 +++ openacs-4/packages/simple-survey/www/admin/master.adp 5 Sep 2002 21:42:01 -0000 1.3 @@ -1,9 +1,11 @@ -@title@ +@title@ +@context@

    @title@

    - - <%= [eval ad_context_bar $context_bar] %> + + <%= [eval ad_context_bar $context] %> -

    +

    + Index: openacs-4/packages/simple-survey/www/admin/modify-responses.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/modify-responses.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/modify-responses.tcl 20 Apr 2001 20:51:22 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/modify-responses.tcl 5 Sep 2002 21:42:01 -0000 1.2 @@ -65,7 +65,7 @@ doc_return 200 text/html "[ad_header "Modify Responses"]

    $survey_name

    -[ad_context_bar_ws_or_index [list "" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Modify Question Responses"] +[ad_context_bar [list "one?[export_url_vars survey_id]" "Administer Survey"] "Modify Question Responses"]
    Index: openacs-4/packages/simple-survey/www/admin/name-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/name-edit.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/name-edit.adp 25 Feb 2002 20:28:14 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/name-edit.adp 5 Sep 2002 21:42:01 -0000 1.2 @@ -1,6 +1,6 @@ @survey_name@: Edit Name -@context_bar@ +@context@
    Edit and submit to change the name for this survey: Index: openacs-4/packages/simple-survey/www/admin/name-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/name-edit.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/simple-survey/www/admin/name-edit.tcl 18 Mar 2002 16:58:06 -0000 1.2 +++ openacs-4/packages/simple-survey/www/admin/name-edit.tcl 5 Sep 2002 21:42:01 -0000 1.3 @@ -23,7 +23,7 @@ set html_p_set [ns_set create] ns_set put $html_p_set desc_html $desc_html -set context_bar [list [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Name"] +set context [list [list "one?[export_url_vars survey_id]" "Administer Survey"] "Edit Name"] ad_return_template Index: openacs-4/packages/simple-survey/www/admin/one-respondent.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/one-respondent.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/one-respondent.tcl 20 Apr 2001 20:51:22 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/one-respondent.tcl 5 Sep 2002 21:42:01 -0000 1.2 @@ -40,10 +40,10 @@

    Response from $first_names $last_name

    -[ad_context_bar_ws_or_index [list "" "Simple Survey Admin"] \ +[ad_context_bar [list "" "Simple Survey Admin"] \ [list "one?survey_id=$survey_id" "Administer Survey"] \ [list "respondents?survey_id=$survey_id" "Respondents"] \ - "One Respondent"] + "One Respondent"]
    Index: openacs-4/packages/simple-survey/www/admin/one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/one.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/simple-survey/www/admin/one.adp 18 Mar 2002 16:58:06 -0000 1.3 +++ openacs-4/packages/simple-survey/www/admin/one.adp 5 Sep 2002 21:42:01 -0000 1.4 @@ -1,6 +1,6 @@ One Survey: @survey_name@ -@context_bar@ +@context@
    • Created by: @creator_name@ Index: openacs-4/packages/simple-survey/www/admin/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/one.tcl,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/simple-survey/www/admin/one.tcl 10 May 2002 00:47:04 -0000 1.8 +++ openacs-4/packages/simple-survey/www/admin/one.tcl 5 Sep 2002 21:42:01 -0000 1.9 @@ -158,6 +158,6 @@ } -set context_bar [list [list "./" "Simple Survey Admin"] "Administer Survey"] +set context [list "Administer Survey"] ad_return_template Index: openacs-4/packages/simple-survey/www/admin/question-add-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-add-2.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/question-add-2.adp 18 Mar 2002 16:58:06 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/question-add-2.adp 5 Sep 2002 21:42:01 -0000 1.2 @@ -1,6 +1,6 @@ Survey Administration: Add a Question (cont.) -@context_bar@ +@context@ @form_var_list@ Index: openacs-4/packages/simple-survey/www/admin/question-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-add-2.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/simple-survey/www/admin/question-add-2.tcl 10 May 2002 00:47:04 -0000 1.7 +++ openacs-4/packages/simple-survey/www/admin/question-add-2.tcl 5 Sep 2002 21:42:01 -0000 1.8 @@ -179,6 +179,6 @@ } -set context_bar [list [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Add A Question"] +set context [list [list "one?[export_url_vars survey_id]" "Administer Survey"] "Add A Question"] ad_return_template Index: openacs-4/packages/simple-survey/www/admin/question-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-add.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/question-add.adp 25 Feb 2002 20:28:14 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/question-add.adp 5 Sep 2002 21:42:01 -0000 1.2 @@ -1,6 +1,6 @@ @name@: New Question -@context_bar@ +@context@ <%= [export_form_vars survey_id after] %> Index: openacs-4/packages/simple-survey/www/admin/question-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-add.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/simple-survey/www/admin/question-add.tcl 18 Mar 2002 16:58:06 -0000 1.5 +++ openacs-4/packages/simple-survey/www/admin/question-add.tcl 5 Sep 2002 21:42:01 -0000 1.6 @@ -67,6 +67,4 @@ return $return_html } -set context_bar [list [list "./" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Add A Question"] - -ad_return_template +set context [list [list "one?[export_url_vars survey_id]" "Administer Survey"] "Add A Question"] Index: openacs-4/packages/simple-survey/www/admin/question-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-delete.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/simple-survey/www/admin/question-delete.tcl 15 Jun 2001 00:45:42 -0000 1.2 +++ openacs-4/packages/simple-survey/www/admin/question-delete.tcl 5 Sep 2002 21:42:01 -0000 1.3 @@ -56,7 +56,7 @@ doc_return 200 text/html "[ad_header "Confirm Question Deletion"]

      Really Delete?

      -[ad_context_bar_ws_or_index [list "" "Simple Survey Admin"] [list "one?[export_url_vars survey_id]" "Administer Survey"] "Delete Question"] +[ad_context_bar [list "one?[export_url_vars survey_id]" "Administer Survey"] "Delete Question"]
      Index: openacs-4/packages/simple-survey/www/admin/question-modify-text.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-modify-text.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/question-modify-text.adp 25 Feb 2002 20:28:14 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/question-modify-text.adp 5 Sep 2002 21:42:01 -0000 1.2 @@ -1,6 +1,6 @@ @survey_name@: Modify Question Text -@context_bar@ +@context@ <%= [export_form_vars question_id survey_id] %> Index: openacs-4/packages/simple-survey/www/admin/question-modify-text.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-modify-text.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/simple-survey/www/admin/question-modify-text.tcl 25 Feb 2002 20:27:41 -0000 1.2 +++ openacs-4/packages/simple-survey/www/admin/question-modify-text.tcl 5 Sep 2002 21:42:01 -0000 1.3 @@ -24,6 +24,4 @@ from survsimp_questions where question_id = :question_id" ] -set context_bar [ad_context_bar_ws_or_index [list "./" "Simple Survey Admin"] [list "one.tcl?[export_url_vars survey_id]" "Administer Survey"] "Modify a Question's Text"] - -ad_return_template +set context [list [list "one.tcl?[export_url_vars survey_id]" "Administer Survey"] "Modify a Question's Text"] Index: openacs-4/packages/simple-survey/www/admin/respondents.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/respondents.adp,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/simple-survey/www/admin/respondents.adp 16 Apr 2002 13:00:55 -0000 1.2 +++ openacs-4/packages/simple-survey/www/admin/respondents.adp 5 Sep 2002 21:42:01 -0000 1.3 @@ -1,6 +1,6 @@ @survey_name@: Respondents -@context_bar@ +@context@
        Index: openacs-4/packages/simple-survey/www/admin/respondents.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/respondents.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/simple-survey/www/admin/respondents.tcl 16 Apr 2002 14:37:29 -0000 1.6 +++ openacs-4/packages/simple-survey/www/admin/respondents.tcl 5 Sep 2002 21:42:01 -0000 1.7 @@ -23,7 +23,7 @@ set survey_name [db_string select_survey_name {}] -set context_bar [list \ +set context [list \ [list "one?survey_id=$survey_id" "Administer Survey"] \ "Respondents" \ ] Index: openacs-4/packages/simple-survey/www/admin/response-drill-down.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/response-drill-down.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/response-drill-down.tcl 20 Apr 2001 20:51:22 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/response-drill-down.tcl 5 Sep 2002 21:42:01 -0000 1.2 @@ -81,10 +81,9 @@

        Responder List

        -[ad_context_bar_ws_or_index [list "" "Simple Survey Admin"] \ - [list "one?survey_id=$survey_id" "Administer Survey"] \ - [list "responses?survey_id=$survey_id" "Responses"] \ - "One Response"] +[ad_context_bar [list "one?survey_id=$survey_id" "Administer Survey"] \ + [list "responses?survey_id=$survey_id" "Responses"] \ + "One Response"]
        Index: openacs-4/packages/simple-survey/www/admin/responses.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/responses.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/responses.adp 25 Feb 2002 20:28:14 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/responses.adp 5 Sep 2002 21:42:01 -0000 1.2 @@ -1,6 +1,6 @@ @survey_name@: Responses -@context_bar@ +@context@ @unique_users_toggle@ <%= [survey_specific_html $type] %> Index: openacs-4/packages/simple-survey/www/admin/responses.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/responses.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/simple-survey/www/admin/responses.tcl 18 Mar 2002 16:58:06 -0000 1.3 +++ openacs-4/packages/simple-survey/www/admin/responses.tcl 5 Sep 2002 21:42:01 -0000 1.4 @@ -159,8 +159,6 @@ } } -set context_bar [list [list "./" "Simple Survey Admin"] \ - [list "one?survey_id=$survey_id" "Administer Survey"] \ +set context [list [list "one?survey_id=$survey_id" "Administer Survey"] \ "Responses"] -ad_return_template Index: openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl 18 Mar 2002 16:58:06 -0000 1.6 +++ openacs-4/packages/simple-survey/www/admin/survey-create-2.tcl 5 Sep 2002 21:42:01 -0000 1.7 @@ -65,7 +65,7 @@ if {$checked_p == "f"} { set survey_id [db_nextval acs_object_id_seq] - set context_bar [list [list "index.tcl" "Simple Survey Admin"] "Confirm New Survey Description"] + set context [list "Confirm New Survey Description"] switch $desc_html { "html" { Index: openacs-4/packages/simple-survey/www/admin/survey-create-choice.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create-choice.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/survey-create-choice.tcl 20 Apr 2001 20:51:22 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/survey-create-choice.tcl 5 Sep 2002 21:42:01 -0000 1.2 @@ -20,7 +20,7 @@

        Choose a Survey Type

        -[ad_context_bar_ws_or_index [list "" "Simple Survey Admin"] "Choose Type"] +[ad_context_bar "Choose Type"]
        Index: openacs-4/packages/simple-survey/www/admin/survey-create-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create-confirm.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/survey-create-confirm.adp 18 Mar 2002 16:58:06 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/survey-create-confirm.adp 5 Sep 2002 21:42:01 -0000 1.2 @@ -1,6 +1,6 @@ - + Survey Administration: Confirm New Survey -@context_bar@ +@context@

        Here is how your survey description will appear: @@ -16,10 +16,10 @@

    - + Note: if the text above has a bunch of visible HTML tags then you probably should have selected "HTML" rather than "Plain Text". If it is all smashed together and you want the original line breaks saved then choose "Preformatted Text". Use your browser's Back button to return to the submission form. - + Index: openacs-4/packages/simple-survey/www/admin/survey-create.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/simple-survey/www/admin/survey-create.adp 18 Mar 2002 16:58:06 -0000 1.1 +++ openacs-4/packages/simple-survey/www/admin/survey-create.adp 5 Sep 2002 21:42:01 -0000 1.2 @@ -1,14 +1,14 @@ Survey Administration: Create New Survey -@context_bar@ +@context@
    <%= [ad_export_vars -form type] %>

    -Survey Name: +Survey Name:

    Survey Description:
    Index: openacs-4/packages/simple-survey/www/admin/survey-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/simple-survey/www/admin/survey-create.tcl 18 Mar 2002 16:58:06 -0000 1.4 +++ openacs-4/packages/simple-survey/www/admin/survey-create.tcl 5 Sep 2002 21:42:01 -0000 1.5 @@ -72,7 +72,7 @@ return $return_html } -set context_bar [list [list "./" "Survey Admin"] "Create Survey"] +set context [list "Create Survey"] ad_return_template Index: openacs-4/packages/simple-survey/www/admin/view-text-responses.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/view-text-responses.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/simple-survey/www/admin/view-text-responses.tcl 2 Jul 2001 21:46:55 -0000 1.2 +++ openacs-4/packages/simple-survey/www/admin/view-text-responses.tcl 5 Sep 2002 21:42:01 -0000 1.3 @@ -66,11 +66,11 @@ doc_return 200 text/html "[ad_header "Responses to Question"]

    $question_text

    -[ad_context_bar_ws_or_index [list "" "Simple Survey Admin"] \ - [list "one?survey_id=$survey_id" "Administer Survey"] \ +[ad_context_bar [list "one?survey_id=$survey_id" "Administer Survey"] \ [list "responses?survey_id=$survey_id" "Responses to Survey"] \ - "Responses to Question"] + "Responses to Question"] +