Index: openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/Attic/plain.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/plain.adp	1 Mar 2004 11:10:31 -0000	1.1
+++ openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/plain.adp	11 Mar 2004 14:34:25 -0000	1.2
@@ -16,29 +16,31 @@
       <else>
         @section_template;noquote@
       </else>
-    </if>
+     </if>
 
     <group column="section">
-
-    <if @elements.widget@ eq "hidden"> 
+     <if @section_template@ nil>
+      <if @elements.widget@ eq "hidden"> 
         <noparse><formwidget id=@elements.id@></noparse>
-    </if>
+      </if>
 
-   <if @section_template@ nil>
-    <if @elements.widget@ eq "block"> 
+       <if @elements.widget@ eq "block"> 
         <tr><td colspan=2><noparse><formwidget id=@elements.id@></noparse></td></tr>
-    </if>
+       </if>
 
-    <if @elements.widget@ not in "block" "hidden">
+       <if @elements.widget@ not in "block" "hidden">
+
       <if @elements.widget@ eq "submit">
         <tr><td align="center" colspan="2">
-          <noparse><formwidget id=@elements.id@></noparse>
+          <group column="widget">
+            <noparse><formwidget id=@elements.id@></noparse>
+          </group>
         </td></tr>
       </if>
       <else>
        <tr>
-        <if @elements.label;noquote@ not nil>
-	<td><span style="font-weight: bold"><if @elements.required_p@ eq "t"><span style="color: #f00;">*</span></if>@elements.label@</span>&nbsp;&nbsp;
+        <if @elements.label@ not nil>
+	<td><span style="font-weight: bold">@elements.label;noquote@</span>&nbsp;&nbsp;
           <if @elements.help_text@ not nil>
             <br />&nbsp;&nbsp;
             <span style="font-size: 90%"><noparse><formhelp id=@elements.id@></noparse></span><br />
@@ -52,7 +54,7 @@
             <table cellpadding="4" cellspacing="0" border="0">
 	      <formgroup id=@elements.id@>
 		<tr><td>\@formgroup.widget;noquote@</td>
-                    <td><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">\@formgroup.label@</label></td></tr>
+                    <td><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">\@formgroup.label;noquote@</label></td></tr>
 	      </formgroup>
 	      </table>
 	      <formerror id=@elements.id@><br>
@@ -63,8 +65,8 @@
 	</if>
 	<else> 
 	    <if @elements.widget@ eq inform>
-              <if @elements.label@ nil><td style="background: #EEEEEE" colspan="2"></if>
-	      <else><td style="background: #EEEEEE"></else>
+              <if @elements.label@ nil><td colspan="2"></if>
+	      <else><td></else>
 		<noparse><formwidget id=@elements.id@></noparse>
 	      </td>
 	    </if>
@@ -81,7 +83,14 @@
        </tr>
       </else>
     </if>
-    </if><!-- section template-->
+    </if>
+    <else>
+      <if @elements.widget@ eq "submit">
+        <tr><td align="center" colspan="2">
+          <noparse><formwidget id=@elements.id@></noparse>
+        </td></tr>
+      </if>
+      </else>
     </group>
 
   </multiple>
@@ -90,14 +99,5 @@
 
 </td></tr>
 
-<if @buttons:rowcount@ gt 0>
-  <tr>
-    <td align="center">
-      <multiple name="buttons">
-        <input type="submit" name="@buttons.name@" value="@buttons.label@">
-      </multiple>
-    </td>
-  </tr>
-</if>
 
 </table>
Index: openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/standard-lars.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/Attic/standard-lars.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/standard-lars.adp	1 Mar 2004 11:10:31 -0000	1.1
+++ openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/standard-lars.adp	11 Mar 2004 14:34:25 -0000	1.2
@@ -1,83 +1,72 @@
-<table cellspacing="1" cellpadding="0" border="0">
-  <tr>
-    <td>
-
-      <table cellspacing="0" cellpadding="6" border="0" width="100%">
-        <tr>
-          <td>
-
-
-<!-- Form elements -->
-<table cellspacing="2" cellpadding="2" border="0" width="100%">
+<table cellspacing="2" cellpadding="2" border="0">
   <multiple name=elements>
 
     <if @elements.section@ not nil>
-    <% # Get the section template (set in survey_section_add_to_form) %>
-    <% upvar #$level section_template($elements(section)) section_template%>
+      <tr class="form-section"><th colspan="2">@elements.section@</th></tr>
+    </if>
 
       <if @section_template@ nil>
-        <tr bgcolor="#ccccff"><th colspan="2">@elements.section;noquote@</th></tr>
+        <tr><td colspan=2 bgcolor=#eeeeee><b>@elements.section;noquote@</b></td></tr>
       </if>
       <else>
         @section_template;noquote@
       </else>
-    </if>
 
     <group column="section">
+      <if @section_template@ nil>
       <if @elements.widget@ eq "hidden"> 
         <noparse><formwidget id=@elements.id@></noparse>
       </if>
   
