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.15 -r1.15.2.1
--- openacs-4/packages/news-portlet/www/news-portlet.adp	15 Dec 2006 22:45:39 -0000	1.15
+++ openacs-4/packages/news-portlet/www/news-portlet.adp	16 Feb 2007 18:03:30 -0000	1.15.2.1
@@ -32,39 +32,16 @@
 
     </if>
     <else>
-
-      <multiple name="news_items">
-        <if @one_instance_p@ false><h3>@news_items.parent_name@</h3></if>
-        <ul>
-          <group column="package_id">
-            <if @display_item_content_p@ eq "1">
-	      <li>
-              <p>@news_items.publish_body;noquote@</p>
-                 <if @display_item_attribution_p@ eq "1">
-                   <p>Contributed by <a href="@news_items.creator_url@">@news_items.item_creator@</a></p>
-                 </if>
-	      </li>
-            </if>
-	    <else>
-              <li>
-              <a href="@news_items.url@item?item_id=@news_items.item_id@" title="#news-portlet.show_content_news_items_publish_title#">@news_items.publish_title@</a>
-              <small>(@news_items.publish_date@)</small>
-              </li>
-            </else>
-           </group>
-          </ul>
-        <br/>@news_items.notification_chunk;noquote@
-        <if @news_items.rss_exists@ eq 1>
-	  <br/><a href="@news_items.rss_url;noquote@" title="#news-portlet.news_syndication_feed#">#rss-support.Syndication_Feed#&nbsp;<img src="/resources/xml.gif" alt="Subscribe via RSS" width="26" height="10" border=0 /></a><hr/><br/>
-        </if>
-      </multiple>
+      <listtemplate name="news" style="groups"></listtemplate>    
     </else>
   </if>
   <else>
     <small>#news-portlet.No_News#</small>
   </else>
 </if>
 <else>
-&nbsp;
+  <small>
+    #new-portal.when_portlet_shaded#
+  </small>
 </else>
 <if @inside_comm_p@ ><br><a href="@news_url@news/item-create" title="#news-portlet.Add_a_News_Item#">#news-portlet.Add_a_News_Item#</a></if>
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.18.2.1
--- 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	16 Feb 2007 18:03:30 -0000	1.18.2.1
@@ -59,6 +59,38 @@
     set content_column ""
 }
 
+template::list::create -name news -multirow news_items -key item_id -pass_properties {
+    display_item_content_p
+    one_instance_p
+} -elements {
+    item {
+	label ""
+	display_template {
+           <if @one_instance_p@ false><b>@news_items.parent_name@</b></if></br>
+           <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 ""
+	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 }]
Index: openacs-4/packages/news-portlet/www/summary.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/summary.adp,v
diff -u -N -r1.8 -r1.8.2.1
--- openacs-4/packages/news-portlet/www/summary.adp	15 Dec 2006 22:45:39 -0000	1.8
+++ openacs-4/packages/news-portlet/www/summary.adp	16 Feb 2007 18:03:30 -0000	1.8.2.1
@@ -4,6 +4,6 @@
 @publish_body;noquote@
 @more_link;noquote@
 <if @display_item_attribution_p@ eq "1">
-<p>Contributed by <a href="@creator_url@" title="#news-portlet.goto_item_creator_commpage#">@item_creator@</a></p>
+<p>#news-portlet.Contributed_by# <a href="@creator_url@" title="#news-portlet.goto_item_creator_commpage#">@item_creator@</a></p>
 </if>
 </blockquote>