Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	2 Jun 2002 00:05:56 -0000	1.22
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	4 Jun 2002 15:44:47 -0000	1.23
@@ -63,20 +63,19 @@
 
   <li>@sub_pretty_plural@
     <ul>
-      <if @subgroups:rowcount@ gt 0>
-        <multiple name="subgroups">
-          <li>
-            <a href="@subgroups.url@">@subgroups.pretty_name@</a>
-            [<small>
-              <a href="@subgroups.url@one-community-admin">Administer</a>
-              |
-              <a href="subcommunity-archive?community_id=@subgroups.community_id@">Archive</a>
-            </small>]
-          </li>
-        </multiple>
-        <br>
-      </if>
-      <li><a href="subcommunity-new">New @sub_pretty_name@</a></ul>
+<multiple name="subgroups">
+      <li>
+        <a href="@subgroups.url@">@subgroups.pretty_name@</a>
+        <nobr><small>[
+          <a href="@subgroups.url@one-community-admin">Administer</a>
+          |
+          <a href="subcommunity-archive?community_id=@subgroups.community_id@">Archive</a>
+        ]</small></nobr>
+      </li>
+</multiple>
+      <br>
+      <li><a href="subcommunity-new">New @sub_pretty_name@</a>
+    </ul>
   </li>
   <br>
   
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.2 -r1.3
--- openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp	29 Mar 2002 19:25:19 -0000	1.2
+++ openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp	4 Jun 2002 15:44:47 -0000	1.3
@@ -19,17 +19,12 @@
 %>
 
 
-<if @faqs:rowcount@ eq 0>
-<i>No FAQs</i>
-</if>
-<else>
 <ul>
 <multiple name="faqs">
-<li><a href=@url@one-faq?faq_id=@faqs.faq_id@>@faqs.faq_name@</a> &nbsp; - &nbsp; <a href=@url@admin/one-faq?faq_id=@faqs.faq_id@>Administration</a>
+  <li>
+    <a href="@url@admin/one-faq?faq_id=@faqs.faq_id@">@faqs.faq_name@</a>
+  </li>
 </multiple>
+  <br>
+  <li<a href=@url@admin/faq-new>New FAQ</a></li>
 </ul>
-</else>
-<p>
-<a href=@url@admin/faq-new>New FAQ</a>
-
-
Index: openacs-4/packages/forums-portlet/www/forums-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-admin-portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums-portlet/www/forums-admin-portlet.adp	2 Jun 2002 14:28:43 -0000	1.2
+++ openacs-4/packages/forums-portlet/www/forums-admin-portlet.adp	4 Jun 2002 15:44:47 -0000	1.3
@@ -18,15 +18,14 @@
 
 %>
 
-<if @forums:rowcount@ eq 0>
-  <small>No forums</small>
-</if>
-<else>
-  <ul>
+<ul>
 <multiple name="forums">
-    <li><a href=@url@forum-view?forum_id=@forums.forum_id@>@forums.name@</a>&nbsp;-&nbsp;<a href=@url@forum-edit?forum_id=@forums.forum_id@>Administration</a>
+  <li>
+    <a href="@url@forum-edit?forum_id=@forums.forum_id@">@forums.name@</a>
+  </li>
 </multiple>
-  </ul>
-</else>
-<p>
-<a href="@url@admin/forum-new?name=@encoded_default_name@">New Forum</a>
+  <br>
+  <li>
+    <a href="@url@admin/forum-new?name=@encoded_default_name@">New Forum</a>
+  </li>
+</ul>
Index: openacs-4/packages/forums-portlet/www/forums-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums-portlet/www/forums-portlet.adp	2 Jun 2002 19:43:13 -0000	1.3
+++ openacs-4/packages/forums-portlet/www/forums-portlet.adp	4 Jun 2002 15:44:47 -0000	1.4
@@ -18,7 +18,6 @@
 
 %>
 
-<if @can_read_private_data_p@>
 <if @shaded_p@ ne "t">
 
   <if @forums:rowcount@ gt 0>
@@ -61,4 +60,3 @@
 <else>
   &nbsp;
 </else>
-</if>
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	1 Jun 2002 02:14:57 -0000	1.2
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.adp	4 Jun 2002 15:44:47 -0000	1.3
@@ -18,7 +18,6 @@
 
 %>
 
-<if @config.shaded_p@ false>
   <if @folders:rowcount@ eq 0>
     <small>Folder is empty</small>
   </if>
@@ -82,7 +81,3 @@
   </if>
 
 </else>
-</if>
-<else>
-  &nbsp;
-</else>
Index: openacs-4/packages/static-portlet/www/static-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/static-admin-portlet.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/static-portlet/www/static-admin-portlet.adp	24 May 2002 01:58:45 -0000	1.9
+++ openacs-4/packages/static-portlet/www/static-admin-portlet.adp	4 Jun 2002 15:44:47 -0000	1.10
@@ -18,16 +18,14 @@
 
 %>
 
-<if @content:rowcount@ eq 0>
-  <i>No @element_pretty_plural@</i>
-</if>
-<else>
-  <ul>
-    <multiple name="content">
-      <li> <a href=@applet_url@/element?portal_id=@template_portal_id@&content_id=@content.content_id@&referer=@referer@>@content.pretty_name@</a>
-    </multiple>
-  </ul>
-</else>
-
-<p>
-<a href=@applet_url@/element-new?package_id=@package_id@&portal_id=@template_portal_id@&referer=@referer@>New @element_pretty_name@</a>
+<ul>
+<multiple name="content">
+  <li>
+    <a href="@applet_url@/element?portal_id=@template_portal_id@&content_id=@content.content_id@&referer=@referer@">@content.pretty_name@</a>
+  </li>
+</multiple>
+  <br>
+  <li>
+    <a href="@applet_url@/element-new?package_id=@package_id@&portal_id=@template_portal_id@&referer=@referer@">New @element_pretty_name@</a>
+  </li>
+</ul>