Index: openacs-4/contrib/packages/bcds/www/templates/default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcds/www/templates/default.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcds/www/templates/default.adp	14 May 2003 15:32:39 -0000	1.1
+++ openacs-4/contrib/packages/bcds/www/templates/default.adp	22 May 2003 13:49:01 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@current_item.title@</property>
+<property name="title">@current_item.title;noquote@</property>
 <property name="context_bar">&nbsp;</property>
 
 <table cellspacing="0" cellpadding="0" border="0" width="100%">
@@ -35,7 +35,7 @@
 <table cellspacing="0" cellpadding="0" border="0" width="100%" height="100%">
     <tr>
     	<td valign="top" bgcolor="#666666" width="180">
-            <include src="default-sidelinks" root_id="@root_id@" root_url="@root_url@" current_parent_id="@current_item.parent_id@">
+            <include src="default-sidelinks" root_id="@root_id;noquote@" root_url="@root_url;noquote@" current_parent_id="@current_item.parent_id;noquote@">
     	</td>
         <td valign="top" width="100%">
             <table>
Index: openacs-4/contrib/packages/bcds/www/templates/praesagus-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcds/www/templates/praesagus-content.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcds/www/templates/praesagus-content.adp	14 May 2003 15:32:39 -0000	1.1
+++ openacs-4/contrib/packages/bcds/www/templates/praesagus-content.adp	22 May 2003 13:49:01 -0000	1.2
@@ -71,7 +71,7 @@
 <table cellspacing="0" cellpadding="0" border="0" width="100%" height="100%">
     <tr>
     	<td valign="top" bgcolor="#666666" width="180">
-            <include src="praesagus-sidelinks" root_id="@root_id@" root_url="@root_url@" current_parent_id="@current_item.parent_id@">
+            <include src="praesagus-sidelinks" root_id="@root_id;noquote@" root_url="@root_url;noquote@" current_parent_id="@current_item.parent_id;noquote@">
     	</td>
         <td valign="top" width="100%">
             <table>
Index: openacs-4/contrib/packages/bcds/www/templates/praesagus-home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcds/www/templates/praesagus-home.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcds/www/templates/praesagus-home.adp	14 May 2003 15:32:39 -0000	1.1
+++ openacs-4/contrib/packages/bcds/www/templates/praesagus-home.adp	22 May 2003 13:49:01 -0000	1.2
@@ -39,7 +39,7 @@
 <table cellspacing="0" cellpadding="0" border="0" width="100%" height="100%">
 	<tr>
    	<td valign="top" bgcolor="#666666" width="180">
-        <include src="praesagus-sidelinks" root_id="@root_id@" root_url="@root_url@" current_parent_id="@current_item.parent_id@">
+        <include src="praesagus-sidelinks" root_id="@root_id;noquote@" root_url="@root_url;noquote@" current_parent_id="@current_item.parent_id;noquote@">
    	</td>
     <td><img src="/images/pixel.gif" border="0" width="10" height="1"/></td>
         	<td valign="top" width="100%">
Index: openacs-4/contrib/packages/bcms/www/folder-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms/www/Attic/folder-create.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms/www/folder-create.adp	14 May 2003 15:35:39 -0000	1.1
+++ openacs-4/contrib/packages/bcms/www/folder-create.adp	22 May 2003 13:49:49 -0000	1.2
@@ -1,4 +1,4 @@
 <master>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <formtemplate id="foldercreate" style="bcms" title="Add Section"></formtemplate>
Index: openacs-4/contrib/packages/bcms/www/folder-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms/www/Attic/folder-delete.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms/www/folder-delete.adp	14 May 2003 15:35:39 -0000	1.1
+++ openacs-4/contrib/packages/bcms/www/folder-delete.adp	22 May 2003 13:49:49 -0000	1.2
@@ -1,4 +1,4 @@
 <master>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <formtemplate id="folderdelete" style="bcms" title="Delete Section"></formtemplate>
Index: openacs-4/contrib/packages/bcms/www/item-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms/www/Attic/item-list.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms/www/item-list.adp	14 May 2003 15:35:39 -0000	1.1
+++ openacs-4/contrib/packages/bcms/www/item-list.adp	22 May 2003 13:49:49 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <formtemplate id="itemlistform" style="bcms" title="List Items"></formtemplate>
 <if @show_list_p@ not nil>
