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.22.2.1 -r1.22.2.2
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	3 Apr 2008 09:38:10 -0000	1.22.2.1
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	21 May 2008 17:07:01 -0000	1.22.2.2
@@ -5,134 +5,113 @@
 	</if>
 	
 	<group column="section">
-		<if @elements.widget@ eq "hidden"> 
-			<noparse><div><formwidget id=@elements.id@></div></noparse>
-		</if>
+      <if @elements.widget@ eq "hidden"> 
+		<noparse><div><formwidget id=@elements.id@></div></noparse>
+	  </if>
   
-		<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>
+		<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@">&nbsp;</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> 
-                      <if @elements.legendtext@ defined>
-						<fieldset @elements.fieldset;noquote@>
-                          <!-- radio button groups and checkbox groups get their own fieldsets -->
-				          <legend @elements.legend;noquote@><span>@elements.legendtext@</span></legend>
-                      </if>
-				    </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>
+	   <else> <!-- wrap the form item in the form-item-wrapper class -->
+	     <div class="form-item-wrapper">
+           <noparse>
+			 <formerror id="@elements.id@">
+			   <div class="form-error">
+				 \@formerror.@elements.id@;noquote\@
+			   </div> <!-- /form-error -->
+			 </formerror>
+		   </noparse>
 
-						<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.widget@ in radio checkbox> 
+             <if @elements.legendtext@ defined>
+			   <fieldset @elements.fieldset;noquote@>
+                 <!-- radio button groups and checkbox groups get their own fieldsets -->
+				 <legend @elements.legend;noquote@><span>@elements.legendtext@</span></legend>
+             </if>
+		   </if>
+           <div class="form-label">
+             <if @elements.label@ not nil>
+			   <noparse>
+                 <if @form_properties.mode@ eq display or @elements.widget@ in radio checkbox date inform>
+                   <if \@formerror.@elements.id@\@ not nil>
+				     <span class="form-label-error">@elements.label;noquote@</span>
+                   </if>
+                   <else>@elements.label;noquote@</else>
+                 </if>
+                 <else>
+				   <label for="@elements.id@">
+                     <if \@formerror.@elements.id@\@ not nil>
+                       <span class="form-label-error">@elements.label;noquote@</span>
+                     </if>
+                     <else>@elements.label;noquote@</else>
+                 </else>
+			   </noparse>
 
