Index: openacs-4/packages/curriculum/lib/admin-curriculums.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/admin-curriculums.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/curriculum/lib/admin-curriculums.adp	2 Jul 2003 12:38:32 -0000	1.8
+++ openacs-4/packages/curriculum/lib/admin-curriculums.adp	2 Jul 2003 16:22:27 -0000	1.9
@@ -30,7 +30,7 @@
 <table bgcolor="#cccccc" border="0" cellpadding="1" cellspacing="0" width="100%">
   <tr>
     <td width="20%">
-      <a href="curriculum-ave?@curriculums.curriculum_id_export@">@curriculums.curriculum_name@</a>
+      <a href="curriculum-ave?@curriculums.curriculum_id_export@">@curriculums.curriculum_name;noquote@</a>
     </td>
     <td width="50%">
       @curriculums.curriculum_desc;noquote@
@@ -70,7 +70,7 @@
   <if @curriculums.groupnum@ even><tr bgcolor="#eeeedd"></if><else><tr bgcolor="#eeeeee"></else>
     <td width="20%">
       <li>
-        <a href="element-ave?@curriculums.curriculum_id_export@&@curriculums.element_id_export@">@curriculums.element_name@</a>
+        <a href="element-ave?@curriculums.curriculum_id_export@&@curriculums.element_id_export@">@curriculums.element_name;noquote@</a>
       </li>
     </td>
     <td width="50%">
Index: openacs-4/packages/curriculum/lib/bar-horizontal.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/bar-horizontal.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/curriculum/lib/bar-horizontal.adp	2 Jul 2003 12:38:32 -0000	1.3
+++ openacs-4/packages/curriculum/lib/bar-horizontal.adp	2 Jul 2003 16:22:27 -0000	1.4
@@ -28,10 +28,10 @@
         <img src="/shared/images/checkbox.gif" border="0" width="13" height="13" alt="O" title="Unvisited">
       </else>
       <if @elements.external_p@>
-        <a href="@package_url@ext?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@&@return_url_export@&position=@position@" target="_top" title="Visit">@elements.name@</a>
+        <a href="@package_url@ext?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@&@return_url_export@&position=@position@" target="_top" title="Visit">@elements.name;noquote@</a>
       </if>
       <else>
-        <a href="@elements.url@" target="_top" title="Visit">@elements.name@</a>
+        <a href="@elements.url@" target="_top" title="Visit">@elements.name;noquote@</a>
       </else>
       <a href="@package_url@element-ave?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@" target="_top">
         <img src="@package_url@graphics/info.gif" border="0" width="12" height="12" alt="i" title="Information">
Index: openacs-4/packages/curriculum/lib/bar-vertical.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/bar-vertical.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/curriculum/lib/bar-vertical.adp	2 Jul 2003 12:38:32 -0000	1.3
+++ openacs-4/packages/curriculum/lib/bar-vertical.adp	2 Jul 2003 16:22:27 -0000	1.4
@@ -28,10 +28,10 @@
         <img src="/shared/images/checkbox.gif" border="0" width="13" height="13" alt="O" title="Unvisited">
       </else>
       <if @elements.external_p@>
-        <a href="@package_url@ext?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@&@return_url_export@&position=@position@" target="_top" title="Visit">@elements.name@</a>
+        <a href="@package_url@ext?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@&@return_url_export@&position=@position@" target="_top" title="Visit">@elements.name;noquote@</a>
       </if>
       <else>
-        <a href="@elements.url@" target="_top" title="Visit">@elements.name@</a>
+        <a href="@elements.url@" target="_top" title="Visit">@elements.name;noquote@</a>
       </else>
       <a href="@package_url@element-ave?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@" target="_top">
         <img src="@package_url@graphics/info.gif" border="0" width="12" height="12" alt="i" title="Information">
Index: openacs-4/packages/curriculum/lib/curriculum-ave.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/curriculum-ave.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum/lib/curriculum-ave.adp	3 Jun 2003 10:21:50 -0000	1.1
+++ openacs-4/packages/curriculum/lib/curriculum-ave.adp	2 Jul 2003 16:22:27 -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>
 
 <if @start_over_url@ not nil>
 <p>
Index: openacs-4/packages/curriculum/lib/element-ave.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/element-ave.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/curriculum/lib/element-ave.adp	3 Jun 2003 10:21:50 -0000	1.1
+++ openacs-4/packages/curriculum/lib/element-ave.adp	2 Jul 2003 16:22:27 -0000	1.2
@@ -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="element"></formtemplate>
Index: openacs-4/packages/curriculum/lib/user-curriculums.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/user-curriculums.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/curriculum/lib/user-curriculums.adp	15 Jun 2003 15:33:02 -0000	1.8
+++ openacs-4/packages/curriculum/lib/user-curriculums.adp	2 Jul 2003 16:22:27 -0000	1.9
@@ -21,7 +21,7 @@
 <table bgcolor="#cccccc" border="0" cellpadding="2" cellspacing="0" width="100%">
   <tr>
     <td width="25%">
-      <a href="@url@curriculum-ave?curriculum_id=@elements.curriculum_id@" title="Detailed information">@elements.curriculum_name@</a>
+      <a href="@url@curriculum-ave?curriculum_id=@elements.curriculum_id@" title="Detailed information">@elements.curriculum_name;noquote@</a>
     </td>
     <td width="50%">@elements.curriculum_desc;noquote@
       <if @elements.curr_desc_trunc_p@>
@@ -70,7 +70,7 @@
   <if @elements.groupnum@ even><tr bgcolor="#eeeedd"></if><else><tr bgcolor="#eeeeee"></else>
     <td>
       <li>
-        <a href="@url@element-ave?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@" title="Detailed information">@elements.element_name@</a>
+        <a href="@url@element-ave?curriculum_id=@elements.curriculum_id@&element_id=@elements.element_id@" title="Detailed information">@elements.element_name;noquote@</a>
       </li>
     </td>
     <td width="50%">@elements.element_desc;noquote@
Index: openacs-4/www/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/default-master.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/www/default-master.adp	4 Jun 2003 01:39:04 -0000	1.11
+++ openacs-4/www/default-master.adp	2 Jul 2003 16:23:31 -0000	1.12
@@ -1,7 +1,7 @@
 @doc_type;noquote@
 <html>
 <head>
-<title>@title@</title>
+<title>@title;noquote@</title>
 @header_stuff;noquote@
 </head>
 <body<multiple name=attribute> @attribute.key@="@attribute.value@"</multiple>>
@@ -11,7 +11,7 @@
 <include src="@body_start_include@" />
 </if>
 
-<h1>@title@</h1>
+<h1>@title;noquote@</h1>
 @context_bar;noquote@
 <hr />
 <slave>