Index: openacs-4/contrib/packages/bcms/www/item-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms/www/Attic/item-one.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms/www/item-one.adp	14 May 2003 15:35:39 -0000	1.1
+++ openacs-4/contrib/packages/bcms/www/item-one.adp	22 May 2003 13:49:49 -0000	1.2
@@ -1,8 +1,8 @@
 <master>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <formtemplate id="itemone" style="bcms" title="Content Item"></formtemplate>
 
 <if @item_id@ not nil>
-	<include src="revision-list" storage_type="@storage_type@">
+	<include src="revision-list" storage_type="@storage_type;noquote@">
 </if>
Index: openacs-4/contrib/packages/bcms/www/revision-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms/www/Attic/revision-one.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms/www/revision-one.adp	14 May 2003 15:35:39 -0000	1.1
+++ openacs-4/contrib/packages/bcms/www/revision-one.adp	22 May 2003 13:49:49 -0000	1.2
@@ -1,4 +1,4 @@
 <master>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <formtemplate id="revisionone" style="bcms" title="Content Revision"></formtemplate>
Index: openacs-4/contrib/packages/bcms-ui-wizard/www/file-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-wizard/www/file-one.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-wizard/www/file-one.adp	14 May 2003 15:36:37 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-wizard/www/file-one.adp	22 May 2003 13:50:37 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <table width="665" align="center" cellpadding="5">
     <tr><th colspan="3">@one_file.title@</th></tr>
Index: openacs-4/contrib/packages/bcms-ui-wizard/www/folder-list-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-wizard/www/folder-list-items.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-wizard/www/folder-list-items.adp	14 May 2003 15:36:37 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-wizard/www/folder-list-items.adp	22 May 2003 13:50:37 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <table align="center" width="665">
     <tr><th>Type</th><th>Page Title</th><th>Section Title</th><th></th></tr>
Index: openacs-4/contrib/packages/bcms-ui-wizard/www/folder-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-wizard/www/folder-one.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-wizard/www/folder-one.adp	14 May 2003 15:36:37 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-wizard/www/folder-one.adp	22 May 2003 13:50:37 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <table width="665" align="center" cellpadding="5">
     <tr><th colspan="3">@one_folder.label@</th></tr>
Index: openacs-4/contrib/packages/bcms-ui-wizard/www/image-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-wizard/www/image-one.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-wizard/www/image-one.adp	14 May 2003 15:36:37 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-wizard/www/image-one.adp	22 May 2003 13:50:37 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <table width="665" align="center" cellpadding="5">
     <tr><th colspan="3">@one_image.title@</th></tr>
Index: openacs-4/contrib/packages/bcms-ui-wizard/www/page-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-wizard/www/page-one.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-wizard/www/page-one.adp	14 May 2003 15:36:37 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-wizard/www/page-one.adp	22 May 2003 13:50:37 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <table width="665" align="center" cellpadding="5">
     <tr><th colspan="3">@one_page.title@</th></tr>
@@ -89,8 +89,8 @@
         </td>
         <td class="entry"><a class="action" href="page-edit-template-wizard?page_id=@page_id@&template_id=@one_template.item_id@&return_url=@current_url@">Change Page Template</a></td>
     </tr>
-    <include src="page-praesagus-feature" current_url="@current_url@" />
-    <include src="page-praesagus-protected" current_url="@current_url@" />
+    <include src="page-praesagus-feature" current_url="@current_url;noquote@" />
+    <include src="page-praesagus-protected" current_url="@current_url;noquote@" />
 </table>
 
 <form>
Index: openacs-4/contrib/packages/bcms-ui-wizard/www/page-related-file-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-wizard/www/page-related-file-list.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-wizard/www/page-related-file-list.adp	14 May 2003 15:36:37 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-wizard/www/page-related-file-list.adp	22 May 2003 13:50:37 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <p><a href="file-create-wizard?folder_id=@folder_id@&relate_to=@page_id@&content_type=bcms_file&return_url=@current_url@">Upload a new File</a></p>
 <p><a href="file-relate-wizard?page_id=@page_id@&return_url=@current_url@">Select an existing File</a></p>
Index: openacs-4/contrib/packages/bcms-ui-wizard/www/page-related-image-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-wizard/www/page-related-image-list.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-wizard/www/page-related-image-list.adp	14 May 2003 15:36:37 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-wizard/www/page-related-image-list.adp	22 May 2003 13:50:37 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <p><a href="image-create-wizard?folder_id=@folder_id@&relate_to=@page_id@&content_type=image&return_url=@current_url@">Upload a new Image</a></p>
 <p><a href="image-relate-wizard?page_id=@page_id@&return_url=@current_url@">Select an existing Image</a></p>
