Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	25 Feb 2006 13:36:23 -0000	1.21
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	27 Feb 2006 12:37:29 -0000	1.22
@@ -88,7 +88,6 @@
 
 if {![db_0or1row check-xowiki-table \
 	  "select tablename from pg_tables where tablename = 'xowiki_references'"]} {
-  ns_log notice "xowiki create"
   db_dml create-xowiki-table "create table xowiki_references(
 	reference integer references cr_items(item_id) on delete cascade, 
         link_type text,
Index: openacs-4/packages/xowiki/www/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/edit.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/xowiki/www/edit.tcl	24 Feb 2006 14:30:18 -0000	1.9
+++ openacs-4/packages/xowiki/www/edit.tcl	27 Feb 2006 12:37:30 -0000	1.10
@@ -29,12 +29,12 @@
   if {$object_type eq "::xowiki::Object" && [$page set title] eq "::$folder_id"} {
     # if we edit the folder object, we have to do some extra magic here, since 
     # the folder object has slightly different naming conventions.
-    if {[info command ::$folder_id] eq ""} {
-      ns_cache flush xotcl_object_cache $page
-      $page move ::$folder_id
-    }
+    #ns_log notice "--editing folder object ::$folder_id"
+    ns_cache flush xotcl_object_cache $page
+    $page move ::$folder_id
     set page ::$folder_id
     $page set package_id [ad_conn package_id]
+    #ns_log notice "--move page=$page"
   } else {
     $page volatile
     ::xowiki::Page require_folder_object -folder_id $folder_id -package_id [ad_conn package_id]
Index: openacs-4/packages/xowiki/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/xowiki/www/view.tcl	25 Feb 2006 13:36:24 -0000	1.11
+++ openacs-4/packages/xowiki/www/view.tcl	27 Feb 2006 12:37:30 -0000	1.12
@@ -30,14 +30,14 @@
 
 set content [$page render]
 set references [$page references]
+set header_stuff [::xowiki::Page header_stuff]
 
 if {[$page exists master] && $master == 1} {set master [$page set master]}
 
 # export page_title, text, and lang_links to current scope
 $page instvar page_title title text lang_links
 if {$master} {
   set context [list $page_title]
-  set header_stuff [::xowiki::Page header_stuff]
 
   set base [apm_package_url_from_id [ad_conn package_id]]
   set rev_link  [export_vars -base ${base}revisions {{page_id $item_id} title}]
Index: openacs-4/packages/xowiki/www/portlets/categories.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/categories.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xowiki/www/portlets/categories.tcl	25 Feb 2006 13:36:24 -0000	1.7
+++ openacs-4/packages/xowiki/www/portlets/categories.tcl	27 Feb 2006 12:37:30 -0000	1.8
@@ -3,25 +3,29 @@
 # -gustaf neumann
 # 
 # valid parameters from the adp include are 
-#     tree_name: match pattern, if specified displays only the trees with matching names
+#     tree_name: match pattern, if specified displays only the trees 
+#                with matching names
 #     no_tree_name: if specified, only tree names are not displayed
 #     open_page: name (e.g. en:iMacs) of the page to be opened initially
 #     tree_style: boolean, default: true, display based on mktree 
+#     skin: name of adp-file to render content
 
 # get the folder id from the including page
 set folder_id    [$__including_page set parent_id]
 set package_id   [$folder_id set package_id]
 set open_item_id [expr {[info exists open_page] ?
 			[CrItem lookup -title $open_page -parent_id $folder_id] : 0}]
+
 if {![info exists tree_style]} {set tree_style 1}
+if {![info exists plain_include]} {set plain_include 0}
 set renderer     [expr {$tree_style ? "render-li" : "render"}]
 
 set content ""
 foreach tree [category_tree::get_mapped_trees $package_id] {
   foreach {tree_id my_tree_name ...} $tree {break}
   if {[info exists tree_name] && ![string match $tree_name $my_tree_name]} continue
   if {![info exists no_tree_name]} {
-    append content "<h2>$my_tree_name</h2>"
+    append content "<h3>$my_tree_name</h3>"
   }
   set categories [list]
   set pos 0
@@ -30,7 +34,7 @@
     set order($category_id) [incr pos]
     lappend categories $category_id
   }
-  set cattree     [::xowiki::CatTree new -volatile]
+  set cattree [::xowiki::CatTree new -volatile]
   db_foreach get_pages \
       "select i.item_id, r.title, i.content_type, p.page_title, category_id \
 	 from category_object_map c, cr_items i, cr_revisions r, xowiki_page p \
@@ -54,4 +58,7 @@
   append content [$cattree $renderer]
 }
 
+if {[info exists skin]} {
+  template::set_file "[file dir $__adp_stub]/$skin"
+}
 set link ""
Index: openacs-4/packages/xowiki/www/portlets/plain-include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/plain-include.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/www/portlets/plain-include.adp	27 Feb 2006 12:37:30 -0000	1.1
@@ -0,0 +1 @@
+@content;noquote@