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.1 -r1.1.2.2
--- openacs-4/packages/theme-zen/lib/lrn-master.tcl	22 Jan 2007 23:57:35 -0000	1.1.2.1
+++ openacs-4/packages/theme-zen/lib/lrn-master.tcl	30 Jan 2007 19:47:31 -0000	1.1.2.2
@@ -4,11 +4,6 @@
 set community_id [dotlrn_community::get_community_id]
 set dotlrn_url [dotlrn::get_url]
 
-if { [info exists context ] } {
-ns_log Notice "Huh? context: $context"
-}
-
-
 #----------------------------------------------------------------------
 # Display user messages
 #----------------------------------------------------------------------
@@ -73,6 +68,11 @@
 
 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 
 }
@@ -266,9 +266,6 @@
 <link rel="stylesheet" type="text/css" href="/resources/theme-zen/css/main.css" media="screen" />
 <link rel="stylesheet" type="text/css" href="/resources/theme-zen/css/print.css" media="print" />
 <link rel="stylesheet" type="text/css" href="/resources/theme-zen/css/handheld.css" media="handheld" />
-<link rel="stylesheet" type="text/css" href="/resources/theme-zen/css/columns/2column.css" media="screen" />
-<link rel="alternate stylesheet" type="text/css" href="/resources/theme-zen/css/columns/1column.css" title="1col" />
-<link rel="alternate stylesheet" type="text/css" href="/resources/theme-zen/css/columns/3column.css" title="3col" />
 <link rel="alternate stylesheet" type="text/css" href="/resources/theme-zen/css/highContrast.css" title="highContrast" />
 <link rel="alternate stylesheet" type="text/css" href="/resources/theme-zen/css/508.css" title="508" />
 <script type="text/javascript" src="/resources/theme-zen/js/styleswitcher.js"></script>
