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.8 -r1.9
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	22 Sep 2003 17:42:56 -0000	1.8
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	22 Sep 2003 18:03:48 -0000	1.9
@@ -1,98 +1,133 @@
 
-<!-- Dark blue frame -->
-<table bgcolor=#6699CC cellspacing=0 cellpadding=4 border=0>
-<tr><td>
+<table cellspacing="1" cellpadding="0" border="0">
+  <tr>
+    <td>
 
-<!-- Light blue pad -->
-<table bgcolor=#99CCFF cellspacing=0 cellpadding=6 border=0 width="100%">
-<tr><td>
+      <table cellspacing="0" cellpadding="6" border="0" width="100%">
+        <tr>
+          <td>
 
-<!-- Form elements -->
-<table bgcolor=#99CCFF cellspacing=0 cellpadding=2 border=0 width="100%">
 
+<!-- Form elements -->
+<table cellspacing="2" cellpadding="2" border="0" width="100%">
   <multiple name=elements>
 
     <if @elements.section@ not nil>
-      <tr><td colspan=2 bgcolor=#eeeeee><b>@elements.section@</b></td></tr>
+      <tr class="form-section"><th colspan="2">@elements.section@</th></tr>
     </if>
 
     <group column="section">
-
-    <if @elements.widget@ eq "hidden"> 
+      <if @elements.widget@ eq "hidden"> 
         <noparse><formwidget id=@elements.id@></noparse>
-    </if>
-
-    <else>
-      <if @elements.widget@ eq "submit">
-        <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><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>
-          </if>
-	  </td>
+
+        <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>
-	<if @elements.widget@ in radio checkbox>
-            <if @elements.label@ nil><td colspan=2>></if>
-	    <else><td></else>
-	    <noparse>
-            <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>
-	      </formgroup>
-	      </table>
-	      <formerror id=@elements.id@><br>
-                <font color="red"><b>\@formerror.@elements.id@;noquote\@</b></font>
-              </formerror>
-            </noparse>
-	    </td>	    
-	</if>
-	<else> 
-	    <if @elements.widget@ eq inform>
-	      <td bgcolor=#EEEEEE>
-		<noparse><formwidget id=@elements.id@></noparse>
-	      </td>
-	    </if>
-	    <else>
-              <if @elements.label@ nil><td nowrap colspan=2></if>
-                <else><td nowrap></else>
-		<noparse><formwidget id=@elements.id@>
-		<formerror id=@elements.id@><br><font 
-		   color="red"><b>\@formerror.@elements.id@;noquote\@<b></font>
-                </formerror></noparse>
-	      </td>
-	    </else>
-	</else>
-       </tr>
-      </else>
-    </else>
+        <else>
+          <tr class="form-element">
 
+            <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" and @elements.widget@ ne "select"><span class="form-required-mark">*</span></if>
+                </if>
+               </td>
+            </if>
+            <else>
+              <td class="form-label">
+                &nbsp;
+              </td>
+            </else>
+
+              <noparse>
+                <if \@formerror.@elements.id@\@ not nil>
+                  <td class="form-widget-error">
+                </if>
+                <else>
+                  <td class="form-widget">
+                </else>
+              </noparse>
+
+              <if @elements.widget@ in radio checkbox>
+                <noparse>
+                  <table cellpadding="4" cellspacing="0" border="0">
+                    <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>
+
+              <else>
+                <font face="tahoma,verdana,arial,helvetica,sans-serif" size="-1">
+                  <noparse>
+                    <formwidget id="@elements.id@">
+                  </noparse>
+                </font>
+              </else>
+
+              <noparse>
+                <formerror id="@elements.id@">
+                  <div class="form-error">
+                    \@formerror.@elements.id@;noquote\@
+                  </div>
+                </formerror>
+              </noparse>
+
+              <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>
+      </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 "select" and @elements.widget@ ne "hidden" and @elements.widget@ ne "submit">
+        <font face="tahoma,verdana,arial,helvetica,sans-serif" size="-1" color="red">*</font> required <% break %>
+      </if>
+    </if>
   </multiple>
 
-  </table>
+          </td>
+        </tr>
 
-</td></tr>
+      </table>
 
-<!-- End of light blue pad -->
+    </td>
+  </tr>
 </table>
-
-<!-- Dark blue frame -->
-</td></tr>
-</table>