Index: openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp	8 Aug 2006 21:26:24 -0000	1.2
+++ openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp	6 Feb 2007 02:51:26 -0000	1.2.2.1
@@ -8,5 +8,6 @@
   <if @link_control_panel@ not nil><property name="link_control_panel">@link_control_panel;noquote@</property></if>
   <if @hide_feedback@ not nil><property name="hide_feedback">@hide_feedback@</property></if>
   <if @title@ not nil><property name="title">@title;noquote@</property></if>
+  <if @portal_page_p@ not nil><property name="portal_page_p">@portal_page_p;noquote@</property></if>
 
   <slave>
Index: openacs-4/packages/dotlrn/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.adp,v
diff -u -N -r1.25 -r1.25.12.1
--- openacs-4/packages/dotlrn/www/index.adp	20 Jun 2003 15:53:02 -0000	1.25
+++ openacs-4/packages/dotlrn/www/index.adp	6 Feb 2007 02:51:26 -0000	1.25.12.1
@@ -19,5 +19,6 @@
 %>
 
 <master>
+  <property name="portal_page_p">1</property>
 
 @rendered_page;noquote@
Index: openacs-4/packages/dotlrn/www/one-community-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-admin.adp,v
diff -u -N -r1.28 -r1.28.12.1
--- openacs-4/packages/dotlrn/www/one-community-admin.adp	22 Sep 2003 19:37:42 -0000	1.28
+++ openacs-4/packages/dotlrn/www/one-community-admin.adp	6 Feb 2007 02:51:26 -0000	1.28.12.1
@@ -22,5 +22,6 @@
 <property name="context">@context;noquote@</property>
 <property name="title">@pretty_name@ #dotlrn.Admin#</property>
 <property name="link_control_panel">0</property>
+<property name="portal_page_p">1</property>
 
 @rendered_page;noquote@
Index: openacs-4/packages/dotlrn/www/one-community.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.adp,v
diff -u -N -r1.27 -r1.27.6.1
--- openacs-4/packages/dotlrn/www/one-community.adp	12 Jul 2004 14:49:56 -0000	1.27
+++ openacs-4/packages/dotlrn/www/one-community.adp	6 Feb 2007 02:51:26 -0000	1.27.6.1
@@ -20,6 +20,7 @@
 
 <master>
   <property name="title">@title;noquote@</property>
+  <property name="portal_page_p">1</property>
 
 <p></p>
 
Index: openacs-4/packages/file-storage/www/file-copy-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-copy-2.tcl,v
diff -u -N -r1.10 -r1.10.2.1
--- openacs-4/packages/file-storage/www/file-copy-2.tcl	8 Aug 2006 21:26:49 -0000	1.10
+++ openacs-4/packages/file-storage/www/file-copy-2.tcl	6 Feb 2007 02:51:26 -0000	1.10.2.1
@@ -20,7 +20,6 @@
 	}
     }
 }
-ns_log Notice "Huh? right script ..."
 
 # check for read permission on the file and write permission on the
 # target folder
Index: openacs-4/packages/theme-zen/lib/lrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.adp,v
diff -u -N -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/theme-zen/lib/lrn-master.adp	31 Jan 2007 17:48:38 -0000	1.1.2.2
+++ openacs-4/packages/theme-zen/lib/lrn-master.adp	6 Feb 2007 02:51:27 -0000	1.1.2.3
@@ -122,7 +122,20 @@
         </div>
       </if>
 
+      <if @portal_page_p@ nil>
+        <div id="main">
+          <div id="main-content">
+            <div class="main-content-padding">
+      </if>
+
       <slave>
+
+      <if @portal_page_p@ nil>
+            </div> <!-- /main-content-padding -->
+          </div> <!-- /main-content -->
+        </div> <!-- /main -->
+      </if>
+
     </div> <!-- /inner-wrapper -->
   </div> <!-- /content-wrapper -->
 
Index: openacs-4/packages/theme-zen/lib/lrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.tcl,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/theme-zen/lib/lrn-master.tcl	31 Jan 2007 17:48:38 -0000	1.1.2.3
+++ openacs-4/packages/theme-zen/lib/lrn-master.tcl	6 Feb 2007 02:51:27 -0000	1.1.2.4
@@ -71,15 +71,19 @@
 
 if {[exists_and_not_null portal_id]} {
     set have_portal_id_p 1
-    if { [set page_num [ns_queryget page_num]] ne "" } {
-        append header_stuff [portal::get_layout_header_stuff \
-                                -portal_id $portal_id \
-                                -page_num $page_num]
-    }
 } else {
     set have_portal_id_p 0 
 }
 
