Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -r1.9.2.2 -r1.9.2.3
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	1 Aug 2007 21:39:24 -0000	1.9.2.2
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	13 Sep 2007 10:46:37 -0000	1.9.2.3
@@ -74,9 +74,9 @@
       <a href="@notification_subscribe_link@">@notification_image;noquote@</a> &middot; </if>  
    <a href='#' onclick='document.getElementById("do_search").style.display="inline";document.getElementById("do_search_q").focus(); return false;'>#xowiki.search#</a> &middot;
   <if @index_link@ not nil><a href="@index_link@" accesskey='i'>#xowiki.index#</a></if>
-<span id='do_search' style='display: none'> 
+<div id='do_search' style='display: none'> 
   <FORM action='/search/search'><INPUT  id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" /></FORM> 
-</span>
+</div>
 </div>}
   }
 
Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -r1.83.2.5 -r1.83.2.6
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	13 Sep 2007 08:33:43 -0000	1.83.2.5
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	13 Sep 2007 10:46:37 -0000	1.83.2.6
@@ -65,6 +65,16 @@
   ::xowiki::Portlet proc html_id {name} {
     # Construct a valid HTML id or name. 
     # For details, see http://www.w3.org/TR/html4/types.html
+    #
+    # For XOTcl object names, strip first the colons
+    set name [string trimleft $name :]
+    
+    # make sure, the ID starts with characters
+    if {![regexp {^[A-Za-z]} $name]} {
+      set name id_$name
+    }
+
+    # replace unwanted characters
     regsub -all {[^A-Za-z0-9_:.-]} $name _ name
     return $name
   }
@@ -1153,6 +1163,7 @@
           {-remove_levels 0}
           {-category_id}
         }}
+        id
       }
 
 #"select page_id,  page_order, name, title, \
@@ -1249,7 +1260,7 @@
   }
 
   toc instproc ajax_tree {js_tree_cmds} {
-    return "<div id='[::xowiki::Portlet html_id [self]]'>
+    return "<div id='[my id]'>
       <script type = 'text/javascript'>
       var [my js_name] = {
 
@@ -1361,7 +1372,7 @@
 
 
          treeInit: function() { 
-            [my js_name].tree = new YAHOO.widget.TreeView('[self]'); 
+            [my js_name].tree = new YAHOO.widget.TreeView('[my id]'); 
             root = [my js_name].tree.getRoot(); 
             [my js_name].objs = new Array();
             $js_tree_cmds
@@ -1379,14 +1390,14 @@
   }
 
   toc instproc tree {js_tree_cmds} {
-    return "<div id='[::xowiki::Portlet html_id [self]]'>
+    return "<div id='[my id]'>
       <script type = 'text/javascript'>
       var [my js_name] = {
 
          getPage: function(href, c) { return true; },
 
          treeInit: function() { 
-            [my js_name].tree = new YAHOO.widget.TreeView('[self]'); 
+            [my js_name].tree = new YAHOO.widget.TreeView('[my id]'); 
             root = [my js_name].tree.getRoot(); 
             [my js_name].objs = new Array();
             $js_tree_cmds
@@ -1622,8 +1633,14 @@
 	set html [$p include_portlet [list $b -book_mode true]]
 	if {$html ne ""} {lappend menu $html}
       }
-      append output "<h$level class='book'>" \
-          "<div style='float: right'>" [join $menu "&nbsp;"] "</div>" \
+      set menu [join $menu "&nbsp;"]
+      if {$menu ne ""} {
+        # <div> not allowed in h*: style='float: right; position: relative; top: -32px
+        set menu "<span style='float: right;'>$menu</span>"
+      }
+
+      append output \
+          "<h$level class='book'>" $menu \
           "<a name='[toc anchor $name]'></a>$page_order $title</h$level>" \
           $content
     }