Index: openacs-4/packages/news-portlet/www/news-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.tcl,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/news-portlet/www/news-portlet.tcl	8 Aug 2006 21:27:05 -0000	1.18
+++ openacs-4/packages/news-portlet/www/news-portlet.tcl	15 May 2007 20:14:51 -0000	1.19
@@ -59,6 +59,41 @@
     set content_column ""
 }
 
+template::list::create -name news -multirow news_items -key item_id -html {width 100%} -pass_properties {
+    display_item_content_p
+    one_instance_p
+} -elements {
+    item {
+	label ""
+	html {valign top}
+	display_template {
+           <if @one_instance_p@ false><b>@news_items.parent_name@</b><br/></if>	   
+           <group column="package_id">
+            <if @display_item_content_p@ eq "1">
+	    <p>@news_items.publish_body;noquote@</p>
+                 <if @display_item_attribution_p@ eq "1">
+                   <p>#news-portlet.Contributed_by# <a href="@news_items.creator_url@">@news_items.item_creator@</a>
+                 </if>
+            </if>
+            <else>
+	      &raquo; <a href="@news_items.url@item?item_id=@news_items.item_id@">@news_items.publish_title@</a> 
+              <small>@news_items.publish_date@</small>
+            </else>
+                <if @news_items.rss_exists@ eq 1>
+	        <a href="@news_items.rss_url;noquote@"><img src="/resources/xml.gif" alt="Subscribe via RSS" width="26" height="10" border=0 /></a>
+                </if><br/>
+           </group>
+	}
+    }
+    action {
+	label ""
+	html {valign top}
+	display_template {
+	    @news_items.notification_chunk;noquote@
+	}
+    }
+}
+
 db_multirow -extend { publish_date view_url rss_exists rss_url notification_chunk} news_items select_news_items {} {
     set publish_date [lc_time_fmt $publish_date_ansi "%x"]
     set view_url [export_vars -base "${url}item" { item_id }]