@@ -287,7 +284,7 @@
     if { [regexp {^([^.]*)\.(.*)$} $focus match form_name element_name] } {
 
         # Add safety code to test that the element exists '
-        set header_stuff "$header_stuff
+        append header_stuff "$header_stuff
           <script language=\"JavaScript\" type=\"text/javascript\">
             function acs_focus( form_name, element_name ){
                 if (document.forms == null) return;
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/theme-zen/lib/layouts/zen2.adp	30 Jan 2007 19:47:31 -0000	1.1.2.1
@@ -0,0 +1,58 @@
+<%
+
+    #
+    #  Copyright (C) 2001, 2002 MIT
+    #
+    #  This file is part of dotLRN.
+    #
+    #  dotLRN is free software; you can redistribute it and/or modify it under the
+    #  terms of the GNU General Public License as published by the Free Software
+    #  Foundation; either version 2 of the License, or (at your option) any later
+    #  version.
+    #
+    #  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+    #  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+    #  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+    #  details.
+    #
+
+%>
+<div id="main">
+      
+  <div id="main-content">
+    <div class="main-content-padding">
+      <list name="element_ids_1">
+        <include src="@element_src@"
+                 element_id="@element_ids_1:item@"
+                 action_string="@action_string@"
+                 theme_id="@theme_id@"
+                 region="1"
+                 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> <!-- /main-content-padding -->
+  </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/lib/layouts/zen2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/layouts/zen2.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/theme-zen/lib/layouts/zen2.tcl	30 Jan 2007 19:47:31 -0000	1.1.2.1
@@ -0,0 +1,47 @@
+#
+#  Copyright (C) 2001, 2002 MIT
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+# new-portal/www/layouts/simple2.tcl
+
+ad_page_contract {
+    This is a simple 2 column layout called from portal::render and the like. 
+    It laysout the elements with portal::layout_elements and hands off rendering
+    of the individual portlets to the template in the "element_src" var
+
+    @version $Id: zen2.tcl,v 1.1.2.1 2007/01/30 19:47:31 donb Exp $
+} -properties {
+    element_list:onevalue
+    element_src:onevalue
+    action_string:onevalue
+    theme_id:onevalue
+    return_url:onevalue
+}
+
+if {![exists_and_not_null action_string]} {
+    set action_string ""
+}
+
+if {![exists_and_not_null theme_id]} {
+    set theme_id ""
+}
+
+if {![exists_and_not_null return_url]} {
+    set return_url ""
+}
+
+portal::layout_elements $element_list
+
+ad_return_template
Index: openacs-4/packages/theme-zen/lib/layouts/zen3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/layouts/zen3.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/theme-zen/lib/layouts/zen3.adp	30 Jan 2007 19:47:31 -0000	1.1.2.1
@@ -0,0 +1,58 @@
+
+<div id="main">
+
+  <div id="sidebar-1">
+    <div class="sidebar-1-padding">
+      <list name="element_ids_1">
+        <include src="@element_src@"
+          element_id="@element_ids_1:item@"
+          action_string="@action_string@"
+          theme_id="@theme_id@"
+          region="1"
+          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-content">
+    <div class="main-content-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> <!-- /main-content-padding -->
+  </div> <!-- /main-content -->
+
+</div> <!-- /main -->
+      
+<div id="sidebar-2">
+  <div class="sidebar-2-padding">
+    <list name="element_ids_3">
+      <include src="@element_src@"
+        element_id="@element_ids_3:item@"
+        action_string="@action_string@"
+        theme_id="@theme_id@"
+        region="3"
+        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/lib/layouts/zen3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/layouts/zen3.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/theme-zen/lib/layouts/zen3.tcl	30 Jan 2007 19:47:31 -0000	1.1.2.1
@@ -0,0 +1,48 @@
+#
+#  Copyright (C) 2001, 2002 MIT
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+ad_page_contract {
+    This is a simple 3 column layout called from portal::render and the like. 
+    It lays out the elements with portal::layout_elements and hands off
+    rendering of the individual portlets to the template in the
+    "element_src" var
+
+    @author arjun@openforce.net
+    @author yon@openforce.net
+    @version $Id: zen3.tcl,v 1.1.2.1 2007/01/30 19:47:31 donb Exp $
+} -properties {
+    element_list:onevalue
+    element_src:onevalue
+    action_string:onevalue
+    theme_id:onevalue
+    return_url:onevalue
+}
+
+if {![exists_and_not_null action_string]} {
+    set action_string ""
+}
+
+if {![exists_and_not_null theme_id]} {
+    set theme_id ""
+}
+
+if {![exists_and_not_null return_url]} {
+    set return_url ""
+}
+
+portal::layout_elements $element_list
+
+ad_return_template
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.2 -r1.1.2.3
--- openacs-4/packages/theme-zen/tcl/apm-callback-procs.tcl	29 Jan 2007 02:51:36 -0000	1.1.2.2
+++ openacs-4/packages/theme-zen/tcl/apm-callback-procs.tcl	30 Jan 2007 19:47:31 -0000	1.1.2.3
@@ -29,6 +29,7 @@
     set var_list [list \
         [list name "Zen 1 column"] \
         [list description "Zen 1 column"] \
+        [list resource_dir /resources/theme-zen/css/zen1] \
         [list filename ../../theme-zen/lib/layouts/zen1]
     ]
     set layout_id [package_instantiate_object -var_list $var_list portal_layout]
@@ -41,6 +42,7 @@
     set var_list [list \
         [list name "Zen 2 column"] \
         [list description "Zen 2 column"] \
+        [list resource_dir /resources/theme-zen/css/zen2] \
         [list filename ../../theme-zen/lib/layouts/zen2]
     ]
     set layout_id [package_instantiate_object -var_list $var_list portal_layout]
@@ -58,6 +60,7 @@
     set var_list [list \
         [list name "Zen 3 column"] \
         [list description "Zen 3 column"] \
+        [list resource_dir /resources/theme-zen/css/zen3] \
         [list filename ../../theme-zen/lib/layouts/zen3]
     ]
     set layout_id [package_instantiate_object -var_list $var_list portal_layout]
@@ -80,8 +83,7 @@
     set var_list [list \
         [list name zen] \
         [list description "Zen Theme"] \
-        [list filename ../../theme-zen/lib/themes/zen-theme] \
-        [list resource_dir ../../packages/theme-zen/lib/themes/zen-theme]
+        [list filename ../../theme-zen/lib/themes/zen-theme]
     ]
 
     set theme_id [package_instantiate_object -var_list $var_list portal_element_theme]
Index: openacs-4/packages/theme-zen/www/resources/css/columns/1column.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/columns/Attic/1column.css,v
diff -u -N
--- openacs-4/packages/theme-zen/www/resources/css/columns/1column.css	23 Jan 2007 01:03:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-#sidebar-1 {
-	float: left;
-	width: 100%;
-}
-
-#main-content {
-	float: left;
-	width: 100%;
-}
-
-#sidebar-2 {
-	float: left;
-	width: 100%;
-}
-
-.main-content-padding {
-	padding: 0px 5px;
-}
-
-.sidebar-1-padding {
-	padding: 0px 5px;
-}
-
-.sidebar-2-padding {
-	padding: 0px 5px;
-}
\ No newline at end of file
Index: openacs-4/packages/theme-zen/www/resources/css/columns/2column.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/columns/Attic/2column.css,v
diff -u -N
--- openacs-4/packages/theme-zen/www/resources/css/columns/2column.css	23 Jan 2007 01:03:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-	#sidebar-1 {
-	float: left;
-	width: 49%;
-}
-
-#main-content {
-	float: right;
-	width: 50%;
-}
-
-#sidebar-2 {
-	float: left;
-	width: 49%;
-}
-
-.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/columns/3column.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/columns/Attic/3column.css,v
diff -u -N
--- openacs-4/packages/theme-zen/www/resources/css/columns/3column.css	23 Jan 2007 01:03:08 -0000	1.1.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-#main {
-	float: left;
-	width: 66%;
-}
-
-#sidebar-1 {
-	float: left;
-	width: 49%;
-}
-
-#main-content {
-	float: right;
-	width: 50%;
-}
-
-#sidebar-2 {
-	float: right;
-	width: 33%;
-}
-
-.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
Index: openacs-4/packages/theme-zen/www/resources/css/zen1/1column.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/zen1/1column.css,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/theme-zen/www/resources/css/zen1/1column.css	30 Jan 2007 19:47:32 -0000	1.1.2.1
@@ -0,0 +1,26 @@
+#sidebar-1 {
+	float: left;
+	width: 100%;
+}
+
+#main-content {
+	float: left;
+	width: 100%;
+}
+
+#sidebar-2 {
+	float: left;
+	width: 100%;
+}
+
+.main-content-padding {
+	padding: 0px 5px;
+}
+
+.sidebar-1-padding {
+	padding: 0px 5px;
+}
+
+.sidebar-2-padding {
+	padding: 0px 5px;
+}
\ No newline at end of file
Index: openacs-4/packages/theme-zen/www/resources/css/zen2/2column.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/zen2/2column.css,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/theme-zen/www/resources/css/zen2/2column.css	30 Jan 2007 19:47:32 -0000	1.1.2.1
@@ -0,0 +1,26 @@
+	#sidebar-1 {
+	float: left;
+	width: 49%;
+}
+
+#main-content {
+	float: right;
+	width: 50%;
+}
+
+#sidebar-2 {
+	float: left;
+	width: 49%;
+}
+
+.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/zen3/3column.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/zen3/3column.css,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/theme-zen/www/resources/css/zen3/3column.css	30 Jan 2007 19:47:32 -0000	1.1.2.1
@@ -0,0 +1,32 @@
+#main {
+	float: left;
+	width: 66%;
+}
+
+#sidebar-1 {
+	float: left;
+	width: 49%;
+}
+
+#main-content {
+	float: right;
+	width: 50%;
+}
+
+#sidebar-2 {
+	float: right;
+	width: 33%;
+}
+
+.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