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 -r1.12.2.8 -r1.12.2.9
--- openacs-4/packages/news-aggregator/www/index.adp	17 Jan 2006 23:07:28 -0000	1.12.2.8
+++ openacs-4/packages/news-aggregator/www/index.adp	18 Jan 2006 15:25:17 -0000	1.12.2.9
@@ -9,9 +9,9 @@
 <table border="0">
   <tr>
    <td width="100%" valign="top">
-    <h2>@aggregator_name@</h2>
+    <h2>@aggregator_name;noquote@</h2>
     <if @aggregator_description@ not nil>
-      @aggregator_description@
+      @aggregator_description;noquote@
     </if>
     <else>
       This page lists <b>the most recent items</b> from the feeds you've <a href="@url@manage?tab=subscriptions">subscribed</a> to.
@@ -52,64 +52,12 @@
   <i>#news-aggregator.No_items#</i>
 </if>
 <else>
- <multiple name="items">
-   <group column="pub_date"> 
-      <div style="background-color: #eeeeee; padding-top: 6px; padding-bottom: 6px; padding-left: 4px; margin-top: 10px; margin-bottom: 10px;">
-       <span style="font-size: 125%; font-weight: bold;"><a href="@items.link@" title="@items.description@">@items.title;noquote@</a></span>, from @items.chunk_updated@
-      </div>
-       <group column="source_id">
-        <if @items.show_description_p@ true>
-          <div style="margin-left: 10px; margin-top: 15px; margin-bottom: 15px;">
-           <a name="@items.item_id@">
-           <div style="font-size: 115%; font-weight: bold; margin-bottom: 5px;">
-            <if @items.item_title@ not nil>
-             <a href="@items.item_link@">@items.item_title;noquote@</a>
-            </if>
-           </div>
-           <div class="item_pub_time" style="margin-bottom: 5px;">Posted: @items.pub_time@
-            <if @items.item_link@ not nil and @items.item_guid_link@ not nil>
-             <a href="@items.item_guid_link@" title="Permanent URL for this entry">#</a>
-            </if>        
-           </div>
-           @items.content;noquote@
-           <div style="margin-top: 10px; margin-bottom: 10px;" class="list-button-bar">
-            <if @write_p@ true>
-             <if @items.save_url@ not nil>
-               <a href="@items.save_url@" alt="Save" class="button">Save</a>
-             </if>
-             <if @items.unsave_url@ not nil>
-              <a href="@items.unsave_url@" alt="Unsave" class="button">Unsave</a>
-             </if>
-            </if>
-            <if @blog_p@ true>
-             <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">Blog</a>
-            </if>
-           </div>
-          </div>
-        </if>
-        <else>
-          <div style="margin-left: 10px; margin-top:5px; margin-bottom: 5px;">
-          <a name="@items.item_id@">
-            <span style="font-size: 110%;"><a href="@items.item_link@">@items.item_title;noquote@</a></span>
-            Posted: @items.pub_time@&nbsp;
-            <if @items.item_link@ not nil and @items.item_guid_link@ not nil>
-             <a href="@items.item_guid_link@" title="Permanent URL for this entry">#</a>
-            </if>&nbsp;
-            <if @write_p@ true>
-            <if @items.save_url@ not nil>
-              <a href="@items.save_url@" alt="Save" class="button">Save</a>
-            </if>
-            <if @items.unsave_url@ not nil>
-             <a href="@items.unsave_url@" alt="Unsave" class="button">Unsave</a>
-            </if>
-            </if>
-            <if @blog_p@ true>
-              <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">Blog</a>
-            </if></div>
-        </else>
-       </group>
-    </group>
-  </multiple>
+ <if @multiple_sources_p@ false>
+   <include src="single-source-chunk" blog_p="@blog_p@" write_p="@write_p@" &items="items">
+ </if>
+ <else>
+   <include src="multi-source-chunk" blog_p="@blog_p@" write_p="@write_p@" &items="items">
+ </else>
 </else>
 
 <if @enable_purge_p@ true and @public_p@ false and @purge@ true and @purge_p@ true>