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.18 -r1.19
--- openacs-4/packages/news-portlet/www/news-portlet.adp	14 Jul 2015 22:36:41 -0000	1.18
+++ openacs-4/packages/news-portlet/www/news-portlet.adp	7 Aug 2017 23:48:12 -0000	1.19
@@ -22,10 +22,15 @@
     <if @inside_comm_p@ >
       <div style="padding-top:0.2em; padding-bottom:0.3em;">
         <div style="float:right;">
-          <a href="@news_url@news/item-create" title="#news-portlet.Add_a_News_Item#" class="button">#news-portlet.Add_a_News_Item#</a>
+          <a href="@news_url@item-create" title="#news-portlet.Add_a_News_Item#" class="button">#news-portlet.Add_a_News_Item#</a>
         </div>
         <div>
-          @notification_chunk;noquote@
+<if @news_url@ not nil>
+<include src="/packages/notifications/lib/notification-widget" type="one_news_item_notif"
+     object_id="@package_id;literal@"
+     pretty_name="News"
+     url="@news_url;literal@" >
+</if>    
           <if @rss_exists@ eq 1>
             <br>
               <a href="@rss_url@"><img src="/resources/xml.gif" alt="Subscribe via RSS" width="26" height="10" style="border:0; padding-right:3px">#rss-support.Syndication_Feed#</a>
@@ -44,7 +49,24 @@
         
       </if>
       <else>
-        <listtemplate name="news"></listtemplate>    
+
+        <multiple name="news_items">
+          <if @one_instance_p;literal@ false>
+            <h3 class="portlet">@news_items.parent_name@</h3>
+          </if>
+
+          <ul>
+            <group column="package_id">
+              <li>
+                <a href="@news_items.view_url@">@news_items.publish_title@</a>
+                (<if @display_item_attribution_p;literal@ true>#news-portlet.Contributed_by# @news_items.item_creator@ - </if>@news_items.publish_date@)
+                <if @display_item_lead_p;literal@ true> <br>@news_items.publish_lead@</if>
+                <if @display_item_content_p;literal@ true> <br>@news_items.publish_body@</if>
+              </li>
+            </group>
+          </ul>
+        </multiple>
+
       </else>
     </if>
     <else>