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 -r1.17 -r1.18
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	25 Feb 2005 22:09:47 -0000	1.17
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	14 May 2007 20:30:27 -0000	1.18
@@ -1,118 +1,132 @@
-<table cellspacing="2" cellpadding="2" border="0">
-  <multiple name=elements>
-
-    <if @elements.section@ not nil>
-      <tr class="form-section"><th colspan="2">@elements.section@</th></tr>
-    </if>
-
-    <group column="section">
-      <if @elements.widget@ eq "hidden"> 
-        <noparse><formwidget id=@elements.id@></noparse>
-      </if>
+<multiple name=elements>
+	<if @elements.section@ not nil>
+		<fieldset id="@elements.section@" @elements.sec_fieldset;noquote@><!-- section fieldset -->
+        <legend @elements.sec_legend;noquote@>@elements.sec_legendtext@</legend>
+	</if>
+	
+	<group column="section">
+		<if @elements.widget@ eq "hidden"> 
+			<noparse><formwidget id=@elements.id@></noparse>
+		</if>
   
-      <else>
+		<else>
+			<if @elements.widget@ eq "submit"><!-- if form submit button wrap it in the form-button class -->
+  				<div class="form-button">
+        			<group column="widget">
+             				<noparse><formwidget id="@elements.id@"></noparse>
+           			</group>
+  				</div>
+       			</if>
+        
+			<else> <!-- wrap the form item in the form-item-wrapper class -->
+				<div class="form-item-wrapper">
+					<if @elements.widget@ in radio checkbox> <!-- radio button groups and checkbox groups get their own fieldsets -->
+						<fieldset @elements.fieldset;noquote@>
+				          <legend @elements.legend;noquote@>@elements.legendtext@</legend>
+				    </if>
+					<if @elements.label@ not nil>
+						<noparse>
+							<if \@formerror.@elements.id@\@ not nil>
+								<div class="form-label form-label-error">
+                                  <if @elements.widget@ in radio checkbox date inform>
+									@elements.label;noquote@
+                                  </if>
+                                  <else>
+									<label for="@elements.id@">@elements.label;noquote@</label>
+                                  </else>
+							</if>
+							<else>
+								<div class="form-label">
+                                  <if @form_properties.mode@ eq display or @elements.widget@ in radio checkbox date inform>
+									@elements.label;noquote@
+                                  </if>
+                                  <else>
+									<label for="@elements.id@">@elements.label;noquote@</label>
+                                  </else>
+							</else>
+						</noparse>
 
-        <if @elements.widget@ eq "submit">
-          <tr class="form-element">
-            <td align="left" colspan="2">
-              <group column="widget">
-                <noparse><formwidget id="@elements.id@"></noparse>
-              </group>
-            </td>
-          </tr>
-        </if>
-        <else>
-          <tr class="form-element">
+						<if @form_properties.show_required_p@ true>
+							<if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform">
+								<div class="form-required-mark">
+								(#acs-templating.required#)
+								</div>
+							</if>
+						</if>
 
-            <if @elements.label@ not nil>
-              <noparse>
-                <if \@formerror.@elements.id@\@ not nil>
-                  <td class="form-label-error">
-                </if>
-                <else>
-                  <td class="form-label">
-                </else>
-              </noparse>
-                @elements.label;noquote@
-                <if @form_properties.show_required_p@ true>
-                  <if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform"><span class="form-required-mark">*</span></if>
-                </if>
-               </td>
-            </if>
-            <else>
-              <noparse>
-                <if \@formerror.@elements.id@\@ not nil>
-                  <td class="form-label-error">
-                </if>
-                <else>
-                  <td class="form-label">
-                </else>
-              </noparse>
-              &nbsp;<if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform"><span class="form-required-mark">*</span></if></td>
-            </else>
+								</div> <!-- /form-label or /form-error -->
+					</if>
+					<else>
+						<noparse>
+						<if \@formerror.@elements.id@\@ not nil>
+							<div class="form-error">
+						</if>
+						<else>
+							<div class="form-label">
+						</else>
+						</noparse>
+						<if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform">
+							<div class="form-required-mark">
+								#acs-templating.required#
+							</div>
+						</if>
 
-              <noparse>
-                <if \@formerror.@elements.id@\@ not nil>
-                  <td class="form-widget-error">
-                </if>
-                <else>
-                  <td class="form-widget">
-                </else>
-              </noparse>
+								</div><!-- /form-label or /form-error -->
+					</else>
 
-              <if @elements.widget@ eq radio or @elements.widget@ eq checkbox>
-                <noparse>
-                  <table class="formgroup">
-                    <formgroup id="@elements.id@">
-                      <tr>
-                        <td>\@formgroup.widget;noquote@</td>
-                        <td class="form-widget">
-                          <label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">
-                            \@formgroup.label;noquote@
-                          </label>
-                        </td>
-                      </tr>
-                    </formgroup>
-                  </table>
-                </noparse>
-              </if>
+					<noparse>
+					<if \@formerror.@elements.id@\@ not nil>
+						<div class="form-widget form-widget-error">
+					</if>
+					
+					<else>
+						<div class="form-widget">
+					</else>
+					</noparse>
+	
+					<if @elements.widget@ in radio checkbox>
+						<noparse>
+							<formgroup id="@elements.id@">			
+									\@formgroup.widget;noquote@
+								<label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">
+										\@formgroup.label;noquote@
+								</label><br/>
+							</formgroup>
+						</noparse>
+					</if>
 
-              <else>
-                <noparse>
-                  <formwidget id="@elements.id@">
-                </noparse>
-              </else>
+					<else>
+						<noparse>
+						<formwidget id="@elements.id@">
+						</noparse>
+              				</else>							
+							
+						</div> <!-- /form-widget -->
+						
+					<noparse>
+					<formerror id="@elements.id@">
+						<div class="form-error">
+							\@formerror.@elements.id@;noquote\@
+						</div> <!-- /form-error -->
+					</formerror>
+					</noparse>
 
-              <noparse>
-                <formerror id="@elements.id@">
-                  <div class="form-error">
-                    \@formerror.@elements.id@;noquote\@
-                  </div>
-                </formerror>
-              </noparse>
+					<if @elements.help_text@ not nil>
+						<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> <!-- /form-help-text -->
+					</if>
 
-              <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>
+					<if @elements.widget@ in radio checkbox> <!-- radio button groups and checkbox groups get their own fieldsets -->
+						</fieldset>
+				    </if>
+				</div>
+       		</else>
+	</else>
+</group>
 
-            </td>
-          </tr>
-
-        </else>
-      </else>
-    </group>
-  </multiple>
-
-</table>
-
-<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 "hidden" and @elements.widget@ ne "submit">
-       <span class="form-required-mark">*</span> #acs-templating.required# <% break %>
-    </if>
-  </if>
+<if @elements.section@ not nil>
+	</fieldset> <!-- section fieldset -->
+</if>
 </multiple>
-