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.3 -r1.4
--- openacs-4/packages/news-aggregator/www/subscriptions.adp	26 Sep 2003 04:05:51 -0000	1.3
+++ openacs-4/packages/news-aggregator/www/subscriptions.adp	20 Mar 2004 11:12:29 -0000	1.4
@@ -1,56 +1,36 @@
 <master>
+  <property name="title">@page_title@</property>
+  <property name="context">@context@</property>
 
-<property name="title">Subscriptions</property>
+  <p>
+    Enter the URL of an XML news feed you want to subscribe to, then click on the Add button.
+  </p>
 
-<property name="context_bar">@context_bar;noquote@</property>
+  <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>
 
-<p>
+  <if @sources:rowcount@ >
+    <p>
+      The following table lists the XML news feeds you've subscribed to. 
+      To delete a subscription, check it and then click on the Unsubscribe button 
+      at the bottom of the page.
+    </p>
+  </if>
 
-<table cellspacing=0 cellpadding=4 width="80%" border=0 align=center>
-  <tr>
-    <td valign=top>
-
-      Enter the URL of an XML news feed you want to subscribe to in the box below, 
-      then click on the Add button.
-
-      <formtemplate id="add_subscription">
-        URL: <formwidget id="feed_url"><formwidget id="add_submit">
-      </formtemplate>
-
-      <if @sources:rowcount@ >
-
-        The following table lists the XML news feeds you've subscribed to. Included is the name of the 
-	source, linked to its Web page, the time or day it last changed, the number of times it has 
-	changed since you subscribed, and a link to the XML file for the channel. To delete a subscription, 
-	check it and then click on the Unsubscribe button at the bottom of the page.
-      </if>
-
-      <formtemplate id="delete_subscription">
-
-      <blockquote>
-        <table cellspacing=0 cellpadding=0 border=0>
-          <tr>
-            <td bgcolor="#cccccc">
-              <table cellspacing=1 cellpadding=5 border=0 width="100%">  
-	        <multiple name="sources">
-                  <tr bgcolor="#ffffff">
-                    <td><input type="checkbox" name="source_id" value="@sources.source_id@"></td>
-                    <td nowrap><a href="@sources.link@" title="@sources.description@">@sources.title@</a></td>
-                    <td nowrap>@sources.last_scanned@</td>
-	            <td>@sources.updates@</td>
-                    <td><a href="@sources.feed_url@" title="Click to view the current XML source text for the channel.">RSS</a></td>
-                  </tr>
-	        </multiple>
-              </table>
-            </td>
-          </tr>
-        </table>
-      </blockquote>
-
-      <if @sources:rowcount@ >
-        <formwidget id="delete_submit">
-      </if>
-      </formtemplate>
-    </td>
-  </tr>
-</table>
+  <p>
+    <listtemplate name="sources"></listtemplate>
+  </p>