Index: openacs-4/packages/acs-templating/resources/forms/blue.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/blue.adp,v
diff -u -N -r1.1 -r1.1.4.1
--- openacs-4/packages/acs-templating/resources/forms/blue.adp	22 Sep 2003 18:03:48 -0000	1.1
+++ openacs-4/packages/acs-templating/resources/forms/blue.adp	12 Jan 2005 23:55:17 -0000	1.1.4.1
@@ -42,7 +42,7 @@
           </if>
 	  </td>
         </if>
-	<if @elements.widget@ in radio checkbox>
+        <if @elements.widget@ eq radio or @elements.widget@ eq checkbox>
             <if @elements.label@ nil><td colspan=2>></if>
 	    <else><td></else>
 	    <noparse>
Index: openacs-4/packages/acs-templating/resources/forms/coddo.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/coddo.adp,v
diff -u -N -r1.6 -r1.6.4.1
--- openacs-4/packages/acs-templating/resources/forms/coddo.adp	22 Sep 2003 17:42:56 -0000	1.6
+++ openacs-4/packages/acs-templating/resources/forms/coddo.adp	12 Jan 2005 23:55:17 -0000	1.6.4.1
@@ -42,7 +42,7 @@
                       </if>
   	            </td>
                   </if>
-  	          <if @elements.widget@ in radio checkbox>
+                  <if @elements.widget@ eq radio or @elements.widget@ eq checkbox>
                      <if @elements.label@ nil><td colspan="3" align="center" class="textstyle1"></if>
   	             <else>
                        <td width="2%" align="center" valign="middle" class="textstyle1">: </td> 
Index: openacs-4/packages/acs-templating/resources/forms/configuration.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/configuration.adp,v
diff -u -N -r1.4 -r1.4.4.1
--- openacs-4/packages/acs-templating/resources/forms/configuration.adp	23 Sep 2003 19:37:02 -0000	1.4
+++ openacs-4/packages/acs-templating/resources/forms/configuration.adp	12 Jan 2005 23:55:17 -0000	1.4.4.1
@@ -53,7 +53,7 @@
                 <if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform" and @elements.widget@ ne "select"><font color="red">*</font></if>
               </if>
 
-              <if @elements.widget@ in radio checkbox>
+              <if @elements.widget@ eq radio or @elements.widget@ eq checkbox>
                 <noparse>
                   <table cellpadding="4" cellspacing="0" border="0">
                     <formgroup id="@elements.id@">
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 -N -r1.6 -r1.6.2.1
--- 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	12 Jan 2005 23:55:17 -0000	1.6.2.1
@@ -32,7 +32,7 @@
    <if @elements.widget@ not in "hidden" "submit"> 
       <td nowrap>     
 
-        <if @elements.widget@ in radio checkbox>
+        <if @elements.widget@ eq radio or @elements.widget@ eq checkbox>
           <table cellpadding=4 cellspacing=0 border=0>
             <tr>
               <noparse>
Index: openacs-4/packages/acs-templating/resources/forms/plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/plain.adp,v
diff -u -N -r1.8 -r1.8.2.1
--- openacs-4/packages/acs-templating/resources/forms/plain.adp	20 Nov 2003 13:11:54 -0000	1.8
+++ openacs-4/packages/acs-templating/resources/forms/plain.adp	12 Jan 2005 23:55:17 -0000	1.8.2.1
@@ -34,7 +34,7 @@
           </if>
 	  </td>
         </if>
-	<if @elements.widget@ in radio checkbox>
+        <if @elements.widget@ eq radio or @elements.widget@ eq checkbox>
             <if @elements.label@ nil><td colspan="2"></if>
 	    <else><td></else>
 	    <noparse>
Index: openacs-4/packages/acs-templating/resources/forms/plainest.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/plainest.adp,v
diff -u -N -r1.6 -r1.6.4.1
--- openacs-4/packages/acs-templating/resources/forms/plainest.adp	22 Sep 2003 17:42:56 -0000	1.6
+++ openacs-4/packages/acs-templating/resources/forms/plainest.adp	12 Jan 2005 23:55:17 -0000	1.6.4.1
@@ -40,7 +40,7 @@
           </if>
 	  </td>
         </if>
-	<if @elements.widget@ in radio checkbox>
+        <if @elements.widget@ eq radio or @elements.widget@ eq checkbox>
             <if @elements.label@ nil><td colspan=2>></if>
 	    <else><td></else>
 	    <noparse>
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 -N -r1.14 -r1.14.2.1
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	14 Jan 2004 15:06:59 -0000	1.14
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	12 Jan 2005 23:55:17 -0000	1.14.2.1
@@ -54,7 +54,7 @@
                 </else>
               </noparse>
 
-              <if @elements.widget@ in radio checkbox>
+              <if @elements.widget@ eq radio or @elements.widget@ eq checkbox>
                 <noparse>
                   <table class="formgroup">
                     <formgroup id="@elements.id@">
Index: openacs-4/packages/acs-templating/resources/forms/tiny-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/tiny-plain.adp,v
diff -u -N -r1.4 -r1.4.4.1
--- openacs-4/packages/acs-templating/resources/forms/tiny-plain.adp	22 Sep 2003 17:42:56 -0000	1.4
+++ openacs-4/packages/acs-templating/resources/forms/tiny-plain.adp	12 Jan 2005 23:55:17 -0000	1.4.4.1
@@ -60,7 +60,7 @@
                 </else>
               </noparse>
 
-              <if @elements.widget@ in radio checkbox>
+              <if @elements.widget@ eq radio or @elements.widget@ eq checkbox>
                 <noparse>
                   <table cellpadding="4" cellspacing="0" border="0">
                     <formgroup id="@elements.id@">
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 -N -r1.9 -r1.9.2.1
--- 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	12 Jan 2005 23:55:17 -0000	1.9.2.1
@@ -38,7 +38,7 @@
           </if></td>
         </else>
 
-	  <if @elements.widget@ in radio checkbox>
+          <if @elements.widget@ eq radio or @elements.widget@ eq checkbox>
             <if @elements.wide@ not nil>
               <if @elements.help_text@ not nil>
                 &nbsp;&nbsp;