Index: openacs-4/packages/bboard-portlet/www/bboard-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bboard-portlet/www/bboard-portlet.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/bboard-portlet/www/bboard-portlet.adp	7 Apr 2002 01:32:39 -0000	1.13
+++ openacs-4/packages/bboard-portlet/www/bboard-portlet.adp	12 Apr 2002 08:11:04 -0000	1.14
@@ -27,10 +27,15 @@
     set old_package_id ""
 %>
 
-<multiple name="forums"
+<multiple name="forums">
 
 <% set new_package_id $forums(package_id) %>
 
+  <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@ and @old_package_id@ ne "">
+      <br>
+    </ul>
+  </if>
+
   <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
     <li>@forums.parent_name@
     <ul>
@@ -44,10 +49,6 @@
     set old_package_id $new_package_id
 %>
 
-  <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
-    </ul>
-  </if>
-
 </multiple>
 
   </if>
Index: openacs-4/packages/bboard-portlet/www/bboard-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bboard-portlet/www/bboard-portlet.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/bboard-portlet/www/bboard-portlet.tcl	7 Apr 2002 01:32:39 -0000	1.8
+++ openacs-4/packages/bboard-portlet/www/bboard-portlet.tcl	12 Apr 2002 08:11:04 -0000	1.9
@@ -32,4 +32,6 @@
            bboard_forums.short_name
     from bboard_forums
     where bboard_forums.bboard_id in ([join $list_of_instance_ids ,])
+    order by parent_name,
+             bboard_forums.short_name
 "
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.7 -r1.8
--- openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql	7 Apr 2002 01:32:08 -0000	1.7
+++ openacs-4/packages/faq-portlet/www/faq-portlet-oracle.xql	12 Apr 2002 08:11:38 -0000	1.8
@@ -18,6 +18,7 @@
                  acs_objects
             where faqs.faq_id = acs_objects.object_id
             and acs_objects.context_id in ([join $list_of_package_ids ", "])
+            order by parent_name
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/news-portlet/www/news-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/Attic/news-portlet-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/news-portlet/www/news-portlet-oracle.xql	6 Apr 2002 18:01:38 -0000	1.1
+++ openacs-4/packages/news-portlet/www/news-portlet-oracle.xql	12 Apr 2002 08:11:15 -0000	1.2
@@ -19,6 +19,8 @@
             where news_items_approved.publish_date < sysdate
             and (news_items_approved.archive_date >= sysdate or news_items_approved.archive_date is null)
             and news_items_approved.package_id in ([join $list_of_instance_ids ", "])
+            order by parent_name,
+                     news_items_approved.publish_title
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/news-portlet/www/news-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/news-portlet/www/news-portlet.adp	6 Apr 2002 18:08:55 -0000	1.5
+++ openacs-4/packages/news-portlet/www/news-portlet.adp	12 Apr 2002 08:11:15 -0000	1.6
@@ -31,6 +31,11 @@
 
 <% set new_package_id $news_items(package_id) %>
 
+    <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@ and @old_package_id@ ne "">
+        <br>
+      </ul>
+    </if>
+
     <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
       <li>@news_items.parent_name@
       <ul>
@@ -45,9 +50,6 @@
     set old_package_id $new_package_id
 %>
 
-    <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
-      </ul>
-    </if>
 </multiple>
 
   </if>