Index: openacs-4/contrib/packages/classified-ads/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/contrib/packages/classified-ads/www/index.adp	26 Jan 2004 15:39:39 -0000	1.2
+++ openacs-4/contrib/packages/classified-ads/www/index.adp	26 Feb 2004 15:14:56 -0000	1.3
@@ -1,135 +1,19 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <if @package_category_p@ eq 1>
-
-<p>
-  <a href="admin/category-new?parent_id=@keyword_id@&return_url=@return_url@">Create a new top-level category</a>
-</p>
-
-<table border="0" cellspacing="1" cellpadding="2" bgcolor="#006699" width="50%">
-  <tr>
-    <th>
-      <font color="#ffffff">
-        Categories
-      </font>
-    </th>
-  </tr>
-  <tr>
-    <td align="left">
-      <table border="1" cellspacing="0" cellpadding="0" bgcolor="#ffffff" width="100%">
-        <tr>
-	  <th width="50%">Name</th>
-	  <th width="25%">Subcategories</th>
-	  <th width="25%">Action</th>
-	</tr>
-        <multiple name="categories">
-	  <if @categories.rownum@ even>
-            <tr bgcolor="#cccccc">
-	  </if>
-	  <else>
-	    <tr>
-	  </else>
-	      <td>
-                &nbsp;<a href="categories?keyword_id=@categories.keyword_id@">@categories.heading@</a>
-	      </td>
-	      <td align="center"> 
-	        @categories.children_count@
-	      </td>
-	      <td align="center">
-                <a href="category-edit?keyword_id=@categories.keyword_id@&return_url=@return_url@">edit</a>
-                <if @categories.children_count@ eq 0> 
-		  &nbsp;| <a href="category-delete?keyword_id=@categories.keyword_id@&return_url=@return_url@">delete</a>
-		</if>
-              </td>
-	    </tr>
-        </multiple>
-      </table>
-    </td>
-  </tr>
-</table>
-
+    <p>
+        <listtemplate name="assigned_ads"></listtemplate>
+    </p>
+    <p>
+        <h2>Categories</h2>
+    </p>
+    <p>
+        <listtemplate name="categories"></listtemplate>
+    </p>
 </if>
 <else>
-
-      <table border="1" cellspacing="1" cellpadding="2" bgcolor="#ffffff" width="80%">
-        <tr bgcolor="#cccccc">
-	  <th colspan="3">
-            Ads Under This Category <small>(<a href="ad-new?keyword_id=@keyword_id@">place new</a>)
-	  </td>
-	</tr>
-        <tr>
-          <th width="60%">Title</th>
-          <th width="25%">Published on</th>
-          <th width="15%">Action</th>
-        </tr>
-        <if @assigned_ads:rowcount@ gt 0>
-          <multiple name="assigned_ads">
-            <if @assigned_ads.rownum@ odd>
-              <tr bgcolor="#009999">
-            </if>
-            <else>
-              <tr>
-            </else>
-	        <td>
-                  &nbsp;<a href="ad-one?ad_id=@assigned_ads.item_id@">@assigned_ads.title@</a>
-	        </td>
-	        <td align="center"> 
-	          &nbsp;@assigned_ads.pretty_publish_date@ 
-  	        </td>
-	        <td align="center">
-                  <a href="category-unassign?keyword_id=@keyword_id@&item_id=@assigned_ads.item_id@">Remove</a>
-                </td>
-	      </tr>
-          </multiple>
-	</if>
-        <else>
-	  <tr>
-	    <td colspan="3" align="center"> 
-	      <i>No ads assigned to this category.</i> 
-	    </td>
-	  </tr>
-        </else>
-	
-	<!-- Unassigned Ads -->
-
-        <tr bgcolor="#cccccc">
-  	  <th colspan="3">
-            Ads Not Assigned to Any Category
-	  </td>
-	</tr>
-        <tr>
-          <th width="50%">Title</th>
-          <th width="25%">Published on</th>
-          <th width="25%">Action</th>
-        </tr>
-        <if @unassigned_ads:rowcount@ gt 0>
-          <multiple name="unassigned_ads">
-            <if @unassigned_ads.rownum@ odd>
-              <tr bgcolor="#009999">
-            </if>
-            <else>
-              <tr>
-            </else>
-	        <td>
-                  &nbsp;<a href="ad-one?ad_id=@unassigned_ads.item_id@">@unassigned_ads.title@</a>
-	        </td>
-	        <td align="center"> 
-	          &nbsp;@unassigned_ads.pretty_publish_date@ 
-  	        </td>
-	        <td align="center">
-                  <a href="category-assign?keyword_id=@keyword_id@&item_id=@unassigned_ads.item_id@">Assign</a>
-                </td>
-	      </tr>
-          </multiple>
-	</if>
-        <else>
-	  <tr>
-	    <td colspan="3" align="center"> 
-	      <i>No unassigned ads.</i> 
-	    </td>
-	  </tr>
-        </else>
-      </table>
+        <listtemplate name="assigned_ads"></listtemplate>
 </else>
+