Index: openacs.org-dev/packages/forums/www/message-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-chunk.adp,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/message-chunk.adp	9 Jul 2002 17:35:09 -0000	1.1
+++ openacs.org-dev/packages/forums/www/message-chunk.adp	13 Aug 2002 03:11:26 -0000	1.2
@@ -1,33 +1,68 @@
-    <tr bgcolor="@bgcolor@">
-      <td><b><a href="message-view?message_id=@message.message_id@">@message.subject@</a></b> <if @message.n_attachments@ not nil and @message.n_attachments@ gt 0><include src="message-attachment-chunk" &message="message"></if></td>
-      <td width="15%"><a href="user-history?user_id=@message.user_id@">@message.user_name@</a></td>
-      <td align="center" width="20%">@message.posting_date@</td>
-      <td align="right" width="25%">
-        <nobr><small>
-          [
-            <a href="message-post?parent_id=@message.message_id@">reply</a>
-            | <a href="message-email?message_id=@message.message_id@">email</a>
+
+<tr style="color: black; background-color: @table_bgcolor@;">
+  <td align=left style="padding-left: 1em">
+
+  <strong>
+    <if @preview@ nil>
+      <a href="message-view?message_id=@message.message_id@">@message.subject@</a>
+    </if>
+    <else>
+      @message.subject@
+    </else>
+  </strong>  
+
+  <td align=center>
+    <a href="user-history?user_id=@message.user_id@">@message.user_name@</a></td>
+  <td align=center>@message.posting_date@</td>
+
+  <if @preview@ nil>
+  
+    <td align=right style="padding-right: 1em; padding-left: 1em;">
+      <div style="white-space: nowrap; font-size: x-small">
+        [ <a href="message-post?parent_id=@message.message_id@">reply</a>
+        | <a href="message-email?message_id=@message.message_id@">email</a>
+        ]
+        <if @moderate_p@>
+          <br>
+          [ <a href="moderate/message-edit?message_id=@message.message_id@">edit</a>
+          | <a href="moderate/message-delete?message_id=@message.message_id@">delete</a>
+          
+          <if @forum_moderated_p@>
+            <if @message.state@ ne approved>
+              | <a href="moderate/message-approve?message_id=@message.message_id@">approve</a>
+            </if>
+            <if @message.state@ ne rejected and @message.max_child_sortkey@ nil>
+              | <a href="moderate/message-reject?message_id=@message.message_id@">reject</a>
+            </if>
+          </if>
           ]
-        </small></nobr>
-<if @moderate_p@>
-        <br>
-        <nobr><small>
-          [
-            <a href="moderate/message-edit?message_id=@message.message_id@">edit</a>
-            | <a href="moderate/message-delete?message_id=@message.message_id@">delete</a>
-<if @forum_moderated_p@>
-<if @message.state@ ne approved>
-            | <a href="moderate/message-approve?message_id=@message.message_id@">approve</a>
+        </if>
+      </div>
+    </td>
+
+  </if>
+
+</tr>
+
+<tr style="color: black; background-color: @table_bgcolor@">
+  <if @preview@ nil>
+    <td colspan="4" >
+  </if>
+  <else>
+    <td colspan="3" >  
+  </else>
+
+    <if @message.html_p@ false>
+      <div style="font-family: monospace">
+        <%= [ad_text_to_html --  "$message(content)"] %>
+      </div>
+    </if>
+    <else>
+      @message.content@
+    </else>
+  </td>
+</tr>
+
+<if @message.n_attachments@ not nil and @message.n_attachments@ gt 0>
+  <include src="message-attachment-chunk" &message="message" bgcolor=@table_bgcolor@>
 </if>
-<if @message.state@ ne rejected and @message.max_child_sortkey@ nil>
-            | <a href="moderate/message-reject?message_id=@message.message_id@">reject</a>
-</if>
-</if>
-          ]
-        </small></nobr>
-</if>
-      </td>
-    </tr>
-    <tr bgcolor="@bgcolor@">
-      <td colspan="4"><blockquote>@message.content@</blockquote></td>
-    </tr>