Index: openacs-4/contrib/packages/classified-ads/www/categories.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/categories.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/classified-ads/www/categories.adp	17 Jul 2003 21:30:13 -0000	1.2
+++ openacs-4/contrib/packages/classified-ads/www/categories.adp	21 Jul 2003 16:08:07 -0000	1.3
@@ -2,57 +2,130 @@
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
-<h3>Categories</h3>
-
 <if @package_category_p@ eq 1>
-  <p>
-    No categories have been defined.
-  </p>
-</if>
-<else>
-  <if @categories:rowcount@ gt 0>
-    <p>
-      <ul>
+
+<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">
-          <li> 
-            <a href="categories?keyword_id=@categories.keyword_id@">@categories.heading@</a> 
-	    (Subcategories: @categories.children_count@)
-	  </li>
+	  <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>
-      </ul>
-    </p>
-  </if>
-</else>
+      </table>
+    </td>
+  </tr>
+</table>
 
-<if @assigned_ads:rowcount@ gt 0>
-  <h4>Ads under this category</h3>
-  <ul>
-    <multiple name="assigned_ads">
-      <li> <a href="ad-view?ad_id=@assigned_ads.item_id@">@assigned_ads.title@</a>
-    </multiple>
-  </ul>
-
-  <p>
-    <a href="ad-new?keyword_id=@keyword_id@">Place a new ad under this category</a>.
-  </p>
 </if>
 <else>
-  <p>
-    <if @package_category_p@ eq 1>
-      <a href="ad-new?keyword_id=@keyword_id@">Place a new ad without category</a>.
-    </if>
-    <else>
-      <i>No ads assigned under this category</i>
-      <a href="ad-new?keyword_id=@keyword_id@">Place a new ad under this category</a>.
-    </else>
-  </p>
-</else>
 
-<if @unassigned_ads:rowcount@ gt 0 and @keyword_id@ nil>
-  <h3>Ads not assigned to any category</h3> 
-  <ul>
-    <multiple name="unassigned_ads">
-      <li> <a href="ad-view?ad_id=@unassigned_ads.item_id@">@unassigned_ads.title@</a> </li>
-    </multiple>
-  </ul>
-</if>
+      <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/categories.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/categories.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/classified-ads/www/categories.tcl	16 Jul 2003 04:52:32 -0000	1.1
+++ openacs-4/contrib/packages/classified-ads/www/categories.tcl	21 Jul 2003 16:08:07 -0000	1.2
@@ -3,6 +3,7 @@
     Classified Ads Administration
 
     @author Deds Castillo (deds@infiniteinfo.com)
+    @author Roberto Mello
     @creation-date 2002-10-08
     @cvs-id $Id$
 
@@ -13,13 +14,18 @@
 set root_folder_id [classified-ads::get_root_folder_id]
 set package_category_id [classified-ads::categories::package_category_exists_p]
 set package_category_p 0
+set title "Categories"
 
 if {[empty_string_p $keyword_id]} {
     set keyword_id $package_category_id
     set package_category_p 1
 } elseif {[string equal [classified-ads::main_keyword_exists_p] $keyword_id]} {
-    ad_return_complaint 1 "<li>no access to the root id"
+    ad_return_complaint 1 "<li> No access to the root id"
     ad_script_abort
+} else {
+    # Select info for this category
+    classified-ads::categories::get -keyword_id $keyword_id -array category_info
+    set title $category_info(heading)
 }
 
 db_multirow categories select_categories {}
@@ -33,8 +39,6 @@
     -var_name assigned_ads
 
 set return_url "[ad_conn url]?[ad_conn query]"
-
-set title "Categories"
 set context [classified-ads::categories::generate_trail -keyword_id $keyword_id]
 
 ad_return_template
Index: openacs-4/contrib/packages/classified-ads/www/admin/categories.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/admin/categories.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/classified-ads/www/admin/categories.tcl	17 Jul 2003 23:11:35 -0000	1.2
+++ openacs-4/contrib/packages/classified-ads/www/admin/categories.tcl	21 Jul 2003 16:08:07 -0000	1.3
@@ -3,6 +3,7 @@
     Classified Ads Administration
 
     @author Deds Castillo (deds@infiniteinfo.com)
