Index: openacs-4/packages/news-aggregator/www/subscriptions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/subscriptions.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/news-aggregator/www/subscriptions.tcl	20 Aug 2004 09:31:27 -0000	1.7
+++ openacs-4/packages/news-aggregator/www/subscriptions.tcl	28 Dec 2005 17:55:43 -0000	1.7.2.1
@@ -1,5 +1,5 @@
 ad_page_contract {
-  The News Aggregator subscription page.
+  The News Aggregator subscription page (included by manage.adp).
 
   @author Simon Carstensen (simon@bcuni.net)
   @creation-date Jan 2003
@@ -15,9 +15,15 @@
     -object_id $aggregator_id \
     -privilege write
 
-set page_title "Subscriptions"
-set context [list $page_title]
+array set ag_info [news_aggregator::aggregator::aggregator_info -aggregator_id $aggregator_id]
+set page_title "Manage Subscriptions"
 
+if { [exists_and_not_null context] } {
+    lappend context "$page_title"
+} else {
+    set context [list $page_title]
+}
+
 set user_id [ad_conn user_id]
 set package_id [ad_conn package_id]
 set package_url [ad_conn package_url]
@@ -132,7 +138,7 @@
     set xml_graphics_url "${package_url}graphics/xml.gif"
 }
 
-ad_form -name add_subscription -form {
+ad_form -name add_subscription -action subscriptions -form {
     {subscription_id:integer(hidden),key}
     {feed_url:text(text) 
         {value $feed_url_val} 
@@ -160,6 +166,6 @@
     }
     array set channel $channel_array
     set title $channel(title)
-    ad_returnredirect -message "You have been subscribed to $title." subscriptions
+    ad_returnredirect -message "You have been subscribed to $title." "manage?tab=subscriptions"
     ad_script_abort
 }