Index: openacs-4/packages/acs-templating/resources/forms/grid.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/grid.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-templating/resources/forms/grid.adp	11 Dec 2003 21:39:57 -0000	1.6
+++ openacs-4/packages/acs-templating/resources/forms/grid.adp	24 Oct 2004 05:12:38 -0000	1.7
@@ -37,7 +37,7 @@
             <tr>
               <noparse>
                 <formgroup id=@elements.id@>
-                  <td>\@formgroup.widget\@</td><td><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option\@">\@formgroup.label\@</label></td>
+                  <td>\@formgroup.widget;noquote\@</td><td><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option\@">\@formgroup.label\@</label></td>
                 </formgroup>
               </noparse>
             </tr>
Index: openacs-4/packages/acs-templating/resources/forms/wizard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/wizard.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-templating/resources/forms/wizard.adp	25 Feb 2004 17:53:23 -0000	1.9
+++ openacs-4/packages/acs-templating/resources/forms/wizard.adp	24 Oct 2004 05:12:38 -0000	1.10
@@ -11,7 +11,7 @@
   <multiple name=elements>
   
     <if @elements.section@ not nil>
-      <tr><td colspan=2 bgcolor=#eeeeee><b>@elements.section@</b></td></tr>
+      <tr><td colspan=2 bgcolor=#eeeeee><b>@elements.section;noquote@</b></td></tr>
     </if>
 
     <group column="section">
@@ -27,22 +27,22 @@
       <else>
         <!-- If the widget is wide, display it in its own section -->
         <if @elements.wide@ not nil>
-          <tr><td colspan=2 bgcolor=#eeeeee><b>@elements.label@</b></td></tr>
+          <tr><td colspan=2 bgcolor=#eeeeee><b>@elements.label;noquote@</b></td></tr>
           <tr><td colspan=2>
         </if>
         <else>
           <tr><td><b>@elements.label@</b>&nbsp;&nbsp;
           <if @elements.help_text@ not nil>
             <br>&nbsp;&nbsp;
-            <font size=-1><noparse><formhelp id=@elements.id@></noparse></font><br>
+            <font size=-1><noparse><formhelp id=@elements.id;noquote@></noparse></font><br>
           </if></td>
         </else>
 
 	  <if @elements.widget@ in radio checkbox>
             <if @elements.wide@ not nil>
               <if @elements.help_text@ not nil>
                 &nbsp;&nbsp;
-                <font size=-1><noparse><formhelp id=@elements.id@></noparse></font><br>
+                <font size=-1><noparse><formhelp id=@elements.id;noquote@></noparse></font><br>
               </if>
             </if><else><td></else>
               <noparse>
@@ -61,7 +61,7 @@
 		</formgroup>
 
 		</table>
-		<formerror id=@elements.id@><br>
+		<formerror id=@elements.id;noquote@><br>
 		  <font color="red"><b>\@formerror.@elements.id@;noquote\@</b></font>
 		</formerror>
               </noparse>
@@ -71,12 +71,12 @@
 	    <if @elements.widget@ eq inform>
 	      <if @elements.wide@ not nil>
                 <noparse>
-                  <formerror  id=@elements.id@><br>
+                  <formerror  id=@elements.id;noquote@><br>
                     <font color="red"><b>\@formerror.@elements.id@;noquote\@</b></font><br>
                   </formerror>
                 </noparse>
               </if><else><td bgcolor=#EEEEEE></else>
-		<noparse><formwidget id=@elements.id@></noparse>
+		<noparse><formwidget id=@elements.id;noquote@></noparse>
 	      </td>
 	    </if>
 	    <else>
@@ -102,7 +102,7 @@
   <td align="right" colspan="2">
     <multiple name="elements">
       <if @elements.widget@ in "submit" "button">
-        <noparse><formwidget id=@elements.id@></noparse>
+        <noparse><formwidget id=@elements.id;noquote@></noparse>
       </if>
     </multiple>
   </td>