+    @author Roberto Mello
     @creation-date 2002-10-08
     @cvs-id $Id$
 
Index: openacs-4/contrib/packages/classified-ads/www/admin/field-addedit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/admin/field-addedit-postgresql.xql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/contrib/packages/classified-ads/www/admin/field-addedit-postgresql.xql	21 Jul 2003 16:08:07 -0000	1.1
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<queryset>
+
+    <fullquery name="attribute_new">
+	<querytext>
+	    select ca_attributes__create_attribute (:content_type::varchar, :attribute_name::varchar, :datatype::varchar, :pretty_name::varchar, :pretty_plural::varchar, :sort_order::int4, :default_value::varchar, 'type_specific'::varchar, 'cr_ca_ads'::varchar, :column_spec::varchar, :package_id::int4) as attribute_id
+	</querytext>
+    </fullquery>
+
+    <fullquery name="widget_new">
+	<querytext>
+	    select ca_attributes__register_widget (:attribute_id, :widget, :label, :html_options, :select_options, :validate, :optional_p)
+	</querytext>
+    </fullquery>
+
+</queryset>
Index: openacs-4/contrib/packages/classified-ads/www/admin/field-addedit.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/admin/field-addedit.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/classified-ads/www/admin/field-addedit.xql	16 Jul 2003 04:52:32 -0000	1.1
+++ openacs-4/contrib/packages/classified-ads/www/admin/field-addedit.xql	21 Jul 2003 16:08:07 -0000	1.2
@@ -51,17 +51,5 @@
 	</querytext>
     </fullquery>
 
-    <fullquery name="attribute_new">
-	<querytext>
-	    select ca_attributes__create_attribute (:content_type::varchar, :attribute_name::varchar, :datatype::varchar, :pretty_name::varchar, :pretty_plural::varchar, :sort_order::int4, :default_value::varchar, 'type_specific'::varchar, 'cr_ca_ads'::varchar, :column_spec::varchar, :package_id::int4) as attribute_id
-	</querytext>
-    </fullquery>
-
-    <fullquery name="widget_new">
-	<querytext>
-	    select ca_attributes__register_widget (:attribute_id, :widget, :label, :html_options, :select_options, :validate, :optional_p)
-	</querytext>
-    </fullquery>
-
 </queryset>
 
Index: openacs-4/contrib/packages/classified-ads/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/classified-ads/www/doc/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/classified-ads/www/doc/index.adp	18 Jul 2003 02:47:33 -0000	1.2
+++ openacs-4/contrib/packages/classified-ads/www/doc/index.adp	21 Jul 2003 16:08:07 -0000	1.3
@@ -41,11 +41,24 @@
   <li> Make it possible to place an ad under a category, instead of placing 
        under no category then assigning it to one. (DONE - Roberto) </li>
   <li> Fix all the FIXME's in the code. </li>
-  <li> Give users a better UI for placing and viewing ads (will be done soon - Roberto)
+  <li> Give users a better UI for placing and viewing ads (DONE - Roberto)
   <li> Add searching functionality.
   <li> Integrate with notifications so users can be notified of new ads.
   <li> Integrate with RSS so news aggregators can pick up new items (crazy idea? -Roberto)
   <li> Give users a confirmation screen when placing new ads.
-  <li> Better admin user interface, especially for managing categories (DONE - Roberto)
+  <li> Main index page shows last x placed ads.
+  <li> Category index page shows last x placed ads. Select box with all subcategories and
+       number of ads in them. Notifications link. Table on the right shows available
+       actions (Search, Post, Edit/Delete Your Posts, Get E-mail Alerts, New Since Last Visit).
+  <li> general-comments integration.
+  <li> Make it so custom fields can be added on a per-category basis.
+  <li> general-ratings for users (for the future).
 </ul>
 
+<ul>Admin UI:
+  <li> Better admin user interface for managing categories (DONE - Roberto)
+  <li> Main Admin page: "View ads from last x days", "All ads", "All ads by category", "Pick out users who
+       have posted at least x times between date_1 and date_2", "View alerts", "Manage Categories", 
+       "Add moderators for this category", "Edit this category", "Delete this category".
+</ul>
+