Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/assignee-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/assignee-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/assignee-add.adp	6 Sep 2002 21:50:15 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/assignee-add.adp	22 May 2003 14:17:47 -0000	1.5
@@ -1,7 +1,7 @@
 <master>
 <property name="title">Add Assignee</property>
-<property name="context">@context@</property>
-<property name="focus">@focus@</property>
+<property name="context">@context;noquote@</property>
+<property name="focus">@focus;noquote@</property>
 
 <if @party_widget@ nil>
   <blockquote>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignment-set.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignment-set.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignment-set.adp	6 Sep 2002 21:50:15 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignment-set.adp	22 May 2003 14:17:47 -0000	1.4
@@ -1,17 +1,17 @@
 <master>
-<property name="title">Assign @role_name@</property>
-<property name="context">@context@</property>
+<property name="title">Assign @role_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form action="case-assignment-set-2" name="assignment">
-@export_vars@
+@export_vars;noquote@
 <table>
   <tr>
     <th align="right">Role</th>
     <td>@role_name@</td>
   </tr>
   <tr>
     <th align="right">Assignments</th>
-    <td>@widget@</td>
+    <td>@notification_chunk;noquote@</td>
   </tr>
   <tr>
     <td>&nbsp;</td>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignments.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignments.adp	6 Sep 2002 21:50:15 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignments.adp	22 May 2003 14:17:47 -0000	1.4
@@ -1,9 +1,9 @@
 <master>
-<property name="title">Assignments for @case.object_name@ case</property>
-<property name="context">@context@</property>
+<property name="title">Assignments for @case.object_name;noquote@ case</property>
+<property name="context">@context;noquote@</property>
 
 <blockquote>
-  <include src="case-assignments-table" case_id="@case.case_id@" return_url="@return_url@">
+  <include src="case-assignments-table" case_id="@case.case_id;noquote@" return_url="@return_url;noquote@">
 </blockquote>
 
 <table width="60%" border="0" cellpadding="4">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadline-set.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadline-set.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadline-set.adp	6 Sep 2002 21:50:15 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadline-set.adp	22 May 2003 14:17:47 -0000	1.4
@@ -1,9 +1,9 @@
 <master>
 <property name="title">Set Deadline</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <form action="case-deadline-set-2" name="deadline">
-@export_vars@
+@export_vars;noquote@
 <table>
   <tr>
     <th align="right">Task</th>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadlines.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadlines.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadlines.adp	6 Sep 2002 21:50:15 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadlines.adp	22 May 2003 14:17:47 -0000	1.4
@@ -1,9 +1,9 @@
 <master>
-<property name="title">@case.object_name@ Deadlines</property>
-<property name="context">@context@</property>
+<property name="title">@case.object_name;noquote@ Deadlines</property>
+<property name="context">@context;noquote@</property>
 
 <blockquote>
-  <include src="case-deadlines-table" case_id="@case.case_id@" return_url="@return_url@">
+  <include src="case-deadlines-table" case_id="@case.case_id;noquote@" return_url="@return_url;noquote@">
 </blockquote>
 
 <table width="60%" border="0" cellpadding="4">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case.adp	6 Sep 2002 21:50:15 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case.adp	22 May 2003 14:17:47 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@case.object_name@ case</property>
-<property name="context">@context@</property>
+<property name="title">@case.object_name;noquote@ case</property>
+<property name="context">@context;noquote@</property>
 
 <table width="100%" cellspacing="4" cellpadding="2" border="0">
   <tr>
@@ -56,7 +56,7 @@
               </tr>
               <tr bgcolor="#ffffff">
                 <td>
-                  <include src="active-tasks" case_id="@case_id@" return_url="@return_url@">
+                  <include src="active-tasks" case_id="@case_id;noquote@" return_url="@return_url;noquote@">
                 </td>
               </tr>
             </table>
@@ -78,7 +78,7 @@
               </tr>
               <tr bgcolor="#ffffff">
                 <td>
-                  <include src="case-assignments-table" case_id="@case_id@">
+                  <include src="case-assignments-table" case_id="@case_id;noquote@">
                 </td>
               </tr>
             </table>
@@ -100,7 +100,7 @@
               </tr>
               <tr bgcolor="#ffffff">
                 <td>
-                  <include src="case-deadlines-table" case_id="@case_id@">
+                  <include src="case-deadlines-table" case_id="@case_id;noquote@">
                 </td>
               </tr>
             </table>
@@ -122,7 +122,7 @@
               </tr>
               <tr bgcolor="#ffffff">
                 <td>
-                  <include src="finished-tasks" case_id="@case_id@">
+                  <include src="finished-tasks" case_id="@case_id;noquote@">
                 </td>
               </tr>
             </table>
@@ -144,7 +144,7 @@
               </tr>
               <tr bgcolor="#ffffff">
                 <td>
-                  <include src="case-attributes-table" case_id="@case_id@">
+                  <include src="case-attributes-table" case_id="@case_id;noquote@">
                 </td>
               </tr>
             </table>
@@ -169,7 +169,7 @@
               </tr>
               <tr bgcolor="#ffffff">
                 <td>
-                  <include src="case-state-graph" case_id="@case_id@" size="3,10">
+                  <include src="case-state-graph" case_id="@case_id;noquote@" size="3,10">
                 </td>
               </tr>
             </table>
@@ -184,7 +184,7 @@
     <!-- Bottom row -->
 
     <td colspan="2">
-      <include src="journal" case_id="@case.case_id@">
+      <include src="journal" case_id="@case.case_id;noquote@">
     </td>
   </tr>
 </table>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/comment-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/comment-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/comment-add.adp	6 Sep 2002 21:50:15 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/comment-add.adp	22 May 2003 14:17:47 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Comment on case @case.object_name@</property>
-<property name="context">@context@</property>
+<property name="title">Comment on case @case.object_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">comment.msg</property>
 
 
@@ -35,7 +35,7 @@
 
 
 <p>
-<include src="journal" case_id="@case_id@" comment_link="0">
+<include src="journal" case_id="@case_id;noquote@" comment_link="0">
 
 </master>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/index.adp	6 Sep 2002 21:50:15 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/index.adp	22 May 2003 14:17:47 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Work List</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <if @admin_p@ eq 1>
   (<a href="admin/">Administer</a>)<p>
@@ -16,7 +16,7 @@
 
 <include src="task-list">
 
-<if @admin_p@ eq 1>
+<if @admin_p;noquote@ eq 1>
   <h3>Unassigned Tasks</h3>
   <include src="task-list" type="unassigned">
 </if>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.adp	6 Sep 2002 21:50:15 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.adp	22 May 2003 14:17:47 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Reassign Task</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <h3>Current Assignees</h3>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task-deadline-set.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task-deadline-set.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task-deadline-set.adp	6 Sep 2002 21:50:15 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task-deadline-set.adp	22 May 2003 14:17:47 -0000	1.4
@@ -1,9 +1,9 @@
 <master>
 <property name="title">Set Deadline</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <form action="task-deadline-set-2" name="deadline">
-@export_vars@
+@export_vars;noquote@
 <table>
 <tr><th align="right">Task</th><td>@task.task_name@</td></tr>
 <tr><th align="right">Deadline</th>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp	6 Sep 2002 21:50:15 -0000	1.7
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp	22 May 2003 14:17:47 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-<property name=title>@task.task_name@</property>
-<property name="context">@context@</property>
+<property name=title>@task.task_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
 <tr><td bgcolor="#cccccc">
@@ -22,7 +22,7 @@
 
 <multiple name="panels">
     <td bgcolor="@panels.bgcolor@" valign="top">
-	<include src="@panels.template_url@" &="task" &="task_attributes_to_set" &="task_assigned_users" &="task_roles_to_assign" &="export_form_vars" &="return_url">
+	<include src="@panels.template_url;noquote@" &="task" &="task_attributes_to_set" &="task_assigned_users" &="task_roles_to_assign" &="export_form_vars" &="return_url">
     </td>
 </multiple>
 
@@ -49,7 +49,7 @@
 
 <p>
 
-<include src="journal" case_id="@case_id@">
+<include src="journal" case_id="@case_id;noquote@">
 
 
 </master>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/arc-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/arc-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/arc-edit.adp	6 Sep 2002 21:50:16 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/arc-edit.adp	22 May 2003 14:18:24 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Edit Arc</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">arc.guard_description</property>
 
 <blockquote>