Index: openacs-4/contrib/packages/bcms-ui-wizard/www/page-related-page-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-wizard/www/page-related-page-list.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-wizard/www/page-related-page-list.adp	14 May 2003 15:36:37 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-wizard/www/page-related-page-list.adp	22 May 2003 13:50:37 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <p><a href="page-relate-wizard?relate_to=@page_id@&return_url=@current_url@">Select an existing Page</a></p>
 
Index: openacs-4/contrib/packages/bcms-ui-wizard/www/wizard-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/bcms-ui-wizard/www/wizard-master.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/bcms-ui-wizard/www/wizard-master.adp	14 May 2003 15:36:37 -0000	1.1
+++ openacs-4/contrib/packages/bcms-ui-wizard/www/wizard-master.adp	22 May 2003 13:50:37 -0000	1.2
@@ -1,14 +1,14 @@
 <master>
 
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <table cellpadding="10" align="center">
 <tr>
     <td>
         <table cellpadding="0" cellspacing="0">
             <tr><th>@wizard_title@</th></tr>
             <tr><td bgcolor="#F46A00"><img src="/images/pixel.gif" border="0" width="1" height="2"/></td></tr>
-            <tr><td><include src="@wizard:current_url@"></td></tr>
+            <tr><td><include src="@wizard:current_url;noquote@"></td></tr>
         </table>
     </td>
     <td valign="top">
Index: openacs-4/contrib/packages/events/www/activity.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/activity.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/activity.adp	9 Mar 2003 12:08:08 -0000	1.1
+++ openacs-4/contrib/packages/events/www/activity.adp	22 May 2003 13:51:55 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Upcoming Events for @activity_info.name@</property>
-<property name="context">@context@</property>
+<property name="title">Upcoming Events for @activity_info.name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 
 <if @admin_p@ ne 0>
Index: openacs-4/contrib/packages/events/www/event-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/event-info.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/contrib/packages/events/www/event-info.adp	13 Mar 2003 09:47:09 -0000	1.4
+++ openacs-4/contrib/packages/events/www/event-info.adp	22 May 2003 13:51:55 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@event_info.name@</property>
-<property name="context">@context@</property>
+<property name="title">@event_info.name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <if @admin_p@ true>
   <div style="float: right; padding: 4px;">[ <a href="admin/event?event_id=@event_id@">Administer this event</a> ]</div>
Index: openacs-4/contrib/packages/events/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/index.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/contrib/packages/events/www/index.adp	13 Mar 2003 09:47:09 -0000	1.3
+++ openacs-4/contrib/packages/events/www/index.adp	22 May 2003 13:51:55 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Events</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <if @admin_p@ true>
   <div style="float: right;">[ <a href="admin/">Administer Events</a> ]</div>
Index: openacs-4/contrib/packages/events/www/order-cancel.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-cancel.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/events/www/order-cancel.adp	9 Mar 2003 16:27:28 -0000	1.2
+++ openacs-4/contrib/packages/events/www/order-cancel.adp	22 May 2003 13:51:55 -0000	1.3
@@ -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>
 
 <formtemplate id="confirm_cancel"></formtemplate>
Index: openacs-4/contrib/packages/events/www/order-check.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-check.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/events/www/order-check.adp	9 Mar 2003 16:27:28 -0000	1.2
+++ openacs-4/contrib/packages/events/www/order-check.adp	22 May 2003 13:51:55 -0000	1.3
@@ -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>
 
 <if @reg_info.reg_state@ eq "approved">
   <p>
Index: openacs-4/contrib/packages/events/www/order-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-one.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/events/www/order-one.adp	9 Mar 2003 16:27:28 -0000	1.2
+++ openacs-4/contrib/packages/events/www/order-one.adp	22 May 2003 13:51:55 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Register for @event_info.name@</property>
-<property name="context">@context@</property>
+<property name="title">Register for @event_info.name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <p>
   Register for @event_info.name@ on @event_info.timespan@ in @event_info.city@.
Index: openacs-4/contrib/packages/events/www/organizer.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/organizer.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/organizer.adp	9 Mar 2003 12:08:08 -0000	1.1
+++ openacs-4/contrib/packages/events/www/organizer.adp	22 May 2003 13:51:55 -0000	1.2
@@ -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>
 
 About @organizer_name@:
 