+if {[exists_and_not_null portal_page_p]} {
+    if { [set page_num [ns_queryget page_num]] eq "" } {
+        set page_num 0
+    }
+    append header_stuff [portal::get_layout_header_stuff \
+                            -portal_id $portal_id \
+                            -page_num $page_num]
+}
+
 # navbar vars
 set show_navbar_p 1
 if {[exists_and_not_null no_navbar_p] && $no_navbar_p} {
Index: openacs-4/packages/theme-zen/lib/layouts/zen2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/layouts/zen2.adp,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/theme-zen/lib/layouts/zen2.adp	30 Jan 2007 19:47:31 -0000	1.1.2.1
+++ openacs-4/packages/theme-zen/lib/layouts/zen2.adp	6 Feb 2007 02:51:27 -0000	1.1.2.2
@@ -17,6 +17,24 @@
     #
 
 %>
+      
+<div id="sidebar-1">
+  <div class="sidebar-1-padding">
+    <list name="element_ids_2">
+      <include src="@element_src@"
+        element_id="@element_ids_2:item@"
+        action_string="@action_string@"
+        theme_id="@theme_id@"
+        region="2"
+        portal_id="@portal_id@"
+        edit_p="@edit_p@"
+        return_url="@return_url@"
+        hide_links_p="@hide_links_p@"
+        page_id="@page_id@"
+        layout_id="@layout_id@">
+    </list>
+  </div> <!-- /sidebar-1-padding -->
+</div> <!-- /sidebar-1 -->
 <div id="main">
       
   <div id="main-content">
@@ -38,21 +56,3 @@
   </div> <!-- /main-content -->
         
 </div> <!-- /main -->
-      
-<div id="sidebar-2">
-  <div class="sidebar-2-padding">
-    <list name="element_ids_2">
-      <include src="@element_src@"
-        element_id="@element_ids_2:item@"
-        action_string="@action_string@"
-        theme_id="@theme_id@"
-        region="2"
-        portal_id="@portal_id@"
-        edit_p="@edit_p@"
-        return_url="@return_url@"
-        hide_links_p="@hide_links_p@"
-        page_id="@page_id@"
-        layout_id="@layout_id@">
-    </list>
-  </div> <!-- /sidebar-2-padding -->
-</div> <!-- /sidebar-2 -->
Index: openacs-4/packages/theme-zen/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/tcl/apm-callback-procs.tcl,v
diff -u -N -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/theme-zen/tcl/apm-callback-procs.tcl	30 Jan 2007 19:47:31 -0000	1.1.2.3
+++ openacs-4/packages/theme-zen/tcl/apm-callback-procs.tcl	6 Feb 2007 02:51:27 -0000	1.1.2.4
@@ -79,6 +79,47 @@
         [list region 3]
     ]
     package_exec_plsql -var_list $var_list portal_layout add_region
+
+    set var_list [list \
+        [list name "Zen Thin-Thick"] \
+        [list description "Zen Thin-Thick"] \
+        [list resource_dir /resources/theme-zen/css/zen-thin-thick] \
+        [list filename ../../theme-zen/lib/layouts/zen2]
+    ]
+    set layout_id [package_instantiate_object -var_list $var_list portal_layout]
+    set var_list [list \
+        [list layout_id $layout_id] \
+        [list region 1]
+    ]
+    package_exec_plsql -var_list $var_list portal_layout add_region
+    set var_list [list \
+        [list layout_id $layout_id] \
+        [list region 2]
+    ]
+    package_exec_plsql -var_list $var_list portal_layout add_region
+
+    set var_list [list \
+        [list name "Zen Thin-Thick_Thin"] \
+        [list description "Zen Thin-Thick_thin"] \
+        [list resource_dir /resources/theme-zen/css/zen-thin-thick] \
+        [list filename ../../theme-zen/lib/layouts/zen3]
+    ]
+    set layout_id [package_instantiate_object -var_list $var_list portal_layout]
+    set var_list [list \
+        [list layout_id $layout_id] \
+        [list region 1]
+    ]
+    package_exec_plsql -var_list $var_list portal_layout add_region
+    set var_list [list \
+        [list layout_id $layout_id] \
+        [list region 2]
+    ]
+    package_exec_plsql -var_list $var_list portal_layout add_region
+    set var_list [list \
+        [list layout_id $layout_id] \
+        [list region 3]
+    ]
+    package_exec_plsql -var_list $var_list portal_layout add_region
        
     set var_list [list \
         [list name zen] \
Index: openacs-4/packages/theme-zen/www/resources/css/zen-thin-thick/2columnThinThick.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/zen-thin-thick/2columnThinThick.css,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/theme-zen/www/resources/css/zen-thin-thick/2columnThinThick.css	6 Feb 2007 02:51:27 -0000	1.1.2.1
@@ -0,0 +1,26 @@
+#sidebar-1 {
+	float: left;
+	width: 33%;
+}
+
+#main-content {
+	float: right;
+	width: 66%;
+}
+
+#sidebar-2 {
+	float: left;
+	width: 33%;
+}
+
+.main-content-padding {
+	padding-right: 5px
+}
+
+.sidebar-1-padding {
+	padding-left: 5px;
+}
+
+.sidebar-2-padding {
+	padding-left: 5px;
+}
\ No newline at end of file
Index: openacs-4/packages/theme-zen/www/resources/css/zen-thin-thick-thin/3columnThinThickThin.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/zen-thin-thick-thin/3columnThinThickThin.css,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/theme-zen/www/resources/css/zen-thin-thick-thin/3columnThinThickThin.css	6 Feb 2007 02:51:27 -0000	1.1.2.1
@@ -0,0 +1,32 @@
+#main {
+	float: left;
+	width: 75%;
+}
+
+#sidebar-1 {
+	float: left;
+	width: 33%;
+}
+
+#main-content {
+	float: right;
+	width: 66%;
+}
+
+#sidebar-2 {
+	float: right;
+	width: 24%;
+}
+
+.main-content-padding {
+	padding-right: 0px
+}
+
+.sidebar-1-padding {
+	padding-left: 5px;
+}
+
+.sidebar-2-padding {
+	padding-left: 0px;
+	padding-right: 5px;
+}
\ No newline at end of file