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.6 -r1.83.2.7
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	13 Sep 2007 10:46:37 -0000	1.83.2.6
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl	13 Sep 2007 12:38:54 -0000	1.83.2.7
@@ -1436,10 +1436,10 @@
       set ajax 0
     }
     my set ajax $ajax
+    if {![my exists id]} {my set id [::xowiki::Portlet html_id [self]]}
     if {[info exists category_id]} {my set category_id $category_id}
             
     set js_tree_cmds [my get_nodes $open_page $package_id $expand_all $remove_levels]
-
     return [expr {$ajax ? [my ajax_tree $js_tree_cmds ] : [my tree $js_tree_cmds ]}]
   }
 
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.95.2.4 -r1.95.2.5
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	12 Sep 2007 10:01:39 -0000	1.95.2.4
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	13 Sep 2007 12:38:54 -0000	1.95.2.5
@@ -656,10 +656,21 @@
     #my msg field_names=$field_names
 
     set form_fields [my create_form_fields $field_names]
+
+    # check name field: 
+    #  - if it is not required, hide it,
+    #  - if it is required but hidden, show it anyway 
+    #    (might happen, when e.g. set via @cr_fields ... hidden)
+    set name_field [my lookup_form_field -name _name $form_fields]
     if {$anon_instances} {
-      set f [my lookup_form_field -name _name $form_fields]
-      $f config_from_spec hidden
+      $name_field config_from_spec hidden
+    } else {
+      if {[$name_field istype ::xowiki::FormField::hidden]} {
+        $name_field config_from_spec text,required
+        $name_field type text
+      }
     }
+
     # include _text only, if explicitely needed (in form or template)
     if {[lsearch $needed_attributes _text] == -1} {
       #my msg "setting text hidden"
@@ -726,13 +737,14 @@
       }
     }
     
-    # the following command wout be correct, but does not work due to a bug in 
+    # The following command would be correct, but does not work due to a bug in 
     # tdom.
-    #set form [my regsub_eval  \
+    # set form [my regsub_eval  \
     #              [template::adp_variable_regexp] $form \
     #              {my form_field_as_html "\\\1" "\2" $form_fields}]
-    # due to this bug, we replace the at-character by \x003 to avoid conflict withe the
-    # input and we insert the fields in the result from tdom.
+    # Due to this bug, we program around and replace the at-character 
+    # by \x003 to avoid conflict withe the input and we replace these
+    # magic chars finally with the fields resulting from tdom.
 
     set form [string map [list @ \x003] $form]
     #my msg form=$form
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view.adp,v
diff -u -r1.39.2.2 -r1.39.2.3
--- openacs-4/packages/xowiki/www/oacs-view.adp	1 Aug 2007 21:39:25 -0000	1.39.2.2
+++ openacs-4/packages/xowiki/www/oacs-view.adp	13 Sep 2007 12:38:54 -0000	1.39.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Sep 13 11:50:11 CEST 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -63,10 +63,10 @@
       <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>
 <div style="float:left; width: 25%; font-size: 85%;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view2.adp,v
diff -u -r1.18.2.2 -r1.18.2.3
--- openacs-4/packages/xowiki/www/oacs-view2.adp	1 Aug 2007 21:39:25 -0000	1.18.2.2
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	13 Sep 2007 12:38:54 -0000	1.18.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Sep 13 11:50:11 CEST 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -65,10 +65,10 @@
       <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>
 <div style="float:left; width: 25%; font-size: 85%;
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view3.adp,v
diff -u -r1.13.2.2 -r1.13.2.3
--- openacs-4/packages/xowiki/www/oacs-view3.adp	1 Aug 2007 21:39:25 -0000	1.13.2.2
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	13 Sep 2007 12:38:54 -0000	1.13.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Sep 13 11:50:11 CEST 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -65,10 +65,10 @@
       <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>
 <div style="float:left; width: 245px; font-size: 85%;">
 <style type='text/css'>
 table.mini-calendar {width: 227px ! important;font-size: 80%;}
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-default.adp,v
diff -u -r1.35.2.2 -r1.35.2.3
--- openacs-4/packages/xowiki/www/view-default.adp	1 Aug 2007 21:39:25 -0000	1.35.2.2
+++ openacs-4/packages/xowiki/www/view-default.adp	13 Sep 2007 12:38:54 -0000	1.35.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Sep 13 11:50:11 CEST 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -57,10 +57,10 @@
       <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>
 @top_portlets;noquote@
 @content;noquote@
 @footer;noquote@
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-links.adp,v
diff -u -r1.25.2.2 -r1.25.2.3
--- openacs-4/packages/xowiki/www/view-links.adp	1 Aug 2007 21:39:25 -0000	1.25.2.2
+++ openacs-4/packages/xowiki/www/view-links.adp	13 Sep 2007 12:38:54 -0000	1.25.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Sep 13 11:50:11 CEST 2007 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>
@@ -12,10 +12,10 @@
       <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>
 @top_portlets;noquote@
 @content;noquote@
 
Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-plain.adp,v
diff -u -r1.21.2.2 -r1.21.2.3
--- openacs-4/packages/xowiki/www/view-plain.adp	1 Aug 2007 21:39:25 -0000	1.21.2.2
+++ openacs-4/packages/xowiki/www/view-plain.adp	13 Sep 2007 12:38:54 -0000	1.21.2.3
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Thu Jul 19 23:18:01 CEST 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Thu Sep 13 11:50:11 CEST 2007 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>