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 -r1.8 -r1.9
--- openacs-4/packages/simple-survey/www/one.adp	22 May 2003 15:12:04 -0000	1.8
+++ openacs-4/packages/simple-survey/www/one.adp	10 Nov 2003 20:08:09 -0000	1.9
@@ -5,7 +5,7 @@
     <table border="0" cellpadding="0" cellspacing="0" width="100%">
       <form enctype=multipart/form-data method="post" action="process-response">
         <tr>
-          <td class="tabledata">@description@</td>
+          <td class="tabledata">@description;noquote@</td>
         </tr>
         
         <tr>
Index: openacs-4/packages/simple-survey/www/one_list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one_list.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/one_list.adp	15 Mar 2002 05:42:09 -0000	1.1
+++ openacs-4/packages/simple-survey/www/one_list.adp	10 Nov 2003 20:08:09 -0000	1.2
@@ -1,5 +1,5 @@
             <ol>
               <list name="questions">
-                <li><!--qis-->@questions:item@<!--qie-->
+                <li><!--qis-->@questions:item;noquote@<!--qie-->
               </list>
             </ol>
Index: openacs-4/packages/simple-survey/www/one_paragraph.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one_paragraph.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/simple-survey/www/one_paragraph.adp	15 Mar 2002 05:42:09 -0000	1.1
+++ openacs-4/packages/simple-survey/www/one_paragraph.adp	10 Nov 2003 20:08:09 -0000	1.2
@@ -1,4 +1,4 @@
 <list name=questions>
-@questions:item@<p>
+@questions:item;noquote@<p>
 </list>
 
Index: openacs-4/packages/simple-survey/www/one_table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one_table.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/one_table.adp	5 Jul 2002 15:56:54 -0000	1.2
+++ openacs-4/packages/simple-survey/www/one_table.adp	10 Nov 2003 20:08:09 -0000	1.3
@@ -1,5 +1,5 @@
 <table border=1 cellpadding=4 width="80%">
 <list name=questions>
-<tr><td>@questions:item@</td></tr>
+<tr><td>@questions:item;noquote@</td></tr>
 </list>
 </table>
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 -r1.6 -r1.7
--- openacs-4/packages/simple-survey/www/admin/one.adp	22 May 2003 15:12:19 -0000	1.6
+++ openacs-4/packages/simple-survey/www/admin/one.adp	10 Nov 2003 20:08:09 -0000	1.7
@@ -6,14 +6,14 @@
 <li>Created by: <a href="<%= [acs_community_member_url -user_id $creation_user] %>">@creator_name@</a>
 <li>Name: @survey_name@ <font size=-1>[ <a href="name-edit?survey_id=@survey_id@">edit</a> ]</font>
 <li>Created: <%= [util_AnsiDatetoPrettyDate $creation_date] %>
-<li>Status: @survey_status@ <font size=-1>@toggle_enabled_link@</font>
-<li>Display Type: @display_type@ <font size=-1>@display_type_toggle@</font>
-<li>Responses per user: @survey_response_limit@ <font size=-1>[ <a href="response-limit-toggle?survey_id=@survey_id@">@response_limit_toggle@</a> @response_editable_link@ ]</font>
+<li>Status: @survey_status@ <font size=-1>@toggle_enabled_link;noquote@</font>
+<li>Display Type: @display_type@ <font size=-1>@display_type_toggle;noquote@</font>
+<li>Responses per user: @survey_response_limit@ <font size=-1>[ <a href="response-limit-toggle?survey_id=@survey_id@">@response_limit_toggle@</a> @response_editable_link;noquote@ ]</font>
 <li>Description: @survey_description@ <font size=-1>[ <a href="description-edit?survey_id=@survey_id@">edit</a> ]</font>
 <li>Type: @type@
 <li>View responses:  <a href="respondents?survey_id=@survey_id@">by user</a> | <a href="responses?survey_id=@survey_id@">summary</a>
-<%= [survey_specific_html $type] %>
+@survey_specific_html;noquote@
 </ul>
 <p>
 
-@questions_summary@
+@questions_summary;noquote@
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 -r1.10 -r1.11
--- openacs-4/packages/simple-survey/www/admin/one.tcl	10 Sep 2002 22:23:23 -0000	1.10
+++ openacs-4/packages/simple-survey/www/admin/one.tcl	10 Nov 2003 20:08:09 -0000	1.11
@@ -159,5 +159,6 @@
 
 
 set context [list "Administer Survey"]
+set survey_specific_html [survey_specific_html $type]
 
 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 -r1.4 -r1.5
--- openacs-4/packages/simple-survey/www/admin/question-add-2.adp	22 May 2003 15:12:19 -0000	1.4
+++ openacs-4/packages/simple-survey/www/admin/question-add-2.adp	10 Nov 2003 20:08:09 -0000	1.5
@@ -14,7 +14,7 @@
 
 @response_type_html;noquote@
 
-@response_fields@
+@response_fields;noquote@
 
 <p>
 
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 -r1.4 -r1.5
--- openacs-4/packages/simple-survey/www/admin/responses.adp	22 May 2003 15:12:19 -0000	1.4
+++ openacs-4/packages/simple-survey/www/admin/responses.adp	10 Nov 2003 20:08:09 -0000	1.5
@@ -2,11 +2,11 @@
 <property name=title>@survey_name;noquote@: Responses</property>
 <property name="context">@context;noquote@</property>
 
-@unique_users_toggle@
+@unique_users_toggle;noquote@
 <%= [survey_specific_html $type] %>
 <p>
 @response_sentence@
 
 <ul>
-@results@
+@results;noquote@
 </ul>