Index: openacs-4/contrib/packages/events/www/admin/activities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/activities.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/activities.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/activities.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Activities</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <ul>
 <li><a href="activity-add">Add a New Activity</a></li>
Index: openacs-4/contrib/packages/events/www/admin/activity-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/activity-add.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/events/www/admin/activity-add.adp	9 Mar 2003 16:27:55 -0000	1.2
+++ openacs-4/contrib/packages/events/www/admin/activity-add.adp	22 May 2003 13:52:52 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Add a New Activity</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Activity Description</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/activity-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/activity-edit.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/events/www/admin/activity-edit.adp	9 Mar 2003 16:27:55 -0000	1.2
+++ openacs-4/contrib/packages/events/www/admin/activity-edit.adp	22 May 2003 13:52:52 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Activity Description</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/activity-orders.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/activity-orders.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/activity-orders.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/activity-orders.adp	22 May 2003 13:52:52 -0000	1.2
@@ -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 cellpadding=3>
 <tr>
Index: openacs-4/contrib/packages/events/www/admin/activity.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/activity.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/activity.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/activity.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@activity_info.name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@activity_info.name;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Events for this Activity</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/event-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/event-add-2.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/events/www/admin/event-add-2.adp	9 Mar 2003 16:27:55 -0000	1.2
+++ openacs-4/contrib/packages/events/www/admin/event-add-2.adp	22 May 2003 13:52:52 -0000	1.3
@@ -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>
 
 <h3>Event Details</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/event-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/event-add.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/events/www/admin/event-add.adp	9 Mar 2003 16:27:55 -0000	1.2
+++ openacs-4/contrib/packages/events/www/admin/event-add.adp	22 May 2003 13:52:52 -0000	1.3
@@ -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>
 
 <if @no_venues@ eq 1>
   <ul><li>There are no venues in the system. You may <a href="venues-ae?return_url=@return_url@">add a new venue</a></li></ul>
Index: openacs-4/contrib/packages/events/www/admin/event-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/event-edit.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/events/www/admin/event-edit.adp	9 Mar 2003 16:27:55 -0000	1.2
+++ openacs-4/contrib/packages/events/www/admin/event-edit.adp	22 May 2003 13:52:52 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <formtemplate id="event_edit"></formtemplate>
Index: openacs-4/contrib/packages/events/www/admin/event-orders.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/event-orders.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/event-orders.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/event-orders.adp	22 May 2003 13:52:52 -0000	1.2
@@ -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 cellpadding=3>
 <tr>
Index: openacs-4/contrib/packages/events/www/admin/event.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/event.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/event.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/event.adp	22 May 2003 13:52:52 -0000	1.2
@@ -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>
 
 <div align=right>
 [ <a href="/permissions/one?object_id=@event_id@">Manage Permissions</a> ]
Index: openacs-4/contrib/packages/events/www/admin/field-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/field-add.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/field-add.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/field-add.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Choose a field (or fields)</h3>
 <if @attributes_p@>
Index: openacs-4/contrib/packages/events/www/admin/field-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/field-create.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/field-create.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/field-create.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>
 Add a new field
Index: openacs-4/contrib/packages/events/www/admin/field-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/field-delete.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/field-delete.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/field-delete.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>@prompt@</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/field-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/field-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/field-edit.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/field-edit.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>
 Edit a custom field
Index: openacs-4/contrib/packages/events/www/admin/field-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/field-remove.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/field-remove.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/field-remove.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <p>
 @prompt@
Index: openacs-4/contrib/packages/events/www/admin/field.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/field.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/field.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/field.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@attribute_info.name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@attribute_info.name;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Events using this field</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/fields.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/fields.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/fields.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/fields.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Custom Fields</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <ul>
 <li><a href="field-create">Add a New Custom Field</a></li>
Index: openacs-4/contrib/packages/events/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/events/www/admin/index.adp	9 Mar 2003 16:27:55 -0000	1.2
+++ openacs-4/contrib/packages/events/www/admin/index.adp	22 May 2003 13:52:52 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Events Administration</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <ul>
  <li><a href="activities">View/Add/Edit/Manage Activities</a>
