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 -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;
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/lib/layouts/zen2.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/lib/layouts/zen2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/lib/layouts/zen3.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/lib/layouts/zen3.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
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 -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]
Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/www/resources/css/columns/1column.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/www/resources/css/columns/2column.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.2 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/www/resources/css/columns/3column.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/www/resources/css/zen1/1column.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/www/resources/css/zen2/2column.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/www/resources/css/zen3/3column.css'.
Fisheye: No comparison available.  Pass `N' to diff?