Index: openacs-4/packages/dotlrn/www/community-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/dotlrn/www/community-edit.adp	9 Nov 2008 23:29:23 -0000	1.15
+++ openacs-4/packages/dotlrn/www/community-edit.adp	3 Apr 2009 15:07:13 -0000	1.16
@@ -17,82 +17,49 @@
 %>
 
 <master>
-<property name="title">@title@</property>
+<property name="&doc">doc</property>
 <property name="context">@context;noquote@</property>
 
-<p>
+<h1>#dotlrn.Community_info#</h1>
   <formtemplate id="edit_community_info"></formtemplate>
-</p>
 
-<p>
+<h1>#dotlrn.Roles#</h1>
   <formtemplate id="edit_community_role_names"></formtemplate>
-</p>
 
-<p>
-
 <!-- AKS: bypass form manager for the last form. But fake 
      the look and feel of it   -->
 
-<form enctype=multipart/form-data method=POST action="community-edit-2">
-<table bgcolor=#6699CC cellspacing=0 cellpadding=4 border=0>
-<tr><td>
-  <table bgcolor=#99CCFF cellspacing=0 cellpadding=6 border=0>
-  <tr><td>
-      <table bgcolor=#99CCFF cellspacing=0 cellpadding=2 border=0>
-      <tr>
-        <td><b>#dotlrn.Header_Font#</b>&nbsp;&nbsp;</td>
-        <td nowrap><input type="text" name="header_font" size="50" value="@header_font@"></td>
-      </tr>
-      
-      <tr>
-        <td><b>#dotlrn.Header_Font_Size#</b>&nbsp;&nbsp;</td>
-        <td nowrap>
-        <select name="header_font_size">
-          @size_option_list;noquote@
-        </select>
-        </td>
-      </tr>
-      
-      <tr>
-        <td><b>#dotlrn.Header_Font_Color#</b>&nbsp;&nbsp;</td>
-        <td nowrap>
-        <input type="text" name="header_font_color" value="@header_font_color@" size="50"></td>
-      </tr>
+<h1>#dotlrn.header_logo#</h1>
 
-     <tr>
-           <td><b>#dotlrn.header_logo#</b>&nbsp;&nbsp;</td>
-           <td><img src="@header_url@"></tr>
-      </tr>
+    <form enctype="multipart/form-data" method="POST" action="community-edit-2" class="margin-form">
 
-     <tr>
-           <td>&nbsp;&nbsp;</td>
-           <td><input type="file" name="header_img" size="20"></tr>
-      </tr>
+      <div class="form-item-wrapper">
+        <label for="header_img">
+          <span class="form-label">#dotlrn.header_logo_file#</span>
+          <span class="form-widget">
+            <input type="file" id="header_img" name="header_img" size="20">
+          </span>
+        </label>
+      </div>
 
-      <tr>
-        <td><b>#dotlrn.Header_Alternate_Text#</b>&nbsp;&nbsp;</td>
-        <td nowrap>
-        <input type="text" name="header_alt_text" value="@header_alt_text@" size="50"></td>
-      </tr>
+      <div class="form-item-wrapper">
+        <label for="header_alt_text">
+          <span class="form-label">#dotlrn.Header_Alternate_Text#</span>
+          <span class="form-widget">
+            <input type="text" id="header_alt_text" name="header_alt_text" value="@header_alt_text@" size="50">
+          </span>
+        </label>
+      </div>
 
-      <tr><td align=center colspan=2>
-          <input type="submit" name="preview_button" value="#dotlrn.Preview#"></td>
-      </tr>
+      <div class="form-item-wrapper">
+        <span class="form-button">
+          <input type="submit" name="preview_button" value="#dotlrn.Preview#">
+        </span>
+      </div>
+    </form>
     
-    </table>
-  
-  </td></tr>
-  </table>
-
-</td></tr>
-</table>
-
-</form>
-</p>
-
-<strong>[<a href=community-edit-revert.tcl?header_logo_only=1>#dotlrn.lt_Revert_ONLY_the_Heade#</a>]</strong>
-<br>
-<strong>[<a href=community-edit-revert.tcl>#dotlrn.lt_Revert_all_properties#</a>]</strong>
-
-
-
+    <p>
+      <a href="community-edit-revert.tcl?header_logo_only=1" class="button">
+        #dotlrn.lt_Revert_ONLY_the_Heade#
+      </a>
+    </p>