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.16.2.1 -r1.16.2.2
--- openacs-4/packages/news-portlet/www/news-portlet.adp	30 Jul 2008 13:30:35 -0000	1.16.2.1
+++ openacs-4/packages/news-portlet/www/news-portlet.adp	4 Aug 2008 12:06:52 -0000	1.16.2.2
@@ -18,32 +18,41 @@
 
 %>
 
-<if @shaded_p@ ne "t">
+  <if @shaded_p@ ne "t">
+    <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>
+        </div>
+        <div>
+          @notification_chunk;noquote@
+          <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>
+          </if>
+        </div>
+      </div>
+    </if>
+    <if @news_items:rowcount@ gt 0>
+      <if @news_items:rowcount@ eq 1>
 
-  <if @news_items:rowcount@ gt 0>
-
-    <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>
-
+        </multiple>
+        
+      </if>
+      <else>
+        <listtemplate name="news"></listtemplate>    
+      </else>
     </if>
     <else>
-      <listtemplate name="news"></listtemplate>    
+      <small>#news-portlet.No_News#</small>
     </else>
   </if>
   <else>
-    <small>#news-portlet.No_News#</small>
+    <small>
+      #new-portal.when_portlet_shaded#
+    </small>
   </else>
-  <if @inside_comm_p@ >
-    <p><a href="@news_url@news/item-create" title="#news-portlet.Add_a_News_Item#">#news-portlet.Add_a_News_Item#</a></p>
-  </if>
-</if>
-<else>
-  <small>
-    #new-portal.when_portlet_shaded#
-  </small>
-</else>