Index: openacs-4/packages/xowiki/tcl/category-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/category-procs.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/tcl/category-procs.tcl	25 Feb 2006 13:36:23 -0000	1.1
@@ -0,0 +1,55 @@
+namespace eval ::xowiki {
+  Class CatTree -superclass ::xo::OrderedComposite 
+
+  CatTree instproc add_to_category {
+    -category_id 
+    -itemobj 
+    {-pos 0} 
+    {-open_item:boolean false}
+  } {
+    set catobj [self]::$category_id
+    if {![my isobject $catobj]} {
+      ::xo::OrderedComposite create $catobj
+      $catobj set pos $pos
+      $catobj set open_requests 0
+      my add $catobj
+    }
+    if {$open_item} {$catobj incr open_requests}
+    $catobj add $itemobj
+  }
+
+  CatTree instproc render {} {
+    set content ""
+    foreach c [my children] {
+      set cat_content ""
+      foreach i [$c children] {
+	$i instvar title page_title prefix
+	append cat_content $prefix " <a href='" \
+	    [::xowiki::Page pretty_link $title] \
+	    "'>$page_title</a><br>\n"
+      }
+      append content "<h3>[category::get_name [namespace tail $c]]</h3><blockquote>" \
+	  $cat_content "</blockquote>\n"
+    }
+    return $content
+  }
+
+  CatTree instproc render-li {} {
+    ::xowiki::Page requireCSS "/resources/acs-templating/mktree.css"
+    ::xowiki::Page requireJS  "/resources/acs-templating/mktree.js"
+    set content "<ul class='mktree' id='[self]'>"
+    foreach c [my children] {
+      set cat_content ""
+      foreach i [$c children] {
+	$i instvar title page_title prefix
+	append cat_content "<li style='padding-left: -0px; list-style: none;'>" \
+	    $prefix "<a href='[::xowiki::Page pretty_link $title]'>$page_title</a></li>\n"
+      }
+      set open_state [expr {[$c set open_requests]>0?"class='liOpen'" : "class='liClosed'"}]
+      append content "<li $open_state>[category::get_name [namespace tail $c]]" \
+	  "<ul>" $cat_content "</ul>\n"
+    }
+    return "$content</ul>"
+  }
+
+}
Index: openacs-4/packages/xowiki/tcl/chat-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/chat-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/xowiki/tcl/chat-procs.tcl	6 Feb 2006 11:45:09 -0000	1.2
+++ openacs-4/packages/xowiki/tcl/chat-procs.tcl	25 Feb 2006 13:36:23 -0000	1.3
@@ -111,6 +111,7 @@
   }
   Chat proc login {-chat_id -package_id} {
     auth::require_login
+    ::xowiki::Page requireJS  "/resources/xowiki/get-http-object.js"
     if {![info exists package_id]} {set package_id [ad_conn package_id] }
     if {![info exists chat_id]}    {set chat_id $package_id }
 
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 -N -r1.20 -r1.21
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	22 Feb 2006 12:35:54 -0000	1.20
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	25 Feb 2006 13:36:23 -0000	1.21
@@ -347,7 +347,7 @@
   ObjectForm instproc init {} {
     my instvar data
     if {[$data exists title]} {
-      # don't call vaidate on the folder object, don't let people change its name
+      # don't call validate on the folder object, don't let people change its name
       set title [$data set title]
       if {$title eq "::[$data set parent_id]"} {
 	my f.title  {title:text(inform) {label #xowiki.name#}}
@@ -499,6 +499,19 @@
  
 
 namespace eval ::xowiki {
+  Page proc requireCSS name {set ::need_css($name) 1}
+  Page proc requireJS  name {set ::need_js($name)  1}
+  Page proc header_stuff {} {
+    set result ""
+    foreach file [array names ::need_css] {
+      append result "<link rel='stylesheet' href='$file' media='all'>\n"
+    }
+    foreach file [array names ::need_js]  {
+      append result "<script language='javascript' src='$file' type='text/javascript'>" \
+	  "</script>"
+    }
+    return $result
+  }
 
   Page instproc get_name {uid} {
     if {$uid ne "" && $uid != 0} {
@@ -534,11 +547,14 @@
   } {
   } {
     if {![::xotcl::Object isobject ::$folder_id]} {
-      set item_id [CrItem lookup -title ::$folder_id -parent_id $folder_id]
+      set item_id [ns_cache eval xotcl_object_type_cache item-of-$folder_id {
+	set item_id [CrItem lookup -title ::$folder_id -parent_id $folder_id]
+      }]
       if {$item_id != 0} {
 	#my log "--f fetch folder object -object ::$folder_id -item_id $item_id"
 	set o [::xowiki::Object fetch_object -object ::$folder_id -item_id $item_id]
       } else {
+	ns_cache flush xotcl_object_type_cache item-of-$folder_id
 	#my log "--f save new folder object"
 	set o [::xowiki::Object create ::$folder_id]
 	$o set text "# this is the payload of the folder object\n\nset index_page \"\"\n"
Index: openacs-4/packages/xowiki/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view.adp,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/xowiki/www/view.adp	24 Feb 2006 14:30:18 -0000	1.10
+++ openacs-4/packages/xowiki/www/view.adp	25 Feb 2006 13:36:24 -0000	1.11
@@ -1,53 +1,8 @@
 <master>
   <property name="title">@page_title;noquote@</property>
   <property name="context">@context;noquote@</property>
-  <property name="focus">note.title</property>
+  <property name="header_stuff">@header_stuff;noquote@</property>
 
-<!-- we should load extra style files optional -->
-<style type="text/css" media="all">
-<!--    @import "/resources/calendar/calendar.css"; -->
-</style> 
-
-<script type="text/javascript" language="javascript">
-
-function getHttpObject() {
-     var http_request = false;
-     if (window.XMLHttpRequest) { // Mozilla, Safari,...
-         http_request = new XMLHttpRequest();
-         if (http_request.overrideMimeType) {
-              http_request.overrideMimeType('text/xml');
-         }
-     } else if (window.ActiveXObject) { // IE
-         try {
-             http_request = new ActiveXObject("Msxml2.XMLHTTP");
-         } catch (e) {
-             try {
-                 http_request = new ActiveXObject("Microsoft.XMLHTTP");
-             } catch (e) {}
-         }
-     }
-
-     if (!http_request) {
-         alert('Cannot create and instance of XMLHTTP');
-     }
-   return http_request;
-}
-
-if (typeof DOMParser == "undefined") {
-   DOMParser = function () {}
-	
-   DOMParser.prototype.parseFromString = function (str, contentType) {
-      if (typeof ActiveXObject != "undefined") {
-         var d = new ActiveXObject("MSXML.DomDocument");
-         d.loadXML(str);
-         return d;
-        }
-   }
-}
-
-var http = getHttpObject();
-</script>
-
 <style type='text/css'>
 #wikicmds {position: relative;top: -80px;  right: 0px; height: 0px;
 	  text-align: right;  font-family: sans-serif; font-size: 85%;color: #7A7A78;}
@@ -108,10 +63,21 @@
 img.undefined {border: 10; color: yellow; height: 12px}
 #left-col   {float: left;    width: 40%; top: 0px;}
 #right-col {float: right; width: 59%;  top: 0px;}
-#left-col30   {float: left;    width: 30%; top: 0px; margin-right: 10px;}
-#left-col25   {float: left;    width: 25%; top: 0px; margin-right: 10px;}
+
+#left-col20   {float: left;    width: 14%; top: 0px; margin-right: 10px;}
+#left-col25   {float: left;    width: 24%; top: 0px; margin-right: 10px;}
+#left-col30   {float: left;    width: 29%; top: 0px; margin-right: 10px;}
+#left-col70 {float: left; width: 69%; top: 0px;}
+#left-col75 {float: left; width: 74%; top: 0px;}
+#left-col80 {float: left; width: 79%; top: 0px;}
+
+#right-col20   {float: right;    width: 14%; top: 0px; margin-right: 10px;}
+#right-col25   {float: right;    width: 24%; top: 0px; margin-right: 10px;}
+#right-col30   {float: right;    width: 29%; top: 0px; margin-right: 10px;}
 #right-col70 {float: right; width: 69%; top: 0px;}
-#right-col25 {float: right; width: 25%; top: 0px;}
+#right-col75 {float: right; width: 74%; top: 0px;}
+#right-col80 {float: right; width: 79%; top: 0px;}
+
 #messages .timestamp {font-size: 80%; color: grey}
 #messages .user {font-size: 80%; font-weight: bold; color: grey}
 #messages .message {vertical-align: top}
@@ -129,8 +95,7 @@
 
 @content;noquote@
 <div style="clear: both; text-align: left; font-size: 85%;">
-<p/>&nbsp;<hr>
-#xowiki.references_label# @references;noquote@
+<p/>&nbsp;<hr>#xowiki.references_label# @references;noquote@
 @lang_links;noquote@</div><br>
 @gc_comments;noquote@
 <if @gc_comments@ not nil>
Index: openacs-4/packages/xowiki/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/xowiki/www/view.tcl	15 Feb 2006 12:54:01 -0000	1.10
+++ openacs-4/packages/xowiki/www/view.tcl	25 Feb 2006 13:36:24 -0000	1.11
@@ -37,6 +37,8 @@
 $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}]
   set edit_link [export_vars -base ${base}edit {item_id}]
Index: openacs-4/packages/xowiki/www/portlets/calendar-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/calendar-portlet.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/portlets/calendar-portlet.tcl	14 Dec 2005 16:13:37 -0000	1.1
+++ openacs-4/packages/xowiki/www/portlets/calendar-portlet.tcl	25 Feb 2006 13:36:24 -0000	1.2
@@ -1,4 +1,6 @@
 #
+::xowiki::Page requireCSS "/resources/calendar/calendar.css"
+
 set date [dt_sysdate]
 proc my_get_url_stub {args} {
   return /dotlrn/calendar
Index: openacs-4/packages/xowiki/www/portlets/categories-recent.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/categories-recent.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/xowiki/www/portlets/categories-recent.tcl	14 Feb 2006 12:07:44 -0000	1.2
+++ openacs-4/packages/xowiki/www/portlets/categories-recent.tcl	25 Feb 2006 13:36:24 -0000	1.3
@@ -11,28 +11,8 @@
 # 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 cattree      [::xowiki::CatTree new -volatile]
 
-Class CatTree -volatile -superclass ::xo::OrderedComposite 
-CatTree instproc add_to_category {-category_id -itemobj} {
-  set catobj [self]::$category_id
-  if {![my isobject $catobj]} {::xo::OrderedComposite create $catobj; my add $catobj}
-  $catobj add $itemobj
-}
-CatTree instproc render {} {
-  set content ""
-  foreach c [my children] {
-    set cat_content ""
-    foreach i [$c children] {
-      $i instvar title page_title publish_date
-      append cat_content "$publish_date <a href='[::xowiki::Page pretty_link $title]'>$page_title</a><br>\n"
-    }
-    append content "<h3>[category::get_name [namespace tail $c]]</h3><blockquote>" \
-	$cat_content "</blockquote>\n"
-  }
-  return $content
-}
-set cattree [CatTree new -volatile]
-
 ## provide also a three level display with tree names?
 
 foreach tree [category_tree::get_mapped_trees $package_id] {
@@ -57,7 +37,8 @@
 	" {
 	  if {$page_title eq ""} {set page_title $title}
 	  set itemobj [Object new]
-	  foreach var {title page_title publish_date} {$itemobj set $var [set $var]}
+	  set prefix  $publish_date
+	  foreach var {title page_title prefix} {$itemobj set $var [set $var]}
 	  $cattree add_to_category -category_id $category_id -itemobj $itemobj
 	}
 
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 -N -r1.6 -r1.7
--- openacs-4/packages/xowiki/www/portlets/categories.tcl	12 Feb 2006 01:21:38 -0000	1.6
+++ openacs-4/packages/xowiki/www/portlets/categories.tcl	25 Feb 2006 13:36:24 -0000	1.7
@@ -2,14 +2,19 @@
 # display the category tree with associated pages
 # -gustaf neumann
 # 
-# valid parameters from the include are 
+# valid parameters from the adp include are 
 #     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 
 
 # 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 url_prefix  [site_node::get_url_from_object_id -object_id $package_id]
+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}
+set renderer     [expr {$tree_style ? "render-li" : "render"}]
 
 set content ""
 foreach tree [category_tree::get_mapped_trees $package_id] {
@@ -18,28 +23,35 @@
   if {![info exists no_tree_name]} {
     append content "<h2>$my_tree_name</h2>"
   }
+  set categories [list]
+  set pos 0
   foreach category [category_tree::get_tree $tree_id] {
     foreach {category_id category_label deprecated_p level} $category {break}
-    set cat_content ""
-    db_foreach get_pages \
-	"select i.item_id, r.title, i.content_type, p.page_title \
-	 from category_object_map c, cr_items i, cr_revisions r,  xowiki_page p \
+    set order($category_id) [incr pos]
+    lappend categories $category_id
+  }
+  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 \
 		where c.object_id = i.item_id and i.parent_id = $folder_id \
-		and category_id = $category_id \
+		and category_id in ([join $categories ,]) \
 		and r.revision_id = i.live_revision \
 		and p.page_id = r.revision_id \
 	" {
-	  if {$page_title eq ""} { set page_title $title}
-	  if {![::xotcl::Object isclass $content_type]} {
-	    # we could check for certain page types as well
-	    continue
-	  }
-	  append cat_content "<a href='[::xowiki::Page pretty_link $title]'>$page_title</a><br>\n"
+	  
+	  if {$page_title eq ""} {set page_title $title}
+	  set itemobj [Object new]
+	  set prefix ""
+	  foreach var {title page_title prefix} {$itemobj set $var [set $var]}
+	  $cattree add_to_category \
+	      -category_id $category_id \
+	      -itemobj $itemobj \
+	      -pos $order($category_id) \
+	      -open_item [expr {$item_id == $open_item_id}]
 	}
-    if {$cat_content ne ""} {
-      append content "<h3>$category_label</h3><blockquote>" $cat_content "</blockquote>\n"
-    }
-  }
+  $cattree orderby pos
+  append content [$cattree $renderer]
 }
 
 set link ""
Index: openacs-4/packages/xowiki/www/portlets/recent.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/recent.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/xowiki/www/portlets/recent.tcl	14 Feb 2006 12:07:44 -0000	1.2
+++ openacs-4/packages/xowiki/www/portlets/recent.tcl	25 Feb 2006 13:36:24 -0000	1.3
@@ -5,6 +5,8 @@
 # valid parameters from the include are 
 #     max_entries: show given number of new entries
 
+::xowiki::Page requireCSS "/resources/acs-templating/lists.css"
+
 if {![info exists max_entries]} {set max_entries 20}
 
 # get the folder id from the including page
Index: openacs-4/packages/xowiki/www/resources/get-http-object.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/get-http-object.js,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowiki/www/resources/get-http-object.js	25 Feb 2006 13:36:24 -0000	1.1
@@ -0,0 +1,40 @@
+// small cross browser function to get an HTTP object for making 
+// AJAX style http requests in the background 
+// -gustaf neumann Jan, 2006
+
+function getHttpObject() {
+     var http_request = false;
+     if (window.XMLHttpRequest) { // Mozilla, Safari,...
+         http_request = new XMLHttpRequest();
+         if (http_request.overrideMimeType) {
+              http_request.overrideMimeType('text/xml');
+         }
+     } else if (window.ActiveXObject) { // IE
+         try {
+             http_request = new ActiveXObject("Msxml2.XMLHTTP");
+         } catch (e) {
+             try {
+                 http_request = new ActiveXObject("Microsoft.XMLHTTP");
+             } catch (e) {}
+         }
+     }
+
+     if (!http_request) {
+         alert('Cannot create and instance of XMLHTTP');
+     }
+   return http_request;
+}
+
+if (typeof DOMParser == "undefined") {
+   DOMParser = function () {}
+	
+   DOMParser.prototype.parseFromString = function (str, contentType) {
+      if (typeof ActiveXObject != "undefined") {
+         var d = new ActiveXObject("MSXML.DomDocument");
+         d.loadXML(str);
+         return d;
+        }
+   }
+}
+
+var http = getHttpObject();