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 -N -r1.11 -r1.11.6.1
--- openacs-4/packages/news-portlet/www/news-portlet.adp	23 Oct 2003 09:19:34 -0000	1.11
+++ openacs-4/packages/news-portlet/www/news-portlet.adp	23 Aug 2004 17:19:29 -0000	1.11.6.1
@@ -22,41 +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">
+      <multiple name="news_items">
+	<include src="summary" 
+	item_id="@news_items.item_id@"
+	url="@news_items.view_url@">
+      </multiple>
 
-<% set new_package_id $news_items(package_id) %>
-
-    <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@ and @old_package_id@ ne "">
-      </ul>
     </if>
+    <else>
 
-    <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
-      @news_items.parent_name@
-      <ul>
-    </if>
+      <multiple name="news_items">
 
-<if @news_items:rowcount@ eq 1>
-	<include src="summary" 
-	item_id="@news_items.item_id@"
-	url="@news_items.view_url@">
-</if>
-<else>
-      <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>
+<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 old_package_id $new_package_id
-%>
-</else>
-</multiple>
+      </multiple>
 
+    </else>
+
   </if>
   <else>
     <small>#news-portlet.No_News#</small>