@@ -10,7 +10,7 @@
 </blockquote>
 
 <form action="arc-edit-2" name="arc">
-@export_vars@
+@export_vars;noquote@
 
 <table>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/assign-transition-role.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/assign-transition-role.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/assign-transition-role.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/assign-transition-role.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Assign Transition to @role.role_name@</property>
-<property name="context">@context@</property>
+<property name="title">Assign Transition to @role.role_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form action="assign-transition-role-2" method="post">
 @export_form_vars@
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attribute-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attribute-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attribute-add.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attribute-add.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,10 +1,10 @@
 <master>
 <property name="title">Add attribute</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">attribute.name</property>
 
 <form action="attribute-add-2" name="attribute">
-@export_vars@
+@export_vars;noquote@
 
 <table>
   <tr>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attributes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attributes.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attributes.adp	6 Sep 2002 21:50:16 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attributes.adp	22 May 2003 14:18:24 -0000	1.5
@@ -1,12 +1,12 @@
 <master>
-<property name="title">Attributes for @workflow_name@</property>
-<property name="context">@context@</property>
+<property name="title">Attributes for @workflow_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <table>
   <tr>
     <td width="10%">&nbsp;</td>
     <td>
-      <include src="attributes-table" workflow_key="@workflow_key@">
+      <include src="attributes-table" workflow_key="@workflow_key;noquote@">
     </td>
     <td width="10%">&nbsp;</td>
   </tr>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/case-debug.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/case-debug.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/case-debug.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/case-debug.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Case: @case.object_name@ (@case.state@)</property>
-<property name="context">@context@</property>
+<property name="title">Case: @case.object_name;noquote@ (@case.state;noquote@)</property>
+<property name="context">@context;noquote@</property>
 
 <h3>All Tasks</h3>
 <table border=1>
@@ -72,7 +72,7 @@
 
 <h3>Journal</h3>
 
-<include src="../journal" case_id="@case.case_id@">
+<include src="../journal" case_id="@case.case_id;noquote@">
 
 </master>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/cases.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/cases.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/cases.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/cases.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,12 +1,12 @@
 <master>
-<property name="title">@workflow_name@ Cases</property>
-<property name="context">@context@</property>
+<property name="title">@workflow_name;noquote@ Cases</property>
+<property name="context">@context;noquote@</property>
 
-@dimensional_html@
+@dimensional_html;noquote@
 
 <p>
 
-@table_html@
+@table_html;noquote@
 
 </master>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/context-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/context-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/context-add.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/context-add.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,10 +1,10 @@
 <master>
 <property name="title">Add Context</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">context.context_key</property>
 
 <form method="post" action="context-add-2" name="context">
-@export_vars@
+@export_vars;noquote@
 <table>
 
 <tr><th align=right>Key</th><td><input type=text name=context_key></td><tr>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/define.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/define.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/define.adp	6 Sep 2002 21:50:16 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/define.adp	22 May 2003 14:18:24 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Process Builder for @workflow.pretty_name@</property>
-<property name="context">@context@</property>
+<property name="title">Process Builder for @workflow.pretty_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <table width="100%">
 <tr>
@@ -29,11 +29,11 @@
 <p>
 
 <if @transition_key@ not nil>
-    <include src="define-transition-info" &="workflow" transition_key="@transition_key@" format="@format@" mode="@mode@" return_url="@return_url@" modifiable_p="@modifiable_p@">
+    <include src="define-transition-info" &="workflow" transition_key="@transition_key;noquote@" format="@format;noquote@" mode="@mode;noquote@" return_url="@return_url;noquote@" modifiable_p="@modifiable_p;noquote@">
     <p>
 </if>
 <if @place_key@ not nil>
-    <include src="define-place-info" &="workflow" place_key="@place_key@" format="@format@" mode="@mode@" return_url="@return_url@" modifiable_p="@modifiable_p@">
+    <include src="define-place-info" &="workflow" place_key="@place_key;noquote@" format="@format;noquote@" mode="@mode;noquote@" return_url="@return_url;noquote@" modifiable_p="@modifiable_p;noquote@">
     <p>
 </if>
 
@@ -45,9 +45,9 @@
 
 <center>
 
-<include src="workflow-display" &="workflow" workflow_key="@workflow_key@" format="@format@" mode="@mode@" transition_key="@transition_key@" place_key="@place_key@" &="header_stuff" return_url="@return_url@" modifiable_p="@modifiable_p@">
+<include src="workflow-display" &="workflow" workflow_key="@workflow_key;noquote@" format="@format;noquote@" mode="@mode;noquote@" transition_key="@transition_key;noquote@" place_key="@place_key;noquote@" &="header_stuff" return_url="@return_url;noquote@" modifiable_p="@modifiable_p;noquote@">
 
-<property name="header_stuff">@header_stuff@</property>
+<property name="header_stuff">@header_stuff;noquote@</property>
 
 </center>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export-2.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export-2.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Export Business Process</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <if @message@ not nil>
   <blockquote><strong>@message@</strong></blockquote>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Export Business Process</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 This will export the process definition as a SQL script, which you can
 subsequently run on a different system, in order to recreate the process there.
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/index.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/index.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Business Process Administration</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <h3>Business Processes on This System</h3>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/init.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/init.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/init.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/init.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Initialize Case</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <blockquote><em> 
 
@@ -21,7 +21,7 @@
 </em></blockquote>
 
 <form action=init-2 method=get name="init">
-@export_vars@
+@export_vars;noquote@
 <table border=0>
 
 <!--
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/name-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/name-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/name-edit.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/name-edit.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,10 +1,10 @@
 <master>
 <property name="title">Edit Process Name</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">workflow.workflow_name</property>
 
 <form action="name-edit-2" name="workflow">
-@export_vars@
+@export_vars;noquote@
 
 <table>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.adp	6 Sep 2002 21:50:16 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.adp	22 May 2003 14:18:24 -0000	1.5
@@ -1,10 +1,10 @@
 <master>
 <property name="title">Add Place</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">place.place_name</property>
 
 <form action="place-add-2" name="place">
-@export_vars@
+@export_vars;noquote@
 
 <table>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.adp	6 Sep 2002 21:50:16 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.adp	22 May 2003 14:18:24 -0000	1.5
@@ -1,10 +1,10 @@
 <master>
-<property name="title">Place @place_name@</property>
-<property name="context">@context@</property>
+<property name="title">Place @place_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">place.place_name</property>
 
 <form action="place-edit-2" name="place">
-@export_vars@
+@export_vars;noquote@
 
 <table>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-add.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-add.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,10 +1,10 @@
 <master>
 <property name="title">Add Role</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">role.role_name</property>
 
 <form action="role-add-2" name="role" method="post">
-@export_vars@
+@export_vars;noquote@
 
 <table>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-edit.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-edit.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,10 +1,10 @@
 <master>
-<property name="title">Edit @role_name@ role</property>
-<property name="context">@context@</property>
+<property name="title">Edit @role_name;noquote@ role</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">role.role_name</property>
 
 <form action="role-edit-2" name="role" method="post">
-@export_vars@
+@export_vars;noquote@
 <table>
   <tr>
     <th align="right">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-manual.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-manual.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-manual.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-manual.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,10 +1,10 @@
 <master>
-<property name="title">Manually Assign @role_name@</property>
-<property name="context">@context@</property>
+<property name="title">Manually Assign @role_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">manual_form.transition_key</property>
 
 <form action="role-manual-2" name="manual_form" method="post">
-@export_vars@
+@export_vars;noquote@
 
 <table>
   <tr>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/static-assignments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/static-assignments.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/static-assignments.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/static-assignments.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@workflow_name@ Static Assignments</property>