-   <if @section_template@ nil>
-    <if @elements.widget@ eq "block"> 
+      <if @elements.widget@ eq "hidden"> 
+        <noparse><formwidget id=@elements.id@></noparse>
+      </if>
+
+       <if @elements.widget@ eq "block"> 
         <tr><td colspan=2><noparse><formwidget id=@elements.id@></noparse></td></tr>
-    </if>
+       </if>
 
-    <if @elements.widget@ not in "hidden" "block">
+       <if @elements.widget@ not in "block" "hidden">
 
         <if @elements.widget@ eq "submit">
-          <tr bgcolor="white">
-            <td align="center" colspan="2">
-              <noparse>
-                <formwidget id="@elements.id@">
-              </noparse>
+          <tr class="form-element">
+            <td align="left" colspan="2">
+              <group column="widget">
+                <noparse><formwidget id="@elements.id@"></noparse>
+              </group>
             </td>
           </tr>
         </if>
-
         <else>
-          <tr bgcolor=white>
+          <tr class="form-element">
 
             <if @elements.label@ not nil>
               <noparse>
                 <if \@formerror.@elements.id@\@ not nil>
-                  <td bgcolor="#ffaaaa" width="120">
+                  <td class="form-label-error">
                 </if>
                 <else>
-                  <td bgcolor="#ddddff" width="120">
+                  <td class="form-label">
                 </else>
               </noparse>
-                <b>
-                  <font face="tahoma,verdana,arial,helvetica,sans-serif" size="-1">
-		  <if @elements.required_p@ eq "t"><span style="color: #f00;">*</span></if>
-                    @elements.label;noquote@
-                  </font>
-                </b>
-                &nbsp;&nbsp;
-              </td>
+                @elements.label;noquote@
+                <if @form_properties.show_required_p@ true>
+                  <if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform" and @elements.widget@ ne "select"><span class="form-required-mark">*</span></if>
+                </if>
+               </td>
             </if>
             <else>
-              <td bgcolor="#ddddff" width="120">
+              <td class="form-label">
                 &nbsp;
               </td>
             </else>
 
               <noparse>
                 <if \@formerror.@elements.id@\@ not nil>
-                  <td style="border: 2px solid red;">
+                  <td class="form-widget-error">
                 </if>
                 <else>
-                  <td>
+                  <td class="form-widget">
                 </else>
               </noparse>
 
@@ -87,12 +76,10 @@
                     <formgroup id="@elements.id@">
                       <tr>
                         <td>\@formgroup.widget;noquote@</td>
-                        <td>
-                          <font face="tahoma,verdana,arial,helvetica,sans-serif" size="-1">
-                            <label for="@elements.form_id;noquote@:elements:@elements.id;noquote@:\@formgroup.option;noquote@">
-                              \@formgroup.label;noquote@
-                            </label>
-                          </font>
+                        <td class="form-widget">
+                          <label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">
+                            \@formgroup.label;noquote@
+                          </label>
                         </td>
                       </tr>
                     </formgroup>
@@ -110,49 +97,43 @@
 
               <noparse>
                 <formerror id="@elements.id@">
-                  <br>
-                  <font face="tahoma,verdana,arial,helvetica,sans-serif" color="red">
-                    <b>\@formerror.@elements.id@\;noquote@<b>
-                  </font>
+                  <div class="form-error">
+                    \@formerror.@elements.id@;noquote\@
+                  </div>
                 </formerror>
               </noparse>
 
-              <if @elements.help_text@ not nil>
-                <p style="margin-top: 4px; margin-bottom: 2px;">
-                  <font face="tahoma,verdana,arial,helvetica,sans-serif" size="-1">
-                    <noparse>
-                      <i><formhelp id="@elements.id@"></i>
-                    </noparse>
-                  </font>
-                </p>
+              <if @elements.help_text@ not nil and @elements.mode@ ne "display">
+                <div class="form-help-text">
+                  <img src="/shared/images/info.gif" width="12" height="9" alt="[i]" title="Help text" border="0">
+                  <noparse><formhelp id="@elements.id@"></noparse>
+                </div>
               </if>
 
             </td>
           </tr>
 
         </else>
       </if>
-    </if><!-- section template-->
+      </if>
+      <else>
+      <if @elements.widget@ eq "submit">
+        <tr><td align="center" colspan="2">
+          <noparse><formwidget id=@elements.id@></noparse>
+        </td></tr>
+      </if>
+      </else>
+
     </group>
   </multiple>
 
 </table>
 
-          </td>
-        </tr>
+<multiple name="elements">
+  <if @form_properties.show_required_p@ true>
+    <if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform" and @elements.widget@ ne "select" and @elements.widget@ ne "hidden" and @elements.widget@ ne "submit">
+       <span class="form-required-mark">*</span> #acs-templating.required# <% break %>
+    </if>
+  </if>
+</multiple>
 
