Index: openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp	9 Aug 2002 18:39:31 -0000	1.5
+++ openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp	17 Oct 2002 10:39:38 -0000	1.5.2.1
@@ -23,6 +23,12 @@
 <multiple name="faqs">
   <li>
     <a href="@url@admin/one-faq?faq_id=@faqs.faq_id@">@faqs.faq_name@</a>
+	<if @faqs.disabled_p@ eq "t">
+		(Disabled | <a href=faq/admin/faq-enable?faq_id=@faqs.faq_id@&referer=@referer@>Enable</a>)
+	</if>
+	<else>
+		 (<a href=faq/admin/faq-disable?faq_id=@faqs.faq_id@&referer=@referer@>Disable</a>)
+	</else>
   </li>
 </multiple>
   <br>
Index: openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl	9 Aug 2002 18:39:31 -0000	1.5
+++ openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl	17 Oct 2002 10:39:38 -0000	1.5.2.1
@@ -26,6 +26,8 @@
 # Configuration
 array set config $cf	
 
+set referer [ns_conn url]
+
 # Should be a list already! 
 set list_of_package_ids $config(package_id)
 
@@ -38,7 +40,8 @@
 
 db_multirow faqs select_faqs {
     select f.faq_id, 
-           f.faq_name
+           f.faq_name,
+           f.disabled_p
     from faqs f,
          acs_objects o
     where f.faq_id = o.object_id
Index: openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/Attic/faq-portlet-oracle.xql,v
diff -u -r1.9 -r1.9.2.1
--- openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql	4 Jun 2002 00:03:44 -0000	1.9
+++ openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql	17 Oct 2002 10:39:38 -0000	1.9.2.1
@@ -6,7 +6,7 @@
     <fullquery name="select_faqs">
         <querytext>
             select acs_objects.context_id as package_id,
-                   acs_object.name(acs_objects.context_id) as parent_name,
+                   acs_object.name(apm_package.parent_id(acs_objects.context_id)) as parent_name,
                    (select site_node.url(site_nodes.node_id)
                     from site_nodes
                     where site_nodes.object_id = acs_objects.context_id) as url,
@@ -15,8 +15,9 @@
             from faqs,
                  acs_objects
             where faqs.faq_id = acs_objects.object_id
+	    and faqs.disabled_p <> 't'
             and acs_objects.context_id in ([join $list_of_package_ids ", "])
-            order by parent_name
+            order by lower(faq_name)
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/faq-portlet/www/faq-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/Attic/faq-portlet-postgresql.xql,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/faq-portlet/www/faq-portlet-postgresql.xql	17 Jul 2002 20:20:31 -0000	1.1
+++ openacs-4/packages/faq-portlet/www/faq-portlet-postgresql.xql	17 Oct 2002 10:39:38 -0000	1.1.2.1
@@ -6,7 +6,7 @@
     <fullquery name="select_faqs">
         <querytext>
             select acs_objects.context_id as package_id,
-                   acs_object__name(acs_objects.context_id) as parent_name,
+                   acs_object__name(apm_package__parent_id(acs_objects.context_id)) as parent_name,
                    (select site_node__url(site_nodes.node_id)
                     from site_nodes
                     where site_nodes.object_id = acs_objects.context_id) as url,
@@ -15,9 +15,10 @@
             from faqs,
                  acs_objects
             where faqs.faq_id = acs_objects.object_id
+	    and faqs.disabled_p <> 't'
             and acs_objects.context_id in ([join $list_of_package_ids ", "])
-            order by parent_name
+            order by lower(faq_name)
         </querytext>
     </fullquery>
 
-</queryset>
\ No newline at end of file
+</queryset>
Index: openacs-4/packages/faq-portlet/www/faq-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-portlet.adp,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/faq-portlet/www/faq-portlet.adp	9 Aug 2002 18:39:31 -0000	1.13
+++ openacs-4/packages/faq-portlet/www/faq-portlet.adp	17 Oct 2002 10:39:38 -0000	1.13.2.1
@@ -28,10 +28,10 @@
 %>
 
     <if @one_instance_p@ false>
-      <table border="0" bgcolor="white" cellpadding="2" cellspacing="3" width="100%">
-        <tr>
-          <td><strong>Name</strong></td>
-          <td><strong>Group</strong></td>
+      <table border="0" bgcolor="white" cellpadding="2" cellspacing="0" width="100%">
+        <tr class="table-header">
+          <td><strong class="table-header">Name</strong></td>
+          <td><strong class="table-header">Group</strong></td>
         </tr>
     </if>
 
@@ -50,10 +50,10 @@
     </if>
     <else>
       <if @faqs.rownum@ odd>
-        <tr bgcolor="#eeeeee">
+        <tr class="z_light">
       </if>
       <else>
-        <tr bgcolor="#ffffff">
+        <tr class="z_dark">
       </else>
         <td><a href="@faqs.url@one-faq?faq_id=@faqs.faq_id@">@faqs.faq_name@</a></td>
         <td>@faqs.parent_name@</td>
@@ -91,3 +91,9 @@
 <else>
   &nbsp;
 </else>
+
+
+
+
+
+