Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.130 -r1.131
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	10 Feb 2009 18:58:51 -0000	1.130
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	12 Feb 2009 15:07:15 -0000	1.131
@@ -1397,7 +1397,7 @@
   }
   
   abstract_page instproc pretty_value {v} {
-    my instvar package_prefix package_id
+    my instvar package_id
 
     if {[my multiple]} {
       foreach o [my set options] {
@@ -1408,7 +1408,7 @@
       set values [list]
       foreach i $v {
         if {[catch {lappend values $labels($i)}]} {
-          my msg "can't determine label for value '$i'"
+          my msg "can't determine label for value '$i' (values=$v, l=[array names labels])"
           lappend values $i
         }
       }
@@ -1418,7 +1418,7 @@
         foreach {label value} $o break
         if {$value eq $v} {
           if {[my as_box]} {
-            return [[my object] include [list $package_prefix$value -decoration rightbox]] 
+            return [[my object] include [list $value -decoration rightbox]] 
           }
           set href [$package_id pretty_link $value]
           return "<a href='$href'>$label</a>"
@@ -1437,33 +1437,51 @@
     {where}
   }
   form_page instproc compute_options {} {
-    my instvar form_obj package_prefix where
+    my instvar form_obj where
     #my msg "[my name] compute_options [my exists form]"
     if {![my exists form]} {
       return
     }
     set form_name [my form]
+    set package_id [[my object] package_id]
+    set form_objs [::xowiki::Weblog instantiate_forms \
+                       -default_lang [[my object] lang] \
+                       -entries_of $form_name -package_id $package_id]
 
-    set form_obj [[my object] resolve_included_page_name $form_name]
-    if {$form_obj eq ""} {error "Cannot lookup Form '$form_name'"}
+    #set form_obj [[my object] resolve_included_page_name $form_name]
+    if {$form_objs eq ""} {error "Cannot lookup Form '$form_name'"}
+    
+    set form_object_item_ids [list]
+    foreach form_obj $form_objs {lappend form_object_item_ids [$form_obj item_id]}
 
-    set package_prefix ""
-    regexp {^(//[^/]+/)} $form_name _ package_prefix
-
     array set wc {tcl true h "" vars "" sql ""}
     if {[info exists where]} {
       array set wc [::xowiki::FormPage filter_expression $where &&]
       #my msg "where '$where' => wc=[array get wc]"
     }
     set options [list]    
     set items [::xowiki::FormPage get_form_entries \
-                   -base_item_id [$form_obj item_id] \
+                   -base_item_ids $form_object_item_ids \
                    -form_fields [list] \
                    -publish_status ready \
-                   -always_queried_attributes [list _name _title _last_modified _creation_user] \
+                   -always_queried_attributes [list _name _title _last_modified _creation_user _object_package_id] \
                    -h_where [array get wc] \
-                   -package_id [$form_obj package_id]]
-    foreach i [$items children] {lappend options [list [$i title] [$i name]]}
+                   -package_id $package_id]
+    foreach i [$items children] {
+      #
+      # If the form_page has a different package_id, prepend the
+      # package_url to the name. TODO: We assume here, that the form_pages
+      # have not special parent_id.
+      #
+      set object_package_id [$i set object_package_id]
+      if {$package_id != $object_package_id} {
+        set package_prefix /[$object_package_id package_url]
+      } else {
+        set package_prefix ""
+      }
+
+      lappend options [list [$i title] $package_prefix[$i name]]
+    }
     my options $options
   }
 
@@ -1487,10 +1505,7 @@
     {glob}
   }
   page instproc compute_options {} {
-    my instvar type with_subtypes glob package_prefix
-    # We could use the package_prefix like in form_page when refering to pages 
-    # in different packages. 
-    set package_prefix ""
+    my instvar type with_subtypes glob
 
     set extra_where_clause ""
     if {[my exists glob]} {
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.98 -r1.99
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	10 Feb 2009 10:58:38 -0000	1.98
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	12 Feb 2009 15:07:15 -0000	1.99
@@ -1820,41 +1820,24 @@
 
   toc instproc yui_tree {pages open_page package_id expand_all remove_levels} {
     my instvar navigation page_name book_mode
-    array set navigation {parent "" position 0 current ""}
 
     set js ""
     set node() root
     set node_cnt 0
     #my log "--book read [llength [$pages children]] pages"
+    #append js "$node().expand();\n"
 
     foreach o [$pages children] {
-      $o instvar page_order title page_id name  
+      $o instvar page_order title name  
 
       set label "[my page_number $page_order $remove_levels] $title"
       set id tmpNode[incr node_cnt]
       set node($page_order) $id
-      set jsobj [my js_name].objs\[$node_cnt\]
+      set jsobj  [my js_name].objs\[$node_cnt\]
+      set href   [my href $package_id $book_mode $name]
+      set expand [expr {[my exists open_node($page_order)]}]
 
-      set page_name($node_cnt) $name
       if {![regexp {^(.*)[.]([^.]+)} $page_order _ parent]} {set parent ""}
-
-      set href [my href $package_id $book_mode $name]
-      
-      if {$expand_all} {
-	set expand "true"
-      } else {
-	set expand [expr {$open_page eq $name} ? "true" : "false"]
-	if {$expand} {
-	  set navigation(parent) $parent
-	  set navigation(position) $node_cnt
-	  set navigation(current) $page_order
-	  for {set p $parent} {$p ne ""} {} {
-	    if {![info exists node($p)]} break
-	    append js "$node($p).expand();\n"
-	    if {![regexp {^(.*)[.]([^.]+)} $p _ p]} {set p ""}
-	  }
-	}
-      }
       set parent_node [expr {[info exists node($parent)] ? $node($parent) : "root"}]
       set refvar [expr {[my set ajax] ? "ref" : "href"}]
       regsub -all {\"} $label {\"} label
@@ -1865,8 +1848,6 @@
           ""
 
     }
-    set navigation(count) $node_cnt
-    #my log "--COUNT=$node_cnt"
     return $js
   }
 
@@ -2000,7 +1981,7 @@
     </div>"
   }
 
-  toc instproc tree {js_tree_cmds} {
+  toc instproc non_ajax_tree {js_tree_cmds} {
     return "<div id='[my id]'>
       <script type = 'text/javascript'>
       var [my js_name] = {
@@ -2043,38 +2024,94 @@
 
   toc instproc render_yui_tree {pages style} {
     my get_parameters
-
+    #
+    # Render the tree with the yui widget (with or without ajax)
+    #
     my set book_mode $book_mode
-    if {!$book_mode} {
-      ###### my set book_mode [[my set __including_page] exists __is_book_page]
-    } elseif $ajax {
+    if {$book_mode} {
       #my log "--warn: cannot use bookmode with ajax, resetting ajax"
       set ajax 0
     }
     my set ajax $ajax
-            
+    # do the hard work here....
     set js_tree_cmds [my yui_tree $pages $open_page $package_id $expand_all $remove_levels]
-    return [expr {$ajax ? [my ajax_tree $js_tree_cmds ] : [my tree $js_tree_cmds ]}]
+    if {$ajax} {
+      return [my ajax_tree $js_tree_cmds]
+    }
+    return [my non_ajax_tree $js_tree_cmds]
   }
 
+  toc instproc build_navigation {pages} {
+    #
+    # compute associative arrays open_node and navigation (position
+    # and current)
+    #
+    my get_parameters
+    my instvar navigation page_name
+    array set navigation {position 0 current ""}
+
+    # the top node is always open
+    my set open_node() true
+    set node_cnt 0
+    foreach o [$pages children] {
+      $o instvar page_order name
+      incr node_cnt
+      set page_name($node_cnt) $name
+      if {![regexp {^(.*)[.]([^.]+)} $page_order _ parent]} {set parent ""}
+      #
+      # If we are on the provided $open_page, we remember our position
+      # for the progress bar.
+      set on_current_node [expr {$open_page eq $name} ? "true" : "false"]
+      if {$on_current_node} {
+        set navigation(position) $node_cnt
+        set navigation(current) $page_order
+      }
+      if {$expand_all} {
+        my set open_node($page_order) true
+      } elseif {$on_current_node} {
+        my set open_node($page_order) true
+        # make sure to open all nodes to the top
+        for {set p $parent} {$p ne ""} {} {
+          my set open_node($p) true
+          if {![regexp {^(.*)[.]([^.]+)} $p _ p]} {set p ""}
+        }
+      }
+    }
+    set navigation(count) $node_cnt
+    #my log OPEN=[lsort [my array names open_node]]
+  }
+
   toc instproc render_list {pages} {
     my get_parameters
+    my instvar navigation page_name
+    #
+    # Build a reduced toc tree based on pure HTML (no javascript or
+    # ajax involved).  If an open_page is specified, produce an as
+    # small as possible tree and omit all non-visible nodes.
+    #
+
     set html "<UL>\n"
     set level 0
     foreach o [$pages children] {
-      $o instvar page_order title page_id name
+      $o instvar page_order title name
+      if {![regexp {^(.*)[.]([^.]+)} $page_order _ parent]} {set parent ""}
       set page_number [my page_number $page_order $remove_levels]
-      set new_level [regsub -all {[.]} $page_number . _]
-      if {$new_level > $level} {
-	for {set l $level} {$l < $new_level} {incr l} {append html "<ul>\n"}
-	set level $new_level
-      } elseif {$new_level < $level} {
-	for {set l $new_level} {$l < $level} {incr l} {append html "</ul>\n"}
-	set level $new_level
+
+      set new_level [regsub -all {[.]} [$o set page_order] . _]
+      if {[my exists open_node($parent)] || [my exists open_node($page_order)]} {
+        if {$new_level > $level} {
+          for {set l $level} {$l < $new_level} {incr l} {append html "<ul>\n"}
+          set level $new_level
+        } elseif {$new_level < $level} {
+          for {set l $new_level} {$l < $level} {incr l} {append html "</ul>\n"}
+          set level $new_level
+        }
+        set href [my href $package_id $book_mode $name]
+        set highlight [if {$open_page eq $name} {set _ "style = 'font-weight:bold;'"} {}]
+        append html "<li><a $highlight href='$href'>$page_number $title</a>\n"
       }
-      set href [my href $package_id $book_mode $name]
-      append html "<li><a href='$href'>$page_number $title</a>\n"
     }
+    # close all levels
     for {set l 0} {$l <= $level} {incr l} {append html "</ul>\n"}
     return $html
   }
@@ -2098,8 +2135,17 @@
       "list"    {set s ""; set list_mode 1}
       "default" {set s ""}
     }
+    #
+    # Collect the pages
+    #
     set pages [my build_toc $package_id $locale $source $range]
-
+    #
+    # Build the general navigation structure using associative arrays
+    #
+    my build_navigation $pages
+    #
+    # Call a render on the created structure
+    #
     if {$list_mode} {
       return [my render_list $pages]
     } else {
@@ -3120,7 +3166,7 @@
     }
 
     set items [::xowiki::FormPage get_form_entries \
-                   -base_item_id $form_item_id \
+                   -base_item_ids $form_item_id \
                    -form_fields $form_fields \
                    -publish_status $publish_status \
                    -always_queried_attributes [list _name _last_modified _creation_user] \
@@ -3134,7 +3180,7 @@
       } else {
         # difference to variable items: just the extra_where_clause
         set base_items [::xowiki::FormPage get_form_entries \
-                   -base_item_id $form_item_id \
+                   -base_item_ids $form_item_id \
                    -form_fields $form_fields \
                    -publish_status $publish_status \
                    -always_queried_attributes [list _name _last_modified _creation_user] \
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.163 -r1.164
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	9 Feb 2009 21:04:17 -0000	1.163
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	12 Feb 2009 15:07:15 -0000	1.164
@@ -331,8 +331,25 @@
     return 0
   }
 
-  Package instproc resolve_page_name {page_name} {
+  Package instproc get_package_id_from_page_name {{-default_lang ""} page_name} {
     #
+    # Return package id + reminding page name
+    #
+    set package_id [my id]
+    if {[regexp {^/(/[^/]+/)(.*)$} $page_name _ url page_name]} {
+      array set "" [site_node::get_from_url -url $url]
+      if {$(package_id) eq ""} {return ""}
+      set package_id $(package_id)
+      ::xowiki::Package require $package_id
+      my get_lang_and_name -default_lang $default_lang -path $page_name lang stripped_name
+      set page_name $lang:$stripped_name
+    }
+    #my msg [self args]->[list package_id $package_id page_name $page_name]
+    return [list package_id $package_id page_name $page_name]
+  }
+
+  Package instproc resolve_page_name {{-default_lang ""} page_name} {
+    #
     # This is a very simple version for resolving page names in an
     # package instance.  It can be called either a plain page name
     # with a language prefix (as stored in the CR) for the current
@@ -345,15 +362,11 @@
     #
     # The method returns either the page object or empty ("").
     #
-    set package_id [my id]
-    if {[regexp {^/(/[^/]+/)(.*)$} $page_name _ url page_name]} {
-      array set "" [site_node::get_from_url -url $url]
-      if {$(package_id) eq ""} {return ""}
-      set package_id $(package_id)
-      ::xowiki::Package require $package_id
-    }
-    #my log "final resolve $package_id '$page_name'"
-    return [$package_id resolve_request -simple true -path $page_name method_var]
+    array set "" [my get_package_id_from_page_name $page_name]
+    if {![info exists (package_id)]} {return ""}
+    
+    #my log "final resolve $(package_id) '$(page_name)'"
+    return [$(package_id) resolve_request -default_lang $default_lang -simple true -path $(page_name) method_var]
   }
 
   Package instproc resolve_page_name_and_init_context {{-lang} page_name} {
@@ -689,15 +702,24 @@
     return $packages
   }
 
-  Package instproc lookup {-name:required -parent_id} {
+  Package instproc lookup {{-default_lang ""} -name:required -parent_id} {
     #
     # Lookup of names from a given parent_id or from the list of
     # configured instances (obtained via package_path).
     #
-    if {![info exists parent_id]} {set parent_id [my folder_id]}
-    set item_id [::xo::db::CrClass lookup -name $name -parent_id $parent_id]
-    #my msg "lookup $name $parent_id returns $item_id"
+    array set "" [my get_package_id_from_page_name -default_lang $default_lang $name]
+    #my msg "result = [array get {}]"
+    if {![info exists (package_id)]} {
+      return 0
+    }
+    
+    if {![info exists parent_id]} {set parent_id [$(package_id) folder_id]}
+    set item_id [::xo::db::CrClass lookup -name $(page_name) -parent_id $parent_id]
+    #my msg "lookup $name $parent_id in package $(package_id) returns $item_id"
     if {$item_id == 0} {
+      #
+      # Is the page inherited along the package path?
+      #
       foreach package [my package_path] {
         set item_id [$package lookup -name $name]
         #my msg "lookup from package $package $name returns $item_id"
Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v
diff -u -r1.40 -r1.41
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl	7 Feb 2009 14:39:28 -0000	1.40
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl	12 Feb 2009 15:07:15 -0000	1.41
@@ -26,11 +26,12 @@
     {compute_summary false}
   }
 
-  ::xowiki::Weblog proc instantiate_forms {-entries_of:required -package_id:required} {
+  ::xowiki::Weblog proc instantiate_forms {{-default_lang ""} -entries_of:required -package_id:required} {
     set folder_id [::$package_id folder_id]
     set form_items [list]
     foreach t [split $entries_of |] {
-      set form_item_id [::xo::db::CrClass lookup -name $t -parent_id $folder_id]
+      # Entry $t might contain a package prefix
+      set form_item_id [$package_id lookup -default_lang $default_lang -name $t]
       if {$form_item_id == 0} {
         # The form does not exist in the CR. Maybe we can create it
         # via a prototype page?
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.331 -r1.332
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	10 Feb 2009 18:58:51 -0000	1.331
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	12 Feb 2009 15:07:15 -0000	1.332
@@ -2206,7 +2206,7 @@
   }
 
   FormPage proc get_form_entries {
-       -base_item_id 
+       -base_item_ids 
        -package_id 
        -form_fields 
        {-publish_status ready}
@@ -2272,7 +2272,7 @@
     set sql  [::xowiki::FormPage instance_select_query \
 		    -select_attributes $sql_atts \
 		    -from_clause "" \
-		    -where_clause " bt.page_template = $base_item_id \
+		    -where_clause " bt.page_template in ([join $base_item_ids ,]) \
 			$publish_status_clause $filter_clause $extra_where_clause" \
 		    -orderby $orderby \
 		    -with_subtypes false \