-								</div> <!-- /form-label or /form-error -->
-					</if>
-					<else>
-						<noparse>
-						<if \@formerror.@elements.id@\@ not nil>
-							<div class="form-error">
-						</if>
-						</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>
-							</div><!-- /form-label or /form-error -->
-                        </if>
-                        </noparse>
-					</else>
+			   <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">
+				     (#acs-templating.required#)
+				   </span>
+				 </if>
+			   </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@">			
-								<label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">
-									\@formgroup.widget;noquote@
-									\@formgroup.label;noquote@
-								</label><br>
-							</formgroup>
-						</noparse>
-					</if>
+               <if @form_properties.mode@ eq display or @elements.widget@ in radio checkbox date inform><!-- dummy --></if>
+               <else></label></else>
+		     </if>
+		     <else>
+		       <if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform">
+			     <div class="form-required-mark">
+			       #acs-templating.required#
+			     </div>
+			   </if>
+		     </else>
+           </div> <!-- /form-label -->
 
-					<else>
-						<noparse>
-						<formwidget id="@elements.id@">
-						</noparse>
-              				</else>							
+           <div class="form-widget">
+	
+		     <if @elements.widget@ in radio checkbox>
+			   <noparse>
+			     <formgroup id="@elements.id@">			
+				   <label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">
+				     \@formgroup.widget;noquote@
+					 \@formgroup.label;noquote@
+				   </label><br>
+				 </formgroup>
+			   </noparse>
+             </if>
+			 <else>
+			   <noparse>
+			     <formwidget id="@elements.id@">
+			   </noparse>
+             </else>							
 							
-						</div> <!-- /form-widget -->
+		   </div> <!-- /form-widget -->
 						
-					<noparse>
-					<formerror id="@elements.id@">
-						<div class="form-error">
-							\@formerror.@elements.id@;noquote\@
-						</div> <!-- /form-error -->
-					</formerror>
-					</noparse>
+           <if @elements.help_text@ not nil>
+             <div class="form-help-text">
+               <img src="/shared/images/info.gif" width="12" height="9" alt="Help" title="Help text" style="border:0">
+                 <noparse><formhelp id="@elements.id@"></noparse>
+             </div> <!-- /form-help-text -->
+           </if>
 
-					<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" style="border:0">
-							<noparse><formhelp id="@elements.id@"></noparse>
-						</div> <!-- /form-help-text -->
-					</if>
-
-					<if @elements.widget@ in radio checkbox> 
-                      <if @elements.legendtext@ defined>
-                        <!-- radio button groups and checkbox groups get their own fieldsets -->
-						</fieldset>
-                      </if>
-				    </if>
-				</div>
-       		</else>
+		   <if @elements.widget@ in radio checkbox> 
+             <if @elements.legendtext@ defined>
+               <!-- radio button groups and checkbox groups get their own fieldsets -->
+			   </fieldset>
+             </if>
+		   </if>
+		 </div>
+       </else>
 	</else>
-</group>
+  </group>
 
-<if @elements.section@ not nil>
-	</fieldset> <!-- section fieldset -->
-</if>
+  <if @elements.section@ not nil>
+    </fieldset> <!-- section fieldset -->
+  </if>
 </multiple>
Index: openacs-4/packages/acs-templating/www/resources/forms.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/forms.css,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/acs-templating/www/resources/forms.css	24 Aug 2007 08:29:04 -0000	1.8
+++ openacs-4/packages/acs-templating/www/resources/forms.css	21 May 2008 17:07:01 -0000	1.8.2.1
@@ -1,104 +1,83 @@
-/*form fieldset{
-	border: 0px solid #F00;
-}
-
-form .form-required-mark {
-    color: #ff0000;
-    display: inline;
-}
-
-form .form-item-wrapper {
-	clear: both;
-	padding: 5px;
-}
-
-form .form-item-wrapper .form-label {
-	float: left;
-	text-align: right;
-	display: block;
-	width: 12em;
-}
-
-form .form-item-wrapper .form-widget, form .form-button, form .form-help-text {
-	display: block;
-	margin-left: 13em;
-}
-
-form .form-item-wrapper .form-error {
-	display: block;
-	margin-left: 13em;
-	color: #ff0000;
-}
-*/
-
-.form-label-error, .form-widget-error, .form-required-mark, .form-error {
-	color: #c30000;
-}
-
-/* form layout for forms with divs*/
-
-.form-fieldset {
-	border: 0px solid #FFFFFF;
-}
-
-.margin-form .form-required-mark {
-    display: inline;
-}
-
-.margin-form .form-item-wrapper {
-	clear: both;
-	padding: 5px;
-}	
-
-.margin-form .form-item-wrapper .form-label {
-	float: left;
-	text-align: right;
-	display: block;
-	width: 15em;
-}
-
-.margin-form .form-item-wrapper .form-widget, .margin-form .form-button, .margin-form div.form-help-text {
-	display: block;
-	margin-left: 16em;
-}
-
-.margin-form .form-item-wrapper .form-error, .margin-form .form-item-wrapper .form-widget-error {
-	display: block;
-	margin-left: 16em;
-}
-
-
-.vertical-form .form-required-mark {
-    display: inline;
-}
-
-.vertical-form .form-item-wrapper {
-	clear: both;
-	padding: 8px;
-}	
-
-.vertical-form .form-item-wrapper .form-label{
-	text-align: left;
-	display: block;
-
-}
-
-.vertical-form .form-item-wrapper .form-widget{
-	display: inline;
-
-}
-
-
-.inline-form div {
-	display: inline;	
-}
-
-
-/* pages that are laid out like forms but do not use the form builder and do not have input fields*/
-.margin-form-div .form-item-wrapper {
-	padding-bottom: 10px;
-}
-
-.margin-form-div h1 {
-	margin-left: 13.5em;
-}
\ No newline at end of file
+
+.form-widget-error, .form-required-mark, .form-error {
+	color: #c30000;
+}
+
+.form-label-error {
+	font-weight: bold;
+}
+
+/* form layout for forms with divs*/
+
+.form-fieldset {
+	border: 0px solid #000;
+}
+
+.margin-form .form-required-mark {
+    display: inline;
+}
+
+.margin-form .form-item-wrapper {
+	clear: both;
+	padding: 5px;
+}	
+
+.margin-form .form-item-wrapper .form-label {
+	float: left;
+	text-align: right;
+	display: block;
+	width: 16em;
+}
+
+.margin-form .form-item-wrapper .form-widget, .margin-form .form-button, .margin-form div.form-help-text {
+	display: block;
+	margin-left: 17em;
+}
+
+.margin-form .form-button {
+	margin-top: 1em;
+}
+
+.margin-form .form-item-wrapper .form-error, .margin-form .form-item-wrapper .form-widget-error {
+	display: block;
+	margin-left: 17em;
+}
+
+.margin-form legend span { 
+    display: block;
+}
+
+.vertical-form .form-required-mark {
+    display: inline;
+}
+
+.vertical-form .form-item-wrapper {
+	clear: both;
+	padding: 8px;
+}	
+
+.vertical-form .form-item-wrapper .form-label{
+	text-align: left;
+	display: block;
+
+}
+
+.vertical-form .form-item-wrapper .form-widget{
+	display: inline;
+
+}
+
+
+.inline-form div {
+	display: inline;	
+}
+
+
+/* pages that are laid out like forms but do not use the form builder and do not have input fields*/
+.margin-form-div .form-item-wrapper {
+	padding-bottom: 10px;
+}
+
+.margin-form-div h1 {
+	margin-left: 13.5em;
+}