Index: openacs-4/packages/news-aggregator/www/subscriptions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/subscriptions.adp,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/news-aggregator/www/subscriptions.adp	28 Dec 2005 17:55:43 -0000	1.5.2.1
+++ openacs-4/packages/news-aggregator/www/subscriptions.adp	4 Jan 2006 05:28:09 -0000	1.5.2.2
@@ -1,27 +1,14 @@
+<master>
 
   <property name="title">@page_title@</property>
   <property name="context">@context@</property>
-
+  
+  <include src="aggregator-tabs" tab="subscriptions">
   <p>
-    Enter the URL of an XML news feed you want to subscribe to, then click on the Add button.
+    Enter the URL of an XML news feed you want to subscribe to or choose a feed the system already knows about and then click on the Add button.
   </p>
 
-  <formtemplate id="add_subscription">
-    <table cellspacing="0" cellpadding="2"<if @formerror@ not nil>
-		style="border: 1px red dashed"</if>>
-      <tr>
-        <td>
-          <b>Source URL</b>: <formwidget id="feed_url">
-          <formwidget id="add_submit">
-          <if @new_source_id@ not nil and @new_source_title@ not nil>
-            <p class="subscribed" align="center">
-              Congratulations, you have been subscribed to <b>@new_source_title@</b>.
-            </p>
-          </if>
-        </td>
-      </tr>
-    </table>
-  </formtemplate>
+  <formtemplate id=add_subscription></formtemplate>
 
   <if @sources:rowcount@ >
     <p>