Index: openacs-4/contrib/packages/events/www/admin/one-role.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/one-role.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/one-role.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/one-role.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@role_info.role@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@role_info.role;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Event associations</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/order-history-person.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/order-history-person.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/order-history-person.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/order-history-person.adp	22 May 2003 13:52:52 -0000	1.2
@@ -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>
   <tr>
Index: openacs-4/contrib/packages/events/www/admin/order-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/order-history.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/order-history.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/order-history.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Order History</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <h3>View Orders/Statistics by:</h3>
 <ul>
Index: openacs-4/contrib/packages/events/www/admin/organizer-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/organizer-add.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/organizer-add.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/organizer-add.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h2>@title@</h2>
 @context_bar@
Index: openacs-4/contrib/packages/events/www/admin/organizer-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/organizer-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/organizer-edit.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/organizer-edit.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Select Organizer for Role</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/reg-cancel.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/reg-cancel.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/reg-cancel.adp	9 Mar 2003 12:08:22 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/reg-cancel.adp	22 May 2003 13:52:52 -0000	1.2
@@ -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>
 
 <formtemplate id="confirm_cancel"></formtemplate>
Index: openacs-4/contrib/packages/events/www/admin/reg-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/reg-view.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/reg-view.adp	9 Mar 2003 12:08:23 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/reg-view.adp	22 May 2003 13:52:52 -0000	1.2
@@ -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>
 
 
 
Index: openacs-4/contrib/packages/events/www/admin/role-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/role-add.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/role-add.adp	9 Mar 2003 12:08:23 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/role-add.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Choose a role (or roles)</h3>
 <if @roles_p@>
Index: openacs-4/contrib/packages/events/www/admin/role-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/role-create.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/role-create.adp	9 Mar 2003 12:08:23 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/role-create.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Role Description</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/role-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/role-delete.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/role-delete.adp	9 Mar 2003 12:08:23 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/role-delete.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>@question@</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/role-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/role-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/role-edit.adp	9 Mar 2003 12:08:23 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/role-edit.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Role Description</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/role-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/role-remove.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/role-remove.adp	9 Mar 2003 12:08:23 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/role-remove.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>@question@</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/roles.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/roles.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/roles.adp	9 Mar 2003 12:08:23 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/roles.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Roles</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <ul>
   <li><a href="role-create">Create a New Role</a></li>
Index: openacs-4/contrib/packages/events/www/admin/send-mail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/send-mail.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/send-mail.adp	9 Mar 2003 12:08:23 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/send-mail.adp	22 May 2003 13:52:52 -0000	1.2
@@ -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>
 
 <formtemplate id="send-bulk-mail"></formtemplate>
Index: openacs-4/contrib/packages/events/www/admin/venues-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/venues-ae.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/venues-ae.adp	9 Mar 2003 12:08:23 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/venues-ae.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context_bar">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context_bar">@context;noquote@</property>
 
 <h3>Venue Description</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/venues-connecting.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/venues-connecting.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/venues-connecting.adp	9 Mar 2003 12:08:23 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/venues-connecting.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Connecting/Disconnecting Venues</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Connecting/Disconnecting Venues</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/venues-hierarchy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/venues-hierarchy.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/venues-hierarchy.adp	9 Mar 2003 12:08:23 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/venues-hierarchy.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Venue Hierarchy</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <h3>Venue Hierarchy</h3>
 
Index: openacs-4/contrib/packages/events/www/admin/venues.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/admin/Attic/venues.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/admin/venues.adp	9 Mar 2003 12:08:23 -0000	1.1
+++ openacs-4/contrib/packages/events/www/admin/venues.adp	22 May 2003 13:52:52 -0000	1.2
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Venues</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context_bar">@context_bar;noquote@</property>
 
 <ul>
 <li><a href="venues-ae">Add a New Venue</a>
Index: openacs-4/contrib/packages/general-comments/www/comment-ae-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/www/Attic/comment-ae-2.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/general-comments/www/comment-ae-2.adp	2 May 2003 15:50:44 -0000	1.1
+++ openacs-4/contrib/packages/general-comments/www/comment-ae-2.adp	22 May 2003 13:53:29 -0000	1.2
@@ -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>
 
 #general-comments.lt_Here_is_how_your_comm#
 
Index: openacs-4/contrib/packages/general-comments/www/comment-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/www/Attic/comment-ae.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/general-comments/www/comment-ae.adp	2 May 2003 15:50:44 -0000	1.1
+++ openacs-4/contrib/packages/general-comments/www/comment-ae.adp	22 May 2003 13:53:29 -0000	1.2
@@ -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="focus">comment.title</property>
 
 @page_title@
