Index: openacs-4/packages/cms/www/modules/items/publish-status.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/publish-status.adp,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/cms/www/modules/items/publish-status.adp	16 May 2005 03:06:16 -0000	1.4
+++ openacs-4/packages/cms/www/modules/items/publish-status.adp	31 May 2005 04:59:44 -0000	1.4.2.1
@@ -1,87 +1,61 @@
 
-<table cellspacing=0 cellpadding=2 border=0 width=95%>
-<tr>
-  <td colspan=2>
-    <if @can_edit_status_p@>
-      <a href="status-edit?item_id=@item_id@&item_props_tab=@item_props_tab@" class="button">Edit Publishing Status</a>
-    </if>
-    <else>&nbsp;</else>
-  </td>
-</tr>
+@message@
 
-<tr>
-<td colspan=2>
-  <table cellspacing=0 cellpadding=4 width="100%">
-  <tr>
-    <td align=left>@message@</td>
-  </tr>
+<p/>
+<ul>
+  <li>This item is <if @is_publishable@ eq f>not</if>
+      in a publishable state. <if @is_publishable@ eq f>
+      Related content may be required.</if></li>
 
-
-  <tr>
-    <td>
-      This item is 
-      <if @is_publishable@ eq f><strong>NOT</strong></if> 
-      in a publishable state<if @is_publishable@ eq f>:</if><else>.</else>
-
-  <if @is_publishable@ eq f>
-  <ul>
-
-
   <!-- Revision status -->
-
   <if @live_revision@ nil>
-    <li>This item has no live revision.
+    <li>This item has no live revision.</li>
   </if>
 
-
   <!-- child rel status -->
-
-
   <if @unpublishable_child_types@ gt 0>
 
-    <li>This item requires the following number of child items:
-      <ul>
+   <li>This item requires the following number of child items:
+     <ul>
       <multiple name="child_types">
-      <if @child_types.is_fulfilled@ eq f>
-        <li>@child_types.difference@ @child_types.direction@ 
-	@child_types.relation_tag@ 
-	<if @child_types.difference@ eq 1>@child_types.child_type_pretty@</if>
-        <else>@child_types.child_type_plural@</else>
-	<br>
-      </if>
+        <if @child_types.is_fulfilled@ eq f>
+         <li>@child_types.difference@ @child_types.direction@ 
+             @child_types.relation_tag@ 
+             <if @child_types.difference@ eq 1>@child_types.child_type_pretty@</if>
+             <else>@child_types.child_type_plural@</else>
+         </li>
+        </if>
       </multiple>
-      </ul>
+     </ul>
+   </li>
   </if>
 
-
-
   <!-- item rel status -->
-
   <if @unpublishable_rel_types@ gt 0>
 
-    <li>This item requires the following number of related items:
-      <ul>
+   <li>This item requires the following number of related items:
+    <ul>
       <multiple name="rel_types">
-      <if @rel_types.is_fulfilled@ eq f>
-        <li>@rel_types.difference@ @rel_types.direction@ 
-	@rel_types.relation_tag@ 
-	<if @rel_types.difference@ eq 1>@rel_types.target_type_pretty@</if>
-        <else>@rel_types.target_type_plural@</else>
-	<br>
-      </if>
+         <if @rel_types.is_fulfilled@ eq f>
+          <li>@rel_types.difference@ @rel_types.direction@ 
+              @rel_types.relation_tag@ 
+              <if @rel_types.difference@ eq 1>@rel_types.target_type_pretty@</if>
+              <else>@rel_types.target_type_plural@</else>
+          </li>
+         </if>
       </multiple>
-      </ul>
+     </ul>
+    </li>
   </if>
 
+</ul>
 
+<p/>
 
+<if @can_edit_status_p@>
+ <ul class="action-links">
+  <li><a href="status-edit?item_id=@item_id@&item_props_tab=@item_props_tab@">Edit publishing status</a></li>
+  <li><a href="publish?item_id=@item_id@&item_props_tab=@item_props_tab@&revision_id=@latest_revision@">Make latest revision live</a></li>
+ </ul>
+</if>
 
-
-
-
-  </ul>
-  </if>
-  </td></tr>
-</table>
-
-</td></tr></table>