Index: openacs-4/contrib/packages/portal/lib/layouts/simple1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/layouts/Attic/simple1.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/lib/layouts/simple1.adp	22 Mar 2004 01:57:37 -0000	1.2
+++ openacs-4/contrib/packages/portal/lib/layouts/simple1.adp	22 Mar 2004 02:24:27 -0000	1.3
@@ -21,13 +21,15 @@
 <!-- A simple 2-column thingy. -->
 <table border="0" width="100%">
   <tr>
-      <td valign="top" width="50%">
-        <list name="element_ids" value="@elements.1@">
-          <include src="@page.element_src@"
-                   edit_p="@edit_p@"
-                   element_id="@element_ids:item@">
-          <br>
-        </list>
+      <td valign="top" width="100%">
+        <if @elements.1@ not nil>
+          <list name="element_ids" value="@elements.1@">
+            <include src="@page.element_src@"
+                     edit_p="@edit_p@"
+                     element_id="@element_ids:item@">
+            <br>
+          </list>
+        </if>
       </td>
   </tr>
 </table>
Index: openacs-4/contrib/packages/portal/lib/layouts/simple2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/layouts/Attic/simple2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/lib/layouts/simple2.adp	22 Mar 2004 01:57:37 -0000	1.2
+++ openacs-4/contrib/packages/portal/lib/layouts/simple2.adp	22 Mar 2004 02:24:27 -0000	1.3
@@ -22,20 +22,24 @@
 <table border="0" width="100%">
   <tr>
       <td valign="top" width="50%">
-        <list name="element_ids" value="@elements.1@">
-          <include src="@page.element_src@"
-                   edit_p="@edit_p@"
-                   element_id="@element_ids:item@">
-          <br>
-        </list>
+        <if @elements.1@ not nil>
+          <list name="element_ids" value="@elements.1@">
+            <include src="@page.element_src@"
+                     edit_p="@edit_p@"
+                     element_id="@element_ids:item@">
+            <br>
+          </list>
+        </if>
       </td>
       <td valign="top" width="50%">
-        <list name="element_ids" value="@elements.2@">
-          <include src="@page.element_src@"
-                   edit_p="@edit_p@"
-                   element_id="@element_ids:item@">
-          <br>
-        </list>
+        <if @elements.2@ not nil>
+          <list name="element_ids" value="@elements.2@">
+            <include src="@page.element_src@"
+                     edit_p="@edit_p@"
+                     element_id="@element_ids:item@">
+            <br>
+          </list>
+        </if>
       </td>
   </tr>
 </table>
Index: openacs-4/contrib/packages/portal/lib/layouts/simple3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/lib/layouts/Attic/simple3.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/lib/layouts/simple3.adp	22 Mar 2004 01:57:37 -0000	1.2
+++ openacs-4/contrib/packages/portal/lib/layouts/simple3.adp	22 Mar 2004 02:24:27 -0000	1.3
@@ -21,29 +21,35 @@
 <!-- A simple 2-column thingy. -->
 <table border="0" width="100%">
   <tr>
-      <td valign="top" width="50%">
-        <list name="element_ids" value="@elements.1@">
-          <include src="@page.element_src@"
-                   edit_p="@edit_p@"
-                   element_id="@element_ids:item@">
-          <br>
-        </list>
+      <td valign="top" width="33%">
+        <if @elements.1@ not nil>
+          <list name="element_ids" value="@elements.1@">
+            <include src="@page.element_src@"
+                     edit_p="@edit_p@"
+                     element_id="@element_ids:item@">
+            <br>
+          </list>
+        </if>
       </td>
-      <td valign="top" width="50%">
-        <list name="element_ids" value="@elements.2@">
-          <include src="@page.element_src@"
-                   edit_p="@edit_p@"
-                   element_id="@element_ids:item@">
-          <br>
-        </list>
+      <td valign="top" width="33%">
+        <if @elements.2@ not nil>
+          <list name="element_ids" value="@elements.2@">
+            <include src="@page.element_src@"
+                     edit_p="@edit_p@"
+                     element_id="@element_ids:item@">
+            <br>
+          </list>
+        </if>
       </td>
-      <td valign="top" width="50%">
-        <list name="element_ids" value="@elements.3@">
-          <include src="@page.element_src@"
-                   edit_p="@edit_p@"
-                   element_id="@element_ids:item@">
-          <br>
-        </list>
+      <td valign="top" width="33%">
+        <if @elements.3@ not nil>
+          <list name="element_ids" value="@elements.3@">
+            <include src="@page.element_src@"
+                     edit_p="@edit_p@"
+                     element_id="@element_ids:item@">
+            <br>
+          </list>
+        </if>
       </td>
   </tr>
 </table>
Index: openacs-4/contrib/packages/portal/tcl/element-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/tcl/element-procs.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/contrib/packages/portal/tcl/element-procs.tcl	21 Mar 2004 02:39:57 -0000	1.15
+++ openacs-4/contrib/packages/portal/tcl/element-procs.tcl	22 Mar 2004 02:24:27 -0000	1.16
@@ -420,8 +420,11 @@
         set element(filename) "$theme(filename)"
         set element(resource_dir) "$theme(resource_dir)"
 
-        if {!$edit_p} {
+        if {!$edit_p || ![::parameter::get -parameter ShowShadeButton]} {
             set element(shadeable_p) f
+        }
+
+        if {!$edit_p || ![::parameter::get -parameter ShowHideButton]} {
             set element(hideable_p) f
         }
         set element(shaded_p) [ad_decode $element(state) shaded t f]