Index: openacs-4/packages/news-aggregator/news-aggregator.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/news-aggregator.info,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/news-aggregator/news-aggregator.info	20 Aug 2004 09:11:37 -0000	1.12
+++ openacs-4/packages/news-aggregator/news-aggregator.info	20 Aug 2004 09:31:12 -0000	1.13
@@ -21,7 +21,9 @@
         <callbacks>
         </callbacks>
         <parameters>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="AllowAggregatorEditP"  default="1" description="Should user be allowed to edit aggregator properties?"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="EnablePurgeP"  default="1" description="Should we enable purges at all?"/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="MultipleAggregatorsP"  default="1" description="Should uses have the option of having multiple aggregators?"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="PerUserAggregatorsP"  default="1" description="Should registered users automatically get their own news aggregator when they visit the News Aggregator instance node the first time, or should they only be allowed to manually create an aggregator of their own if they are given 'write' privilege on the instance? 1 for the previous and 0 for the latter."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="blogger_url"  description="What is the URL for the lars-blogger instance we should post item content to, relative to the server root. Leave blank if no post button."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="max_purges"  default="5" description="The maximum number of purges per aggregator before we clear &quot;holes&quot;"/>
Index: openacs-4/packages/news-aggregator/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/index.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/news-aggregator/www/index.adp	20 Aug 2004 09:11:40 -0000	1.11
+++ openacs-4/packages/news-aggregator/www/index.adp	20 Aug 2004 09:31:27 -0000	1.12
@@ -8,16 +8,22 @@
 <if @write_p@ true>
   <p>
     <b>&raquo;</b> <a href="@url@subscriptions">#news-aggregator.Manage_Subscriptions#</a> <br />
-    <b>#news-aggregator.raquo#</b> <a href="@aggregator_url@">#news-aggregator.lt_Manage_This_Aggregato#</a> <br />
-    <b>#news-aggregator.raquo#</b> <a href="@create_url@">#news-aggregator.lt_Create_New_Aggregator#</a><br />
+    <if @allow_aggregator_edit_p@ true>
+        <b>#news-aggregator.raquo#</b> <a href="@aggregator_url@">#news-aggregator.lt_Manage_This_Aggregato#</a> <br />
+    </if>
+    <if @multiple_aggregators_p@ true>
+        <b>#news-aggregator.raquo#</b> <a href="@create_url@">#news-aggregator.lt_Create_New_Aggregator#</a><br />
+    </if>
   <p>
     <if @aggregator_description@ not nil>
       @aggregator_description@
     </if>
     <else>
       This page lists <b>the most recent items</b> from the feeds you've <a href="@url@subscriptions">subscribed</a> to.
-      You can hit the <b>Purge button</b> to clean out the page. Clicking the <b>Save</b> icon <img border="0" src="@graphics_url@save.gif" width="16" height="16" alt="Save" /> will prevent an item from being purged.
-      Click on the <b>#news-aggregator.Post#</b> icon <img border="0" src="@graphics_url@post.gif" width="16" height="16" alt="Post this item to your Weblog" /> to add the item to your weblog.
+      <if @enable_purge_p@ true>
+          You can hit the <b>Purge button</b> to clean out the page. Clicking the <b>Save</b> icon <img border="0" src="@graphics_url@save.gif" width="16" height="16" alt="Save" /> will prevent an item from being purged.
+          Click on the <b>#news-aggregator.Post#</b> icon <img border="0" src="@graphics_url@post.gif" width="16" height="16" alt="Post this item to your Weblog" /> to add the item to your weblog.
+      </if>
     </else>
   </p>
 </if>
Index: openacs-4/packages/news-aggregator/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/index.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/news-aggregator/www/index.tcl	20 Aug 2004 09:11:41 -0000	1.8
+++ openacs-4/packages/news-aggregator/www/index.tcl	20 Aug 2004 09:31:27 -0000	1.9
@@ -13,7 +13,10 @@
 set package_url [ad_conn package_url]
 set per_user_aggregators_p [parameter::get -package_id $package_id -parameter PerUserAggregatorsP -default 0]
 set enable_purge_p [parameter::get -package_id $package_id -parameter EnablePurgeP -default 1]
+set multiple_aggregators_p [parameter::get -package_id $package_id -parameter MultipleAggregatorsP -default 1]
+set allow_aggregator_edit_p [parameter::get -package_id $package_id -parameter AllowAggregatorEditP -default 1]
 
+
 if { ![info exists aggregator_id] } {
     # Check whether the user has an aggregator
     if { !$user_id } {
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 -N -r1.4 -r1.5
--- openacs-4/packages/news-aggregator/www/subscriptions.adp	20 Mar 2004 11:12:29 -0000	1.4
+++ openacs-4/packages/news-aggregator/www/subscriptions.adp	20 Aug 2004 09:31:27 -0000	1.5
@@ -3,6 +3,10 @@
   <property name="context">@context@</property>
 
   <p>
+    <a href="./">Back to news aggregator</a>
+  </p>
+
+  <p>
     Enter the URL of an XML news feed you want to subscribe to, then click on the Add button.
   </p>
 
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 -N -r1.6 -r1.7
--- openacs-4/packages/news-aggregator/www/subscriptions.tcl	31 May 2004 13:57:01 -0000	1.6
+++ openacs-4/packages/news-aggregator/www/subscriptions.tcl	20 Aug 2004 09:31:27 -0000	1.7
@@ -78,7 +78,6 @@
     -row_pretty_plural "subscriptions" \
     -actions {
        "Export Subscriptions" "opml" "Export your subscriptions as an OPML file"
-       "Import Subscriptions" "opml-import" "Import your subscriptions from an OPML file"
     } -bulk_actions $bulk_actions -elements {
         title {
             label "Name"