Index: openacs-4/contrib/packages/general-comments/www/delete-attachment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/www/Attic/delete-attachment.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/general-comments/www/delete-attachment.adp	2 May 2003 15:50:44 -0000	1.1
+++ openacs-4/contrib/packages/general-comments/www/delete-attachment.adp	22 May 2003 13:53:29 -0000	1.2
@@ -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>
 
 #general-comments.lt_Do_you_really_wish_to_1#
 <p>
Index: openacs-4/contrib/packages/general-comments/www/file-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/www/Attic/file-ae.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/general-comments/www/file-ae.adp	2 May 2003 15:50:44 -0000	1.1
+++ openacs-4/contrib/packages/general-comments/www/file-ae.adp	22 May 2003 13:53:29 -0000	1.2
@@ -1,7 +1,7 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
-<property name="parent_id">@parent_id@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="parent_id">@parent_id;noquote@</property>
 
 <form enctype=multipart/form-data method=POST action="@target@">
 <%= [export_form_vars attach_id parent_id return_url] %>
Index: openacs-4/contrib/packages/general-comments/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/www/Attic/index.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/general-comments/www/index.adp	2 May 2003 15:50:44 -0000	1.1
+++ openacs-4/contrib/packages/general-comments/www/index.adp	22 May 2003 13:53:29 -0000	1.2
@@ -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 @admin_p@ eq 1>
   [ <a href="admin/">#general-comments.Administer#</a> ]
Index: openacs-4/contrib/packages/general-comments/www/test.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/www/Attic/test.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/general-comments/www/test.adp	2 May 2003 15:50:44 -0000	1.1
+++ openacs-4/contrib/packages/general-comments/www/test.adp	22 May 2003 13:53:29 -0000	1.2
@@ -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>
 
 
 <p>
Index: openacs-4/contrib/packages/general-comments/www/url-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/www/Attic/url-ae.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/general-comments/www/url-ae.adp	2 May 2003 15:50:44 -0000	1.1
+++ openacs-4/contrib/packages/general-comments/www/url-ae.adp	22 May 2003 13:53:29 -0000	1.2
@@ -1,7 +1,7 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
-<property name="parent_id">@parent_id@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="parent_id">@parent_id;noquote@</property>
 
 <form method=POST action= "@target@">
 <%= [export_form_vars attach_id parent_id return_url] %>
Index: openacs-4/contrib/packages/general-comments/www/view-comment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/www/Attic/view-comment.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/general-comments/www/view-comment.adp	2 May 2003 15:50:44 -0000	1.1
+++ openacs-4/contrib/packages/general-comments/www/view-comment.adp	22 May 2003 13:53:29 -0000	1.2
@@ -1,8 +1,8 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
-<property name="return_url">@return_url@</property>
-<property name="object_name">@object_name@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="return_url">@return_url;noquote@</property>
+<property name="object_name">@object_name;noquote@</property>
 
 <if @return_url@ ne "">
 [<a href="@return_url@">#general-comments.lt_Go_back_to_where_you_#</a>]<br>
Index: openacs-4/contrib/packages/general-comments/www/view-image.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/www/Attic/view-image.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/general-comments/www/view-image.adp	2 May 2003 15:50:44 -0000	1.1
+++ openacs-4/contrib/packages/general-comments/www/view-image.adp	22 May 2003 13:53:29 -0000	1.2
@@ -1,7 +1,7 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
-<property name="return_url">@return_url@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="return_url">@return_url;noquote@</property>
 
 <center>
 <i>@title@</i>
Index: openacs-4/contrib/packages/general-comments/www/admin/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/www/admin/Attic/delete.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/general-comments/www/admin/delete.adp	2 May 2003 15:50:59 -0000	1.1
+++ openacs-4/contrib/packages/general-comments/www/admin/delete.adp	22 May 2003 13:53:55 -0000	1.2
@@ -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>
 
 
 #general-comments.lt_Do_you_really_wish_to#
Index: openacs-4/contrib/packages/general-comments/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/general-comments/www/admin/Attic/index.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/general-comments/www/admin/index.adp	2 May 2003 15:50:59 -0000	1.1
+++ openacs-4/contrib/packages/general-comments/www/admin/index.adp	22 May 2003 13:53:55 -0000	1.2
@@ -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>
 
 <p>
 @dimensional_bar@
Index: openacs-4/contrib/packages/irc-logger/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/irc-logger/www/index.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/irc-logger/www/index.adp	30 Jan 2003 02:48:48 -0000	1.1
+++ openacs-4/contrib/packages/irc-logger/www/index.adp	22 May 2003 13:54:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@title@</property>
+  <property name="title">@title;noquote@</property>
 
   <table width="100%">
     <tbody>
Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v
diff -u -N -r1.14 -r1.15
--- openacs-4/packages/acs-templating/tcl/parse-procs.tcl	17 May 2003 10:05:27 -0000	1.14
+++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl	22 May 2003 13:44:54 -0000	1.15
@@ -292,9 +292,9 @@
 	tcl {
 	  set code [template::util::read_file $file_stub.tcl]
 	}
-	default { # works for adp and wdp
+	default {
 	  set code [adp_compile -file $file_stub.$type]
-	}
+        }
       }
 
       # wrap the code for both types of files within an uplevel in
@@ -406,12 +406,27 @@
   # expand_percentage_signs which amongst other things does an uplevel subst
   while {[regsub -all {([^\\])\#([-a-zA-Z0-9_:\.]+)\#} $code {\1[template::expand_percentage_signs [lang::message::lookup [ad_conn locale] {\2} {TRANSLATION MISSING} {} -1]]} code]} {}
 
-  # substitute array variable references
-  # loop to handle the case of adjacent variable references, like @a@@b@
-  while {[regsub -all [template::adp_array_variable_regexp] $code {\1${\2(\3)}} code]} {}
+  # We do each substitution set in two pieces, separately for normal
+  # variables and for variables with ";noquote" attached to them.
+  # Specifically, @x@ gets translated to [ad_quotehtml ${x}], whereas
+  # @x;noquote@ gets translated to ${x}.  The same goes for array
+  # variable references.
 
+   # substitute array variable references
+  if { [lsearch -exact {new-portals foobar forums} [ad_conn package_key]] == -1 } {
+    while {[regsub -all [template::adp_array_variable_regexp] $code {\1[ad_quotehtml $\2(\3)]} code]} {}
+  } else {
+    while {[regsub -all [template::adp_array_variable_regexp] $code {\1${\2(\3)}} code]} {}
+  }
+  while {[regsub -all [template::adp_array_variable_regexp_noquote] $code {\1$\2(\3)} code]} {}
+
   # substitute simple variable references
-  while {[regsub -all [template::adp_variable_regexp] $code {\1${\2}} code]} {}
+  if { [lsearch -exact {new-portals forums} [ad_conn package_key]] == -1 } {
+    while {[regsub -all [template::adp_variable_regexp] $code {\1[ad_quotehtml ${\2}]} code]} {}
+  } else {
+    while {[regsub -all [template::adp_variable_regexp] $code {\1${\2}} code]} {}
+  }
+  while {[regsub -all [template::adp_variable_regexp_noquote] $code {\1${\2}} code]} {}
 
   # unescape protected @ references
   set code [string map { \\@ @ } $code]
@@ -433,6 +448,15 @@
   return {(^|[^\\])@([a-zA-Z0-9_:]+)\.([a-zA-Z0-9_:]+)@}
 }
 
+ad_proc -public template::adp_array_variable_regexp_noquote {} {
+  adp_array_variable_regexp's pattern augmented by "noquote"
+
+  @author Dirk Gomez (openacs@dirkgomez.de)
+  @creation-date 12 February 2003
+} {
+  return {(^|[^\\])@([a-zA-Z0-9_:]+)\.([a-zA-Z0-9_:]+);noquote@}
+}
+
 ad_proc -public template::adp_variable_regexp {} {
   The regexp pattern used to find adp variables in
   a piece of text, i.e. occurenceis of @variable_name@. 
@@ -445,6 +469,15 @@
   return {(^|[^\\])@([a-zA-Z0-9_:]+)@}
 }
 
+ad_proc -public template::adp_variable_regexp_noquote {} {
+  adp_variable_regexp augmented by "noquote"
+
+  @author Dirk Gomez (openacs@dirkgomez.de)
+  @creation-date 12 February 2003
+} {
+  return {(^|[^\\])@([a-zA-Z0-9_:]+);noquote@}
+}
+
 ad_proc -private template::adp_compile_chunk { chunk } {
     Parses a single chunk of a template.  A chunk is either the entire
     template or the portion of a template contained within a balanced