-<if @buttons:rowcount@ gt 0>
-  <tr>
-    <td>
-      <multiple name="buttons">
-        <input type="submit" name="@buttons.name;noquote@" value="@buttons.label;noquote@">
-      </multiple>
-    </td>
-  </tr>
-</if>
-
-      </table>
-
-    </td>
-  </tr>
-</table>
Index: openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/standard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/Attic/standard.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/standard.adp	1 Mar 2004 11:10:31 -0000	1.1
+++ openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/standard.adp	11 Mar 2004 14:34:25 -0000	1.2
@@ -12,40 +12,38 @@
 
   <multiple name=elements>
 
-    <if @elements.section@ not nil>
-    <% # Get the section template (set in survey_section_add_to_form) %>
-    <% upvar #$level section_template($elements(section)) section_template%>
-
       <if @section_template@ nil>
-        <tr><td colspan=2 bgcolor=#eeeeee><b>@elements.section;noquote@</b></td></tr>
+        <tr><td colspan="2"><span style="font-weight: bold">@elements.section@</span></td></tr>
       </if>
       <else>
         @section_template;noquote@
       </else>
-    </if>
 
     <group column="section">
+     <if @section_template@ nil>
 
     <if @elements.widget@ eq "hidden"> 
         <noparse><formwidget id=@elements.id@></noparse>
     </if>
-
-   <if @section_template@ nil>
-    <if @elements.widget@ eq "block"> 
+       <if @elements.widget@ eq "block"> 
         <tr><td colspan=2><noparse><formwidget id=@elements.id@></noparse></td></tr>
-    </if>
+       </if>
 
-    <if @elements.widget@ not in "hidden" "block">
+       <if @elements.widget@ not in "block" "hidden">
+
       <if @elements.widget@ eq "submit">
-        <tr><td align=center colspan=2>
-          <noparse><formwidget id=@elements.id@></noparse>
-        </td></tr>
+        <tr>
+          <td align="left" colspan="2">
+            <group column="widget">
+              <noparse><formwidget id="@elements.id@"></noparse>
+            </group>
+          </td>
+        </tr>
       </if>
       <else>
        <tr>
         <if @elements.label@ not nil>
-	<td><if @elements.required_p@ eq "t"><span style="color: #f00;">*</span></if>
-	<b>@elements.label;noquote@</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>
@@ -56,10 +54,14 @@
             <if @elements.label@ nil><td colspan=2>></if>
 	    <else><td></else>
 	    <noparse>
-            <table cellpadding=4 cellspacing=0 border=0>
+            <table cellpadding="4" cellspacing="0" border="0">
 	      <formgroup id=@elements.id@>
-		<tr><td>\@formgroup.widget;noquote@</td>
-                    <td><label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">\@formgroup.label@</label></td></tr>
+		<tr>
+                  <td>\@formgroup.widget;noquote@</td>
+                  <td>
+                    <label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">\@formgroup.label@</label>
+                  </td>
+                </tr>
 	      </formgroup>
 	      </table>
 	      <formerror id=@elements.id@><br>
@@ -87,7 +89,14 @@
        </tr>
       </else>
     </if>
-    </if><!-- section template-->
+    </if>
+    <else>
+      <if @elements.widget@ eq "submit">
+        <tr><td align="center" colspan="2">
+          <noparse><formwidget id=@elements.id@></noparse>
+        </td></tr>
+      </if>
+      </else>
     </group>
 
   </multiple>
@@ -96,16 +105,6 @@
 
 </td></tr>
 
-<if @buttons:rowcount@ gt 0>
-  <tr>
-    <td align="center">
-      <multiple name="buttons">
-        <input type="submit" name="@buttons.name@" value="@buttons.label@">
-      </multiple>
-    </td>
-  </tr>
-</if>
-
 <!-- End of light blue pad -->
 </table>
 
Index: openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/two-column.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/Attic/two-column.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/two-column.adp	1 Mar 2004 11:10:31 -0000	1.1
+++ openacs-4/contrib/packages/survey/acs-templating/resources/forms/survey/two-column.adp	11 Mar 2004 14:34:25 -0000	1.2
@@ -145,6 +145,16 @@
         </else>
       </if>
     </if><!-- section template-->
+        <if @elements.widget@ eq "submit">
+          <tr bgcolor="white">
+            <td align="center" colspan="2">
+              <noparse>
+                <formwidget id="@elements.id@">
+              </noparse>
+            </td>
+          </tr>
+        </if>
+
     </group>
 <if @elements.widget@ not eq "hidden">
 </table>
@@ -155,16 +165,6 @@
           </td>
         </tr>
 
-<if @buttons:rowcount@ gt 0>
-  <tr>
-    <td>
-      <multiple name="buttons">
-        <input type="submit" name="@buttons.name@" value="@buttons.label@">
-      </multiple>
-    </td>
-  </tr>
-</if>
-
       </table>
 
     </td>