Index: openacs-4/contrib/packages/survey/lib/one-survey-questions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/lib/Attic/one-survey-questions.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/packages/survey/lib/one-survey-questions.tcl 13 Jan 2005 13:54:39 -0000 1.2 +++ openacs-4/contrib/packages/survey/lib/one-survey-questions.tcl 23 Mar 2005 22:23:40 -0000 1.3 @@ -10,7 +10,7 @@ db_multirow -extend {question_display branch_text} sections survey_questions "" { if {$section_id != $last_section_id} { get_section_info -section_id $section_id - template::form::section admin_survey $section_info(name) + template::form::section admin_survey $section_info(name_unquoted) if {$branch_p == "t"} { if {[db_0or1row branchquestion ""]} { if {$abstract_data_type == "boolean"} { Index: openacs-4/contrib/packages/survey/tcl/survey-form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/tcl/Attic/survey-form-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/packages/survey/tcl/survey-form-procs.tcl 18 Mar 2005 02:28:02 -0000 1.3 +++ openacs-4/contrib/packages/survey/tcl/survey-form-procs.tcl 23 Mar 2005 22:23:40 -0000 1.4 @@ -42,7 +42,7 @@ -extend \ -name $form \ -form [list \ - [list "section_info$section_id:text(inform)" {label ""} {value $section_info(description)} {section $section_info(name)}] + [list "section_info$section_id:text(inform)" {label ""} {value $section_info(description)} {section $section_info(name_unquoted)}] ] db_foreach get_questions {} { Index: openacs-4/contrib/packages/survey/tcl/survey-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/tcl/Attic/survey-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/contrib/packages/survey/tcl/survey-procs.tcl 18 Mar 2005 02:28:02 -0000 1.7 +++ openacs-4/contrib/packages/survey/tcl/survey-procs.tcl 23 Mar 2005 22:23:40 -0000 1.8 @@ -100,7 +100,7 @@ get_section_info -section_id $section_id # create the section - template::form::section $form "$section_info(name)" + template::form::section $form "$section_info(name_unquoted)" template::element create $form section_info$section_id \ -widget inform \ 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.4 -r1.5 --- openacs-4/contrib/packages/survey/www/respond.adp 16 Mar 2005 12:26:31 -0000 1.4 +++ openacs-4/contrib/packages/survey/www/respond.adp 23 Mar 2005 22:23:40 -0000 1.5 @@ -1,8 +1,8 @@ -One Survey: @name;noquote@ -@context;noquote@ -@status_bar;noquote@ -* #survey.lt_denotes_a_required_qu# - + One Survey: @name;noquote@ + @context;noquote@ + @status_bar;noquote@ + * #survey.lt_denotes_a_required_qu# + 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.6 -r1.7 --- openacs-4/contrib/packages/survey/www/respond.tcl 16 Mar 2005 12:26:31 -0000 1.6 +++ openacs-4/contrib/packages/survey/www/respond.tcl 23 Mar 2005 22:23:40 -0000 1.7 @@ -32,13 +32,13 @@ if {$number_of_responses!=0 && $response_id==0} { set response_id $max_response_id } - + get_survey_info -survey_id $survey_id #set single_section_p $survey_info(single_section_p) # if {$section_id==0 && $single_section_p=="t"} { # set section_id $survey_info(section_id) # } - set name $survey_info(name) + set name $survey_info(name_unquoted) set description $survey_info(description) set single_response_p $survey_info(single_response_p) set editable_p $survey_info(editable_p) @@ -62,7 +62,7 @@ ad_require_permission $survey_id write -set context "$name" +set context $name set button_label "[_ survey.Submit_response]" if {$editable_p == "t"} { if {$response_id > 0} { @@ -128,3 +128,4 @@ db_0or1row get_style "" ad_return_template + 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.3 -r1.4 --- openacs-4/contrib/packages/survey/www/admin/name-edit.adp 16 Mar 2005 12:26:31 -0000 1.3 +++ openacs-4/contrib/packages/survey/www/admin/name-edit.adp 23 Mar 2005 22:23:40 -0000 1.4 @@ -1,7 +1,7 @@ @survey_id@ -@survey_name;noquote@: Edit Name +@survey_name_unquoted;noquote@: Edit Name @context;noquote@ #survey.Edit_and_submit_to_ch# 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.4 -r1.5 --- openacs-4/contrib/packages/survey/www/admin/name-edit.tcl 16 Mar 2005 12:26:31 -0000 1.4 +++ openacs-4/contrib/packages/survey/www/admin/name-edit.tcl 23 Mar 2005 22:23:40 -0000 1.5 @@ -20,23 +20,23 @@ set survey_description $survey_info(description_unquoted) set html_p $survey_info(description_html_p) + ad_require_permission $survey_id admin ad_form -name edit-name -form { survey_id:key - {name:text(text) {label "[_ survey.Survey_Name_1]"} {html {size 80}} + {name:text {label "[_ survey.Survey_Name_1]"} {html {size 80}} {value $survey_name_unquoted}} - {description:text(textarea),optional {label "[_ survey.Description_1]"} - {html {rows 10 cols 65}} + {description:richtext,optional {label "[_ survey.Description_1]"} {value $survey_description}} - {description_html_p:text(radio) {label "[_ survey.lt_The_Above_Description]"} - {options {{"[_ survey.HTML]" "t"} {"[_ survey.Plain_Text]" "f"}}} {value $html_p} - } } -validate { {name {[string length $name] <= 4000} "[_ survey.lt_Survey_Name_must_be_l]"} } -edit_request { set name $survey_name_unquoted + set description [template::util::richtext::create $survey_description [ad_decode $html_p t "text/html" "text/plain"]] } -edit_data { + set description_html_p t + set description [template::util::richtext::get_property html_value $description] db_dml survey_update "" ad_returnredirect "one?[export_vars survey_id]" ad_script_abort 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.4 -r1.5 --- openacs-4/contrib/packages/survey/www/admin/one.adp 16 Mar 2005 12:26:31 -0000 1.4 +++ openacs-4/contrib/packages/survey/www/admin/one.adp 23 Mar 2005 22:23:40 -0000 1.5 @@ -1,7 +1,7 @@ @survey_id;noquote@ -One Survey: @survey_info.name;noquote@ +One Survey: @survey_info.name_unquoted;noquote@ @context;noquote@

#survey.Created_by# @survey_info.creator_name@#survey._on_creation_date#

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.5 -r1.6 --- openacs-4/contrib/packages/survey/www/admin/one.tcl 18 Mar 2005 02:28:02 -0000 1.5 +++ openacs-4/contrib/packages/survey/www/admin/one.tcl 23 Mar 2005 22:23:40 -0000 1.6 @@ -61,7 +61,7 @@ # Questions summary. # We need to get the questions for ALL sections. -set context "$survey_info(name)" +set context $survey_info(name_unquoted) # form for response upload ad_form -name import_responses -action import-responses -html {enctype multipart/form-data} -form { @@ -80,7 +80,7 @@ set notification_chunk [notification::display::request_widget \ -type survey_response_notif \ -object_id $survey_id \ - -pretty_name $survey_info(name) \ + -pretty_name $survey_info(name_unquoted) \ -url [ad_conn url]?survey_id=$survey_id \ ] @@ -92,7 +92,7 @@ db_multirow -extend {question_display branch_text} sections survey_questions "" { if {$section_id != $last_section_id} { get_section_info -section_id $section_id - template::form::section admin_survey $section_info(name) + template::form::section admin_survey $section_info(name_unquoted) if {$branch_p == "t"} { if {[db_0or1row branchquestion ""]} { if {$abstract_data_type == "boolean"} { 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.3 -r1.4 --- openacs-4/contrib/packages/survey/www/admin/section-edit.adp 16 Mar 2005 12:26:31 -0000 1.3 +++ openacs-4/contrib/packages/survey/www/admin/section-edit.adp 23 Mar 2005 22:23:40 -0000 1.4 @@ -1,7 +1,7 @@ @survey_id@ -@survey_info.name;noquote@: Edit Section +@survey_info.name_unquoted;noquote@: Edit Section @context;noquote@ 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.3 -r1.4 --- openacs-4/contrib/packages/survey/www/admin/section-template-ae.adp 16 Mar 2005 12:26:31 -0000 1.3 +++ openacs-4/contrib/packages/survey/www/admin/section-template-ae.adp 23 Mar 2005 22:23:40 -0000 1.4 @@ -1,7 +1,7 @@ @survey_id@ -Edit Section: @section_info.name;noquote@ +Edit Section: @section_info.name_unquoted;noquote@ @context;noquote@ 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.3 -r1.4 --- openacs-4/contrib/packages/survey/www/admin/survey-preview.adp 16 Mar 2005 12:26:32 -0000 1.3 +++ openacs-4/contrib/packages/survey/www/admin/survey-preview.adp 23 Mar 2005 22:23:40 -0000 1.4 @@ -6,7 +6,7 @@ #survey.Return# - + 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.3 -r1.4 --- openacs-4/contrib/packages/survey/www/admin/survey-preview.tcl 16 Mar 2005 12:26:32 -0000 1.3 +++ openacs-4/contrib/packages/survey/www/admin/survey-preview.tcl 23 Mar 2005 22:23:40 -0000 1.4 @@ -35,7 +35,7 @@ ad_require_permission $survey_id admin get_survey_info -survey_id $survey_id - set name $survey_info(name) + set name $survey_info(name_unquoted) set description $survey_info(description) set single_response_p $survey_info(single_response_p) set editable_p $survey_info(editable_p)
@description@@description;noquote@
* #survey.lt_denotes_a_required_qu#