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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/classified-ads/www/index.adp	7 Nov 2003 20:02:27 -0000	1.1
@@ -0,0 +1,135 @@
+<master>
+<property name="title">@title@</property>
+<property name="context">@context@</property>
+
+<if @package_category_p@ eq 1>
+
+<p>
+  <a href="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>
+
+</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>
+</else>
Index: openacs-4/contrib/packages/classified-ads/www/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/index.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/classified-ads/www/index.xql	7 Nov 2003 20:02:27 -0000	1.1
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<queryset>
+
+
+    <fullquery name="select_categories">
+        <querytext>
+
+            select *,
+                   (select count(*)
+                    from cr_keywords
+                    where parent_id = ck.keyword_id) as children_count
+            from cr_keywords ck
+            where parent_id = :keyword_id
+            order by heading
+
+        </querytext>
+    </fullquery>
+
+
+</queryset>
Index: openacs-4/contrib/packages/classified-ads/www/doc/bugs.txt
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/doc/bugs.txt,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/classified-ads/www/doc/bugs.txt	7 Nov 2003 20:02:27 -0000	1.1
@@ -0,0 +1,3 @@
+- Fields query don't show keyword-specific fields.
+- Category page should have a link to add new field.
+- ad-new not working.