Index: openacs-4/packages/news-portlet/www/news-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/news-portlet/www/news-portlet.adp	8 Apr 2004 13:32:41 -0000	1.12
+++ openacs-4/packages/news-portlet/www/news-portlet.adp	13 Jan 2005 13:58:31 -0000	1.13
@@ -22,44 +22,33 @@
 
   <if @news_items:rowcount@ gt 0>
 
-<%
-    set new_package_id ""
-    set old_package_id ""
-%>
+    <if @news_items:rowcount@ eq 1>
 
+      <multiple name="news_items">
+	<include src="summary" 
+	item_id="@news_items.item_id@"
+	url="@news_items.view_url@">
+      </multiple>
 
-      <table border="0" bgcolor="white" cellpadding="2" cellspacing="0" width="100%">
-        <tr class="table-header">
-          <td><strong class="table-header">#news.Title#</strong></td>
-          <td><strong class="table-header">#dotlrn.clubs_pretty_name#</strong></td>
-        </tr>
+    </if>
+    <else>
 
+      <multiple name="news_items">
 
-<multiple name="news_items">
+<if @one_instance_p@ false>@news_items.parent_name@</if>
+<ul>
+<group column="package_id">
+  <li>
+    <a href="@news_items.url@item?item_id=@news_items.item_id@">@news_items.publish_title@</a>
+    <small>(@news_items.publish_date@)</small>
+  </li>
+</group>
+</ul>
 
-<% set new_package_id $news_items(package_id) %>
+      </multiple>
 
-      <if @news_items.rownum@ odd>
-        <tr class="odd">
-      </if>
-      <else>
-        <tr class="even">
-      </else>
-        <td><a href="@news_items.url@item?item_id=@news_items.item_id@">@news_items.publish_title@</a>
-        <small>(@news_items.publish_date@)</small></td>
-        <td>@news_items.parent_name@</td>
-      </tr>
+    </else>
 
-<% set old_package_id $new_package_id %>
-
-    <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
-      </tr>
-    </if>
-</multiple>
-
-      </table>
-
-
   </if>
   <else>
     <small>#news-portlet.No_News#</small>
@@ -69,4 +58,5 @@
 <else>
 &nbsp;
 </else>
+<if @inside_comm_p@ ><br><a href="@news_url@news/item-create">#news-portlet.Add_a_News_Item#</a></if>