-<property name="context">@context@</property>
+<property name="title">@workflow_name;noquote@ Static Assignments</property>
+<property name="context">@context;noquote@</property>
 
 <!--
 Context: [ 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-actions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-actions.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-actions.adp	6 Sep 2002 21:50:16 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-actions.adp	22 May 2003 14:18:24 -0000	1.5
@@ -1,10 +1,10 @@
 <master>
 <property name="title">Task Actions</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">actions.enable_callback</property>
 
 <form action="task-actions-2" name="actions">
-@export_vars@
+@export_vars;noquote@
 <table cellspacing="0" cellpadding="0" border="0">
   <tr>
     <td bgcolor="#cccccc">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add.adp	6 Sep 2002 21:50:16 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add.adp	22 May 2003 14:18:24 -0000	1.5
@@ -1,10 +1,10 @@
 <master>
 <property name="title">Add Task</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">task.transition_name</property>
 
 <form action="task-add-2" name="task">
-@export_vars@
+@export_vars;noquote@
 
 <table>
   <tr>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.adp	6 Sep 2002 21:50:16 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.adp	22 May 2003 14:18:24 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Assignments to be done by @transition_name@</property>
-<property name="context">@context@</property>
+<property name="title">Assignments to be done by @transition_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 The user performing the task <strong>@transition_name@</strong> will be asked to <strong>assign the following roles</strong>:
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-attributes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-attributes.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-attributes.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-attributes.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Attributes to be set by @transition_name@</property>
-<property name="context">@context@</property>
+<property name="title">Attributes to be set by @transition_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <table>
   <tr>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit.adp	6 Sep 2002 21:50:16 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit.adp	22 May 2003 14:18:24 -0000	1.5
@@ -1,10 +1,10 @@
 <master>
-<property name="title">Task @transition_name@</property>
-<property name="context">@context@</property>
-<property name="focus">@focus@</property>
+<property name="title">Task @transition_name;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="focus">@focus;noquote@</property>
 
 <form action="task-edit-2" name="task" method="post">
-@export_vars@
+@export_vars;noquote@
 
 <table>
   <tr>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-add.adp	6 Sep 2002 21:50:16 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-add.adp	22 May 2003 14:18:24 -0000	1.5
@@ -7,7 +7,7 @@
 <hr>
 
 <form action="task-panel-add-2" name="panel" method="post">
-@export_vars@
+@export_vars;noquote@
 
 <table>
   <tr>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-edit.adp	6 Sep 2002 21:50:16 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-edit.adp	22 May 2003 14:18:24 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Edit panel</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">panel.header</property>
 
 <form action="task-panel-edit-2" name="panel" method="post">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panels.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panels.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panels.adp	6 Sep 2002 21:50:16 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panels.adp	22 May 2003 14:18:24 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Panels for @transition_name@</property>
-<property name="context">@context@</property>
+<property name="title">Panels for @transition_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <!--
 Context: [ 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/unassigned-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/unassigned-tasks.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/unassigned-tasks.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/unassigned-tasks.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Unassigned Tasks</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 
 <if @tasks:rowcount@ eq 0>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-add.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-add.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="title">New Advanced Process</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">workflow.workflow_name</property>
 
 The first step in defining a new process is to give it a name and an
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Copy Process</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">workflow.new_workflow_pretty_name</property>
 
 You're about to make a copy of the process @pretty_name@.
@@ -12,7 +12,7 @@
 least unique.
 
 <form action="workflow-copy-2" name="workflow" method="post">
-@export_vars@
+@export_vars;noquote@
 
 <blockquote>
   <table cellspacing="0" cellpadding="0" border="0">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-display.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-display.adp	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-display.adp	22 May 2003 14:18:24 -0000	1.2
@@ -3,15 +3,15 @@
 <h3>Transitions</h3>
 <table cellpadding="2" cellspacing="2" border="0">
 <multiple name="transitions">
-    <include src="transition-display" &="workflow" transition_key="@transitions.transition_key@" selected_transition_key="@transition_key@" selected_place_key="@place_key@">
+    <include src="transition-display" &="workflow" transition_key="@transitions.transition_key;noquote@" selected_transition_key="@transition_key;noquote@" selected_place_key="@place_key;noquote@">
     <tr><td colspan="5">&nbsp;</td></tr>
 </multiple>
 </table>
 
 <h3>Places</h3>
 <table cellpadding="2" cellspacing="2" border="0">
 <multiple name="places">
-    <include src="place-display" &="workflow" place_key="@places.place_key@" selected_transition_key="@transition_key@" selected_place_key="@place_key@">
+    <include src="place-display" &="workflow" place_key="@places.place_key;noquote@" selected_transition_key="@transition_key;noquote@" selected_place_key="@place_key;noquote@">
 </multiple>
 </table>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-roles.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-roles.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-roles.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-roles.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
-<property name="title">@workflow.pretty_name@ Roles</property>
-<property name="context">@context@</property>
+<property name="title">@workflow.pretty_name;noquote@ Roles</property>
+<property name="context">@context;noquote@</property>
 
-<include src="roles-table" workflow_key="@workflow_key@" return_url="@return_url@">
+<include src="roles-table" workflow_key="@workflow_key;noquote@" return_url="@return_url;noquote@">
 
 </master>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-summary.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-summary.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-summary.adp	6 Sep 2002 21:50:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-summary.adp	22 May 2003 14:18:24 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@workflow_name@ Summary</property>
-<property name="context">@context@</property>
+<property name="title">@workflow_name;noquote@ Summary</property>
+<property name="context">@context;noquote@</property>
 
 <h3><a href="@cases_url_for_state.active@">@num_cases_in_state.active@</a> Active Cases</h3>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow.adp	6 Sep 2002 21:50:16 -0000	1.5
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow.adp	22 May 2003 14:18:24 -0000	1.6
@@ -1,9 +1,9 @@
 <master>
-<property name="title">@workflow.pretty_name@</property>
-<property name="context">@context@</property>
+<property name="title">@workflow.pretty_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <!-- Tab bar -->
-<include src="workflow-tabs" tab="@tab@" workflow_key="@workflow_key@">
+<include src="workflow-tabs" tab="@tab;noquote@" workflow_key="@workflow_key;noquote@">
 
 <table width="100%" cellspacing="4" cellpadding="2" border="0">
   <tr>
@@ -159,7 +159,7 @@
 		</tr>
 		<tr bgcolor="#ffffff">
 		  <td align="left">
-		    <include src="transitions-table" workflow_key="@workflow_key@" return_url="@return_url@" modifiable_p="@modifiable_p@">
+		    <include src="transitions-table" workflow_key="@workflow_key;noquote@" return_url="@return_url;noquote@" modifiable_p="@modifiable_p;noquote@">
 		  </td>
 		</tr>
 	      </table>
@@ -186,7 +186,7 @@
 		</tr>
 		<tr bgcolor="#ffffff">
 		  <td align="left">
-		    <include src="attributes-table" workflow_key="@workflow_key@" return_url="@return_url@" modifiable_p="@modifiable_p@">
+		    <include src="attributes-table" workflow_key="@workflow_key;noquote@" return_url="@return_url;noquote@" modifiable_p="@modifiable_p;noquote@">
 		  </td>
 		</tr>
 	      </table>
@@ -213,7 +213,7 @@
 		</tr>
 		<tr bgcolor="#ffffff">
 		  <td align="left">
-		    <include src="roles-table" workflow_key="@workflow_key@" return_url="@return_url@" modifiable_p="@modifiable_p@">
+		    <include src="roles-table" workflow_key="@workflow_key;noquote@" return_url="@return_url;noquote@" modifiable_p="@modifiable_p;noquote@">
 		  </td>
 		</tr>
 	      </table>
@@ -245,7 +245,7 @@
 		</tr>
 		<tr bgcolor="#ffffff">
 		  <td align="left">
-		    <include src="transition-panels-table" workflow_key="@workflow_key@" return_url="@return_url@" modifiable_p="@modifiable_p@">
+		    <include src="transition-panels-table" workflow_key="@workflow_key;noquote@" return_url="@return_url;noquote@" modifiable_p="@modifiable_p;noquote@">
 		  </td>
 		</tr>
 	      </table>
@@ -270,7 +270,7 @@
 		</tr>
 		<tr bgcolor="#ffffff">
 		  <td align="left">
-		    <include src="static-assignments-table" workflow_key="@workflow_key@" return_url="@return_url@" modifiable_p="@modifiable_p@">
+		    <include src="static-assignments-table" workflow_key="@workflow_key;noquote@" return_url="@return_url;noquote@" modifiable_p="@modifiable_p;noquote@">
 		  </td>
 		</tr>
 	      </table>
@@ -302,7 +302,7 @@
 		</tr>
 		<tr bgcolor="#ffffff">
 		  <td>
-		    <include src="workflow-graph" workflow_key="@workflow_key@" size="3,6" modifiable_p="@modifiable_p@">
+		    <include src="workflow-graph" workflow_key="@workflow_key;noquote@" size="3,6" modifiable_p="@modifiable_p;noquote@">
 		  </td>
 		</tr>
 	      </table>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/assignments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/assignments.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/assignments.adp	17 May 2003 10:09:32 -0000	1.5
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/assignments.adp	22 May 2003 14:19:03 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Simple Process Wizard Step 4: Assignments for @workflow_name@</property>
-<property name="context">@context@</property>
+<property name="title">Simple Process Wizard Step 4: Assignments for @workflow_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <include src="progress-bar" num_completed="3">
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.adp	6 Sep 2002 21:50:18 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.adp	22 May 2003 14:19:03 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Simple Process Wizard Step 5: Create @workflow_name@</property>
-<property name="context">@context@</property>
+<property name="title">Simple Process Wizard Step 5: Create @workflow_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <include src="progress-bar" num_completed="4" no_links="1">
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/index.adp	6 Sep 2002 21:50:18 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/index.adp	22 May 2003 14:19:03 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="focus">workflow.workflow_name</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="title">Simple Process Wizard</property>
 
 <include src="progress-bar" num_completed="0">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loop-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loop-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loop-add.adp	6 Sep 2002 21:50:18 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loop-add.adp	22 May 2003 14:19:03 -0000	1.4
@@ -1,10 +1,10 @@
 <master>
 <property name="focus">loop.to_transition_key</property>
-<property name="context">@context@</property>
-<property name="title">Add Loop from @task_name@</property>
+<property name="context">@context;noquote@</property>
+<property name="title">Add Loop from @task_name;noquote@</property>
 
 <form action="loop-add-2" name="loop">
-@export_vars@
+@export_vars;noquote@
 
 <blockquote>
 <table cellspacing=0 cellpadding=0 border=0>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.adp	6 Sep 2002 21:50:18 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.adp	22 May 2003 14:19:03 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Simple Process Wizard Step 3: Loops for @workflow_name@</property>
-<property name="context">@context@</property>
+<property name="title">Simple Process Wizard Step 3: Loops for @workflow_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <include src="progress-bar" num_completed="2">
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-add.adp	6 Sep 2002 21:50:18 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-add.adp	22 May 2003 14:19:03 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
 <property name="focus">task.task_name</property>
-<property name="context">@context@</property>
-<property name="title">Add Task to @workflow_name@</property>
+<property name="context">@context;noquote@</property>
+<property name="title">Add Task to @workflow_name;noquote@</property>
 
 Add a task to the process. The task name should be an imperative, such as "Write", "Review", "Assign", etc.
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-edit.adp	6 Sep 2002 21:50:18 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-edit.adp	22 May 2003 14:19:03 -0000	1.4
@@ -1,12 +1,12 @@
 <master>
 <property name="focus">task.task_name</property>
-<property name="context">@context@</property>
-<property name="title">Edit Task @task_name@</property>
+<property name="context">@context;noquote@</property>
+<property name="title">Edit Task @task_name;noquote@</property>
 
 Edit the task. The task name should be an imperative, such as "Write", "Review", "Assign", etc.
 
 <form action="task-edit-2" method="post" name="task">
-@export_vars@
+@export_vars;noquote@
 <table>
 <tr>
   <th align=right>Task name (e.g. "Write")</th>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.adp	6 Sep 2002 21:50:18 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.adp	22 May 2003 14:19:03 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Simple Process Wizard Step 2: Tasks for @workflow_name@</property>
-<property name="context">@context@</property>
+<property name="title">Simple Process Wizard Step 2: Tasks for @workflow_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <include src="progress-bar" num_completed="1">
 
Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp	30 Nov 2002 17:23:44 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp	22 May 2003 14:15:21 -0000	1.5
@@ -1,9 +1,9 @@
 <master>
-<property name="title">Edit comment for the portrait of @first_names@ @last_name@</property>
-<property name="context">@context@</property>
+<property name="title">Edit comment for the portrait of @first_names;noquote@ @last_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form method="post" action="comment-edit-2.tcl">
-@export_vars@
+@export_vars;noquote@
 Story Behind Photo:<br />
 <textarea rows="6" cols="50" wrap="soft" name="description">
 @description@
Index: openacs-4/packages/acs-subsite/www/user/portrait/erase.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/erase.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/user/portrait/erase.adp	6 Sep 2002 21:50:14 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/user/portrait/erase.adp	22 May 2003 14:15:21 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Erase Portrait</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <if @admin_p@ eq 0>
   <p>Are you sure that you want to erase your portrait?</p>
@@ -10,7 +10,7 @@
 </else>
 
 <form method="get" action="erase-2">
-@export_vars@
+@export_vars;noquote@
 <center>
 <input type="submit" value="Yes, I'm sure" />
 </center>
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/user/portrait/index.adp	9 Sep 2002 13:52:21 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.adp	22 May 2003 14:15:21 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Portrait of @first_names@ @last_name@</property>
-<property name="context">@context@</property>
+<property name="title">Portrait of @first_names;noquote@ @last_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <p>This is the image that we show to other users at @system_name@:</p>
 
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.adp	6 Sep 2002 21:50:14 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.adp	22 May 2003 14:15:21 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name=title>Upload Portrait</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 How would you like the world to see @first_names@ @last_name@?
 
@@ -12,7 +12,7 @@
 
 <blockquote>
 <form enctype=multipart/form-data method=POST action="upload-2">
-@export_vars@
+@export_vars;noquote@
 <table>
 <tr>
 <td valign=top align=right>Filename: </td>
Index: openacs-4/packages/acs-templating/resources/forms/standard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/standard.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	13 Jan 2003 15:23:30 -0000	1.5
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	22 May 2003 14:15:37 -0000	1.6
@@ -31,7 +31,7 @@
       <else>
        <tr>
         <if @elements.label@ not nil>
-	<td><b>@elements.label@</b>&nbsp;&nbsp;
+	<td><b>@elements.label;noquote@</b>&nbsp;&nbsp;
           <if @elements.help_text@ not nil>
             <br>&nbsp;&nbsp;
             <font size=-1><noparse><formhelp id=@elements.id@></noparse></font><br>
@@ -45,7 +45,7 @@
             <table cellpadding="4" cellspacing="0" border="0">
 	      <formgroup id=@elements.id@>
 		<tr>
-                  <td>\@formgroup.widget@</td>
+                  <td>\@formgroup.widget;noquote@</td>
                   <td>
                     <label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">\@formgroup.label@</label>
                   </td>
Index: openacs-4/packages/acs-templating/www/admin/test/include-0.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/admin/test/include-0.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/admin/test/include-0.adp	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/acs-templating/www/admin/test/include-0.adp	22 May 2003 14:16:00 -0000	1.2
@@ -16,15 +16,15 @@
 
     <p>
      @lt@multiple name=v>
-<include src=include indent="@indent@      " l="
+<include src=include indent="@indent;noquote@      " l="
       {%x% FALSE nil}
       {%y% TRUE nil}
       {%z% TRUE nil}
       {%x% TRUE defined}
       {%y% TRUE defined}
       {%z% FALSE defined}
       {%x% FALSE lt 3}
-      {@quot@yes@quot@ TRUE true}
+      {@quot;noquote@yes@quot;noquote@ TRUE true}
       {0 FALSE true}
       {t FALSE false}
       {oFf TRUE false}
Index: openacs-4/packages/acs-templating/www/admin/test/include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/admin/test/include.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/admin/test/include.adp	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/acs-templating/www/admin/test/include.adp	22 May 2003 14:16:00 -0000	1.2
@@ -3,8 +3,8 @@
 @indent@ @lt@if @false_condition@>
 @indent@   fail '@false_label@' should be false
 @indent@ @lt@/if>@lt@else>
-<include src=include l="@cdr@" indent="@indent@  "
->@indent@ @lt@/else>
+<include src=include l="@cdr;noquote@" indent="@indent;noquote@  "
+>@indent;noquote@ @lt;noquote@/else>
 @indent@@lt@/if>@lt@else>
 @indent@ fail '@true_label@' should be true
 @indent@@lt@/else>
Index: openacs-4/packages/acs-templating/www/doc/demo/fibo-start.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/fibo-start.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/doc/demo/fibo-start.adp	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/acs-templating/www/doc/demo/fibo-start.adp	22 May 2003 14:16:37 -0000	1.2
@@ -1,5 +1,5 @@
 <html>
   <body>
-    <include src="fibo" n = @m@ >
+    <include src="fibo" n = @m;noquote@ >
   </body>
 </html>
Index: openacs-4/packages/acs-templating/www/doc/demo/fibo.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/fibo.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/doc/demo/fibo.adp	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/acs-templating/www/doc/demo/fibo.adp	22 May 2003 14:16:37 -0000	1.2
@@ -1,9 +1,9 @@
 <master src=fibo-master>
-<property name=level>@n@</property>
+<property name=level>@n;noquote@</property>
 
 <if @n@ ge 2>
-  <td><include src=fibo n=@one_less@></td>
-  <td><include src=fibo n=@two_less@></td>
+  <td><include src=fibo n=@one_less;noquote@></td>
+  <td><include src=fibo n=@two_less;noquote@></td>
 </if><else>
   <td>*</td>
 </else>
Index: openacs-4/packages/acs-templating/www/doc/demo/include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/include.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/doc/demo/include.adp	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/acs-templating/www/doc/demo/include.adp	22 May 2003 14:16:37 -0000	1.2
@@ -2,7 +2,7 @@
   <body>
   <h1>Included Template</h1>
 
-  relative:<include src="included" name="@name@">
+  relative:<include src="included" name="@name;noquote@">
   <br>
   absolute:<include src="/packages/acs-templating/www/doc/demo/included"
                       name="Anders">
Index: openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.adp	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/acs-templating/www/doc/exercise/list-and-var-sample.adp	22 May 2003 14:17:05 -0000	1.2
@@ -2,7 +2,7 @@
 
 <!-- examine master-sample.adp to see that title and closing_text are essentially
 used as onevalues within the master page -->
-<property name="title">@name@'s Personal Home Page</property>
+<property name="title">@name;noquote@'s Personal Home Page</property>
 <property name="closing_text"><small>It's been a pleasure to serve you this page</small></property>
 
 
Index: openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp	22 May 2003 14:17:28 -0000	1.2
@@ -47,7 +47,7 @@
 </if>
 
 <multiple name=public>
-<include src=proc-template data=@public.data@>
+<include src=proc-template data=@public.data;noquote@>
 <p>
 </multiple>
 
@@ -57,7 +57,7 @@
 <b>Private Methods</b>:<br>
 </if>
 <multiple name=private>
-<include src=proc-template data=@private.data@>
+<include src=proc-template data=@private.data;noquote@>
 <p>
 </multiple>
 
Index: openacs-4/packages/acs-templating/www/doc/gen/package-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/package-template.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/doc/gen/package-template.adp	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/packages/acs-templating/www/doc/gen/package-template.adp	22 May 2003 14:17:28 -0000	1.2
@@ -17,7 +17,7 @@
 <list name=info_list>
   <tr bgcolor=white>
     <td>
-      <include src="namespace_block" data="@info_list:item@">
+      <include src="namespace_block" data="@info_list:item;noquote@">
     </td>
 </tr>
 </list>
Index: openacs-4/packages/address-book/www/address-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/address-ae.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/address-book/www/address-ae.adp	6 Sep 2002 21:50:19 -0000	1.3
+++ openacs-4/packages/address-book/www/address-ae.adp	22 May 2003 14:19:20 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name=title>@page_title@</property>
-<property name="context">@context@</property>
+<property name=title>@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form action=address-ae-2>
 @address_widget@
Index: openacs-4/packages/address-book/www/attr-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/attr-ae.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/address-book/www/attr-ae.adp	6 Sep 2002 21:50:19 -0000	1.3
+++ openacs-4/packages/address-book/www/attr-ae.adp	22 May 2003 14:19:20 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form action=attr-ae-2>
 @attr_widget@
Index: openacs-4/packages/address-book/www/contact-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/address-book/www/contact-add.adp	6 Sep 2002 21:50:19 -0000	1.3
+++ openacs-4/packages/address-book/www/contact-add.adp	22 May 2003 14:19:20 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name=>@page_title@</property>
-<property name="context">@context@</property>
+<property name=>@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form method=post action=contact-add-2>
 @hidden_vars@
Index: openacs-4/packages/address-book/www/contact-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/address-book/www/contact-edit.adp	6 Sep 2002 21:50:19 -0000	1.3
+++ openacs-4/packages/address-book/www/contact-edit.adp	22 May 2003 14:19:20 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form method=post action=contact-edit-2>
 @hidden_vars@
Index: openacs-4/packages/address-book/www/contact-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-view.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/address-book/www/contact-view.adp	6 Sep 2002 21:50:19 -0000	1.3
+++ openacs-4/packages/address-book/www/contact-view.adp	22 May 2003 14:19:20 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <table>
 <tr>
Index: openacs-4/packages/address-book/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/address-book/www/index.adp	6 Sep 2002 21:50:19 -0000	1.3
+++ openacs-4/packages/address-book/www/index.adp	22 May 2003 14:19:20 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@instance_name@</property>
-<property name="context">@context@</property>
+<property name="title">@instance_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form action="./">
 <input type=text name=substr size=20 maxlength=40 value=@escaped_substr@>
Index: openacs-4/packages/adserver/www/default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/default.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/adserver/www/default.adp	6 Sep 2002 21:50:20 -0000	1.3
+++ openacs-4/packages/adserver/www/default.adp	22 May 2003 14:19:36 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 @page_content@
Index: openacs-4/packages/adserver/www/admin/default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/admin/default.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/adserver/www/admin/default.adp	6 Sep 2002 21:50:21 -0000	1.3
+++ openacs-4/packages/adserver/www/admin/default.adp	22 May 2003 14:19:50 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 @page_content@
Index: openacs-4/packages/attachments/www/attach.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/attachments/www/attach.adp	11 Dec 2002 13:23:03 -0000	1.7
+++ openacs-4/packages/attachments/www/attach.adp	22 May 2003 14:20:13 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#attachments.lt_Attach_a_File_to_pret#</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 #attachments.lt_You_are_attaching_a_d#
 
@@ -11,7 +11,7 @@
 </small>
 
 <p>
-@fs_context_bar_html@
+@fs_context_bar_html;noquote@
 <p>
 #attachments.attach_new#  &nbsp;&nbsp;     <a href="file-add?folder_id=@folder_id@&@passthrough_vars@">#attachments.File#</a>
       &nbsp;&nbsp;|&nbsp;&nbsp;
Index: openacs-4/packages/attachments/www/file-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/file-add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/attachments/www/file-add.adp	7 Nov 2002 15:11:50 -0000	1.5
+++ openacs-4/packages/attachments/www/file-add.adp	22 May 2003 14:20:13 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#attachments.lt_Upload_New_Attachment#</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 #attachments.You_are_attaching_a# <b>#attachments.new#</b> #attachments.lt_document_to_pretty_ob#<p>
 
Index: openacs-4/packages/attachments/www/simple-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/simple-add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/attachments/www/simple-add.adp	7 Nov 2002 15:11:50 -0000	1.5
+++ openacs-4/packages/attachments/www/simple-add.adp	22 May 2003 14:20:13 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#attachments.Attach_URL#</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 #attachments.You_are_attaching_a# <b>#attachments.new_url#</b> #attachments.lt_to_pretty_object_name#<p>
 
Index: openacs-4/packages/authorize-gateway/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/authorize-gateway/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/authorize-gateway/www/index.adp	12 Sep 2002 19:06:57 -0000	1.3
+++ openacs-4/packages/authorize-gateway/www/index.adp	22 May 2003 14:20:48 -0000	1.4
@@ -1,10 +1,10 @@
 <master>
-  <property name="title">@title@</property>
+  <property name="title">@title;noquote@</property>
   <if @admin_p@ eq 1>
-    <property name="context_bar"><table width="100%"><tbody><tr><td align="left">@context_bar@</td><td align="right">[ <a href="admin/">Administer</a> ]</td></tr></tbody></table></property>
+    <property name="context_bar"><table width="100%"><tbody><tr><td align="left">@context_bar;noquote@</td><td align="right">[ <a href="admin/">Administer</a> ]</td></tr></tbody></table></property>
   </if> 
   <else>
-    <property name="context_bar">@context_bar@</property>
+    <property name="context_bar">@context_bar;noquote@</property>
   </else>
 
   <p>This package has no user pages.</p>
Index: openacs-4/packages/authorize-gateway/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/authorize-gateway/www/admin/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/authorize-gateway/www/admin/index.adp	12 Sep 2002 19:06:58 -0000	1.3
+++ openacs-4/packages/authorize-gateway/www/admin/index.adp	22 May 2003 14:21:10 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">@title@</property>
-  <property name="context_bar"><table width="100%"><tbody><tr><td align="left">@context_bar@</td><td align="right">[ <a href="/doc/authorize-gateway/">help</a> ]</td></tr></tbody></table></property>
+  <property name="title">@title;noquote@</property>
+  <property name="context_bar"><table width="100%"><tbody><tr><td align="left">@context_bar;noquote@</td><td align="right">[ <a href="/doc/authorize-gateway/">help</a> ]</td></tr></tbody></table></property>
 
   @dimensional_bar@
   <p>@result_table@</p>
Index: openacs-4/packages/authorize-gateway/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/authorize-gateway/www/doc/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/authorize-gateway/www/doc/index.adp	30 Nov 2002 17:26:16 -0000	1.3
+++ openacs-4/packages/authorize-gateway/www/doc/index.adp	22 May 2003 14:21:31 -0000	1.4
@@ -1,12 +1,12 @@
 <master>
-  <property name="title">@title@</property>
-  <property name="signatory">@signatory@</property>
+  <property name="title">@title;noquote@</property>
+  <property name="signatory">@signatory;noquote@</property>
   <property name="header_stuff"><link href="index.css" type="text/css" rel="stylesheet"></property>
   <if @admin_p@ and @authorize_gateway_mounted@>
-    <property name="context_bar"><table width="100%"><tbody><tr><td align="left">@context_bar@</td><td align="right">[ <a href="@package_url@admin/">Administer</a> ]</td></tr> </tbody></table></property>
+    <property name="context_bar"><table width="100%"><tbody><tr><td align="left">@context_bar;noquote@</td><td align="right">[ <a href="@package_url;noquote@admin/">Administer</a> ]</td></tr> </tbody></table></property>
   </if>
   <else>
-    <property name="context_bar">@context_bar@</property>
+    <property name="context_bar">@context_bar;noquote@</property>
   </else>
 
   <h2>Why</h2>
Index: openacs-4/packages/authorize-gateway/www/doc/license.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/authorize-gateway/www/doc/license.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/authorize-gateway/www/doc/license.adp	12 Sep 2002 19:06:59 -0000	1.2
+++ openacs-4/packages/authorize-gateway/www/doc/license.adp	22 May 2003 14:21:31 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">@title@</property>
-  <property name="signatory">@signatory@</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name="title">@title;noquote@</property>
+  <property name="signatory">@signatory;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
   <property name="header_stuff"><link href="index.css" type="text/css" rel="stylesheet"></property>
 
   <h2>GNU General Public License</h2>
Index: openacs-4/packages/bookmarks/www/bookmark-add-import.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/bookmark-add-import.adp	30 Nov 2002 17:26:55 -0000	1.3
+++ openacs-4/packages/bookmarks/www/bookmark-add-import.adp	22 May 2003 14:21:47 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <% set hidden_form_vars "<input type=hidden name=return_url value=@return_url@>
 <input type=hidden name=viewed_user_id value=@viewed_user_id@>
@@ -11,7 +11,7 @@
 attempt to get the title from the web site.  
 
 <form action=bookmark-add-one method=post name=topform>
-@hidden_form_vars@
+@hidden_form_vars;noquote@
 
 <table>
 <tr>
@@ -25,8 +25,8 @@
 
 <tr>
     <td>Folder</td>
-    <td><include src=folder-selection bookmark_id=@bookmark_id@ folder_p="f" default_id="" viewed_user_id=@viewed_user_id@><br>
-    <a href="folder-add?return_url=@this_url_urlenc@">create a new folder</a></td>
+    <td><include src=folder-selection bookmark_id=@bookmark_id;noquote@ folder_p="f" default_id="" viewed_user_id=@viewed_user_id;noquote@><br>
+    <a href="folder-add?return_url=@this_url_urlenc;noquote@">create a new folder</a></td>
 </tr>
 
 <tr>
@@ -57,7 +57,7 @@
 <h3>Import multiple bookmarks from Netscape or Microsoft Internet Explorer bookmark.htm file</h3>
 
 <form enctype=multipart/form-data method=POST action=bookmarks-import>
-@hidden_form_vars@
+@hidden_form_vars;noquote@
 
 Netscape users: Just specify your bookmark file<br>
 Users of new versions of IE: Export your shortcuts to Netscape format, then
Index: openacs-4/packages/bookmarks/www/bookmark-add-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmark-add-one.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmark-add-one.adp	22 May 2003 14:21:47 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <if @url_unreachable_p@ eq "t">
 <strong>Warning: We are not able to reach the url (@complete_url@) that you specified. Please make sure that you did not misspell the url.</strong>
@@ -16,7 +16,7 @@
     <li><a href="@complete_url@">@complete_url@</a>
     </ul>
     <form action=bookmark-add-one-2 method=post>
-    @export_form_vars_html@
+    @export_form_vars_html;noquote@
     
     Please confirm that this is correct
     <ul>
Index: openacs-4/packages/bookmarks/www/bookmark-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmark-delete.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmark-delete.adp	22 May 2003 14:21:47 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 
 
Index: openacs-4/packages/bookmarks/www/bookmark-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmark-edit.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmark-edit.adp	22 May 2003 14:21:47 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 
 <form method=post action=bookmark-edit-2>
@@ -21,7 +21,7 @@
 
 <tr>
   <td align=right valign=top>Parent Folder:</td>
-  <td><include src=folder-selection bookmark_id=@bookmark.bookmark_id@ folder_p="@bookmark.folder_p@" default_id="@bookmark.parent_id@" viewed_user_id="@bookmark.owner_id@"></td>
+  <td><include src=folder-selection bookmark_id=@bookmark.bookmark_id;noquote@ folder_p="@bookmark.folder_p;noquote@" default_id="@bookmark.parent_id;noquote@" viewed_user_id="@bookmark.owner_id;noquote@"></td>
 </tr>
 
 <tr>
Index: openacs-4/packages/bookmarks/www/bookmark-permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmark-permissions.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmark-permissions.adp	22 May 2003 14:21:47 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
-<property name="viewed_user_id">@viewed_user_id@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="viewed_user_id">@viewed_user_id;noquote@</property>
 
 <form method=post action=bookmark-permissions-2>
 <input type=hidden name=root_folder_id value="@root_folder_id@">
Index: openacs-4/packages/bookmarks/www/bookmark-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-view.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/bookmark-view.adp	6 Sep 2002 21:50:22 -0000	1.3
+++ openacs-4/packages/bookmarks/www/bookmark-view.adp	22 May 2003 14:21:47 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <ul>
 <li> Bookmark Title: @bookmark.local_title@</li>
Index: openacs-4/packages/bookmarks/www/bookmarks-export.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-export.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmarks-export.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmarks-export.adp	22 May 2003 14:21:47 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 Clicking on the link below (alternatively you can right click on the link 
 and choose "Save Target As..." or "Save Link As...") will deliver your bookmarks file in a
Index: openacs-4/packages/bookmarks/www/bookmarks-import.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmarks-import.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmarks-import.adp	22 May 2003 14:21:47 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 Here are the results of the import:
 
Index: openacs-4/packages/bookmarks/www/bookmarks-most-popular.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-most-popular.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmarks-most-popular.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmarks-most-popular.adp	22 May 2003 14:21:47 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <include src="most-popular">
 
Index: openacs-4/packages/bookmarks/www/bookmarks-user-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-user-list.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmarks-user-list.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmarks-user-list.adp	22 May 2003 14:21:47 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context"">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context"">@context;noquote@</property>
 
 
 <if @user_list:rowcount@ eq 0>
Index: openacs-4/packages/bookmarks/www/folder-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/folder-add.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/folder-add.adp	22 May 2003 14:21:47 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 
 <form action=folder-add-2 method=post>
@@ -16,7 +16,7 @@
 <tr>
   <td valign=top align=right>Place in folder:  
   <img border=0 src=pics/ftv2folderopen align=top></td>
-  <td><include src="folder-selection" bookmark_id="@bookmark_id@" folder_p="t" default_id="" viewed_user_id=@viewed_user_id@></td>
+  <td><include src="folder-selection" bookmark_id="@bookmark_id;noquote@" folder_p="t" default_id="" viewed_user_id=@viewed_user_id;noquote@></td>
 </tr>
 <tr>
   <td></td>
Index: openacs-4/packages/bookmarks/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/index.adp	15 Sep 2002 19:35:28 -0000	1.4
+++ openacs-4/packages/bookmarks/www/index.adp	22 May 2003 14:21:47 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="head_contents"><script runat=client>function launch_window(file) {window.open(file,'bookmarks','toolbar=no,location=no,directories=no,status=no,scrollbars=auto,resizable=yes,copyhistory=no,width=350,height=480')}</script></property>
 
 <% set folder_bgcolor [ad_parameter FolderBGColor bookmarks "#f3f3f3"]
Index: openacs-4/packages/bookmarks/www/one-host.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/one-host.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/one-host.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/one-host.adp	22 May 2003 14:21:47 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <ul>
 <multiple name="user_urls">
Index: openacs-4/packages/bookmarks/www/permissions-reset-all.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/permissions-reset-all.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/permissions-reset-all.adp	22 May 2003 14:21:47 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 Are you sure that you want to delete the individual access permissions
 on the following bookmarks to make your default (root) permissions apply?
Index: openacs-4/packages/bookmarks/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/search.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/search.adp	6 Sep 2002 21:50:22 -0000	1.2
+++ openacs-4/packages/bookmarks/www/search.adp	22 May 2003 14:21:47 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <% set img_html "<img border=0 src=pics/ftv2doc.gif align=top>"
 set edit_tag "<font size=-1>Edit</font>"%>
@@ -12,7 +12,7 @@
 <p>
 <multiple name="my_list">
 
-@img_html@ <a href="@my_list.complete_url@">@my_list.title@</a> &nbsp; &nbsp;<a href=bookmark-edit?bookmark_id=@my_list.bookmark_id@&viewed_user_id=@viewed_user_id@>@edit_tag@</a><br>
+@img_html;noquote@ <a href="@my_list.complete_url@">@my_list.title@</a> &nbsp; &nbsp;<a href=bookmark-edit?bookmark_id=@my_list.bookmark_id@&viewed_user_id=@viewed_user_id@>@edit_tag@</a><br>
 
 </multiple>
 </if>
@@ -28,7 +28,7 @@
 <p>
 <multiple name="others_list">
 
-@img_html@ <a target=target_frame href="@others_list.complete_url@">@others_list.title@</a> <if @admin_p@ eq "t"> &nbsp; &nbsp; <a href=bookmark-edit?bookmark_id=@others_list.bookmark_id@&viewed_user_id=@viewed_user_id@>@edit_tag@</a></if> <br>
+@img_html;noquote@ <a target=target_frame href="@others_list.complete_url@">@others_list.title@</a> <if @admin_p@ eq "t"> &nbsp; &nbsp; <a href=bookmark-edit?bookmark_id=@others_list.bookmark_id@&viewed_user_id=@viewed_user_id@>@edit_tag@</a></if> <br>
 
 </multiple>
 </if>
Index: openacs-4/packages/bookmarks/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/admin/index.adp	6 Sep 2002 21:50:23 -0000	1.2
+++ openacs-4/packages/bookmarks/www/admin/index.adp	22 May 2003 14:22:11 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <ul>
 
Index: openacs-4/packages/bookmarks/www/admin/site-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/admin/site-info.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/admin/site-info.adp	6 Sep 2002 21:50:23 -0000	1.2
+++ openacs-4/packages/bookmarks/www/admin/site-info.adp	22 May 2003 14:22:11 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <include src="../check-include" meta_titles_p="t" return_url="">
 
Index: openacs-4/packages/bookshelf/lib/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/lib/master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookshelf/lib/master.adp	30 Sep 2002 18:10:54 -0000	1.1
+++ openacs-4/packages/bookshelf/lib/master.adp	22 May 2003 14:22:56 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@</property>
+<property name="title">@title;noquote@</property>
 <property name="header_stuff">
   <style>
   .bookshelf_navbar { font-family: tahoma,verdana,arial,helvetica; font-size: 70%; font-weight: bold; color: #ccccff; text-decoration: none; }
@@ -10,9 +10,9 @@
   .bookshelf_summary_bold { font-size: 70%; font-family: verdana,arial,helvetica; font-weight: bold; }
   </style>
 </property>
-<if @signatory@ not nil><property name="signatory">@signatory</property></if>
-<if @focus@ not nil><property name="focus">@focus@</property></if>
-<if @context_bar@ not nil><property name="context_bar">@context_bar@</property></if>
+<if @signatory;noquote@ not nil><property name="signatory">@signatory</property></if>
+<if @focus;noquote@ not nil><property name="focus">@focus;noquote@</property></if>
+<if @context_bar;noquote@ not nil><property name="context_bar">@context_bar;noquote@</property></if>
 
 <include src="nav-bar">
 
Index: openacs-4/packages/bookshelf/www/book-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/www/book-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookshelf/www/book-edit.adp	30 Sep 2002 18:10:56 -0000	1.1
+++ openacs-4/packages/bookshelf/www/book-edit.adp	22 May 2003 14:23:23 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 <property name="focus">book.isbn</property>
 
 <script language="javascript">
Index: openacs-4/packages/bookshelf/www/book-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/www/book-view.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookshelf/www/book-view.adp	30 Sep 2002 18:10:56 -0000	1.1
+++ openacs-4/packages/bookshelf/www/book-view.adp	22 May 2003 14:23:23 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <include src="book-chunk" &book="book">
 
Index: openacs-4/packages/bookshelf/www/bookshelf.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/www/bookshelf.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookshelf/www/bookshelf.adp	30 Sep 2002 18:10:56 -0000	1.1
+++ openacs-4/packages/bookshelf/www/bookshelf.adp	22 May 2003 14:23:23 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../lib/master">
   <property name="title">Bookshelf</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
 <include src="bookshelf-include">
Index: openacs-4/packages/bookshelf/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookshelf/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookshelf/www/index.adp	30 Sep 2002 18:10:56 -0000	1.1
+++ openacs-4/packages/bookshelf/www/index.adp	22 May 2003 14:23:23 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-  <property name="title">@page_title@</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
   <tr>
Index: openacs-4/packages/bug-tracker/lib/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/lib/master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bug-tracker/lib/master.adp	5 Mar 2003 17:39:52 -0000	1.4
+++ openacs-4/packages/bug-tracker/lib/master.adp	22 May 2003 14:23:42 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@</property>
+<property name="title">@title;noquote@</property>
 <property name="header_stuff">
   <style>
   a.bt_navbar { 
@@ -102,23 +102,23 @@
   }
   </style>
 </property>
-<if @signatory@ not nil><property name="signatory">@signatory@</property></if>
-<if @focus@ not nil><property name="focus">@focus@</property></if>
+<if @signatory;noquote@ not nil><property name="signatory">@signatory;noquote@</property></if>
+<if @focus;noquote@ not nil><property name="focus">@focus;noquote@</property></if>
 <property name="body_start_include">/packages/bug-tracker/lib/version-bar</property>
 <if @context_bar@ not nil>
-  <property name="context_bar">@context_bar@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 </if>
 <if @context@ not nil>
-  <property name="context">@context@</property>
+  <property name="context">@context;noquote@</property>
 </if>
 
-<include src="nav-bar" notification_link="@notification_link@">
+<include src="nav-bar" notification_link="@notification_link;noquote@">
 
 <p>
 
 <slave>
 
 <p>
 
-<include src="nav-bar" notification_link="@notification_link@">
+<include src="nav-bar" notification_link="@notification_link;noquote@">
 
Index: openacs-4/packages/bug-tracker/www/bug-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bug-tracker/www/bug-add.adp	5 Mar 2003 17:41:04 -0000	1.4
+++ openacs-4/packages/bug-tracker/www/bug-add.adp	22 May 2003 14:24:00 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 <property name="focus">bug.component_id</property>
 
 <table align="right">
Index: openacs-4/packages/bug-tracker/www/bug.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/bug.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bug-tracker/www/bug.adp	5 Mar 2003 17:41:04 -0000	1.5
+++ openacs-4/packages/bug-tracker/www/bug.adp	22 May 2003 14:24:00 -0000	1.6
@@ -1,7 +1,7 @@
 <master src="../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
-<if @notification_link@ not nil><property name="notification_link">@notification_link@</property></if>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
+<if @notification_link;noquote@ not nil><property name="notification_link">@notification_link;noquote@</property></if>
 
 <if @action_id@ nil>
   <table align="right">
Index: openacs-4/packages/bug-tracker/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bug-tracker/www/index.adp	5 Mar 2003 17:41:04 -0000	1.5
+++ openacs-4/packages/bug-tracker/www/index.adp	22 May 2003 14:24:00 -0000	1.6
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-<property name="title">@project_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@project_name;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
   <tr>
Index: openacs-4/packages/bug-tracker/www/map-patch-to-bugs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/map-patch-to-bugs.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/map-patch-to-bugs.adp	5 Mar 2003 17:41:04 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/map-patch-to-bugs.adp	22 May 2003 14:24:00 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <if @open_bugs:rowcount@ not eq 0>
 Select one or more of the following @pretty_names.bugs@ for patch "@patch_summary@" (you may select more @pretty_names.bugs@ later):
@@ -15,7 +15,7 @@
 </p>
 
 <p>
-<include src="../lib/pagination" row_count="@bug_count@" offset="@offset@" interval_size="@interval_size@" variable_set_to_export="@pagination_export_var_set@" pretty_plural="@pretty_names.bugs@">
+<include src="../lib/pagination" row_count="@bug_count;noquote@" offset="@offset;noquote@" interval_size="@interval_size;noquote@" variable_set_to_export="@pagination_export_var_set;noquote@" pretty_plural="@pretty_names.bugs;noquote@">
 </p>
 
 <blockquote>
Index: openacs-4/packages/bug-tracker/www/no-bugs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/no-bugs.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bug-tracker/www/no-bugs.adp	5 Mar 2003 17:41:04 -0000	1.3
+++ openacs-4/packages/bug-tracker/www/no-bugs.adp	22 May 2003 14:24:00 -0000	1.4
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-<property name="title">@project_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@project_name;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <p>
   <i>This project is empty.</i>
Index: openacs-4/packages/bug-tracker/www/no-components.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/no-components.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/no-components.adp	30 Nov 2002 17:27:33 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/no-components.adp	22 May 2003 14:24:00 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-<property name="title">@project_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@project_name;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 Before you can get started using the bug-tracker, you need to create at least one component.
 
Index: openacs-4/packages/bug-tracker/www/notifications.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/notifications.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/notifications.adp	5 Mar 2003 17:41:04 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/notifications.adp	22 May 2003 14:24:00 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <table cellspacing="1" cellpadding="3" class="bt_listing">
   <tr class="bt_listing_header">
Index: openacs-4/packages/bug-tracker/www/patch-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bug-tracker/www/patch-add.adp	13 Jan 2003 18:49:15 -0000	1.3
+++ openacs-4/packages/bug-tracker/www/patch-add.adp	22 May 2003 14:24:00 -0000	1.4
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 <property name="focus">patch.summary</property>
 
 <table align="right">
Index: openacs-4/packages/bug-tracker/www/patch-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch-list.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bug-tracker/www/patch-list.adp	16 Jan 2003 13:43:58 -0000	1.3
+++ openacs-4/packages/bug-tracker/www/patch-list.adp	22 May 2003 14:24:00 -0000	1.4
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <p>
 Component: [
Index: openacs-4/packages/bug-tracker/www/patch.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/patch.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/patch.adp	30 Nov 2002 17:27:33 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/patch.adp	22 May 2003 14:24:00 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <formtemplate id="patch" style="standard-lars"></formtemplate>
 
Index: openacs-4/packages/bug-tracker/www/prefs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/prefs.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/prefs.adp	5 Mar 2003 17:41:04 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/prefs.adp	22 May 2003 14:24:00 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 <property name="focus">prefs.user_version</property>
 
 <formtemplate id="prefs" style="standard-lars"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/categories.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/categories.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/categories.adp	5 Mar 2003 17:41:17 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/categories.adp	22 May 2003 14:24:26 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 
 <blockquote>
Index: openacs-4/packages/bug-tracker/www/admin/category-defaults.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/category-defaults.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/category-defaults.adp	5 Mar 2003 17:41:17 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/category-defaults.adp	22 May 2003 14:24:26 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <formtemplate id="setup" style="standard-lars"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/category-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/category-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/category-edit.adp	5 Mar 2003 17:41:17 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/category-edit.adp	22 May 2003 14:24:26 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 <property name="focus">keyword.heading</property>
 
 <formtemplate id="keyword" style="standard-lars"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/component-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/component-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/admin/component-ae.adp	5 Mar 2003 17:41:17 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/admin/component-ae.adp	22 May 2003 14:24:26 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../../lib/master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">component.name</property>
 
 <formtemplate id="component" style="standard-lars"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bug-tracker/www/admin/index.adp	5 Mar 2003 17:41:17 -0000	1.3
+++ openacs-4/packages/bug-tracker/www/admin/index.adp	22 May 2003 14:24:26 -0000	1.4
@@ -1,6 +1,6 @@
 <master src="../../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <blockquote>
 
Index: openacs-4/packages/bug-tracker/www/admin/initial-setup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/initial-setup.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/initial-setup.adp	5 Mar 2003 17:41:17 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/initial-setup.adp	22 May 2003 14:24:26 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../../lib/master">
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <p>
   Choose your project's initial configuration.
Index: openacs-4/packages/bug-tracker/www/admin/project-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/project-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/admin/project-edit.adp	5 Mar 2003 17:41:17 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/admin/project-edit.adp	22 May 2003 14:24:26 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../../lib/master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">project.name</property>
 
 <formtemplate id="project" style="standard-lars"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.adp	5 Mar 2003 17:41:17 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/admin/project-maintainer-edit.adp	22 May 2003 14:24:26 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../../lib/master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">project_maintainer.maintainer</property>
 
 <formtemplate id="project_maintainer" style="standard-lars"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/version-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/version-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/admin/version-ae.adp	5 Mar 2003 17:41:17 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/admin/version-ae.adp	22 May 2003 14:24:26 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../../lib/master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">version.version_name</property>
 
 <formtemplate id="version" style="standard-lars"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/version-release.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/version-release.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bug-tracker/www/admin/version-release.adp	5 Mar 2003 17:41:17 -0000	1.1
+++ openacs-4/packages/bug-tracker/www/admin/version-release.adp	22 May 2003 14:24:26 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../../lib/master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">version.actual_release_date</property>
 
 <formtemplate id="version" style="standard-lars"></formtemplate>
Index: openacs-4/packages/bug-tracker/www/admin/versions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bug-tracker/www/admin/versions.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bug-tracker/www/admin/versions.adp	5 Mar 2003 17:41:17 -0000	1.2
+++ openacs-4/packages/bug-tracker/www/admin/versions.adp	22 May 2003 14:24:26 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../../lib/master">
 <property name="title">@ Versions</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Current Version</h3>
 
Index: openacs-4/packages/bulk-mail/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bulk-mail/www/index.adp	6 Sep 2002 21:50:25 -0000	1.4
+++ openacs-4/packages/bulk-mail/www/index.adp	22 May 2003 14:25:02 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 @table@
Index: openacs-4/packages/bulk-mail/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/one.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bulk-mail/www/one.adp	29 Oct 2002 18:01:00 -0000	1.7
+++ openacs-4/packages/bulk-mail/www/one.adp	22 May 2003 14:25:02 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
   <table bgcolor="#ececec" border="1" width="95%" cellpadding="3" cellspacing="3">
     <tr>