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.15 -r1.16
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	7 Dec 2007 14:25:04 -0000	1.15
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	18 Dec 2007 09:00:11 -0000	1.16
@@ -52,6 +52,8 @@
 {<master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <property name="&body">property_body</property>
+  <property name="&doc">property_doc</property>
   <property name="header_stuff">
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
   @header_stuff;noquote@[my extra_header_stuff]
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.121 -r1.122
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	14 Dec 2007 10:24:51 -0000	1.121
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	18 Dec 2007 09:00:11 -0000	1.122
@@ -215,13 +215,19 @@
           set template_file /packages/xowiki/www/$template_file
         }
         set header_stuff [::xo::Page header_stuff]
+        #
+        # pass variables for properties doc and body
+        # example: set property_body(class) "yui-skin-sam"
+        #
+        my instvar property_body property_doc
+
         $package_id return_page -adp $template_file -variables {
           name title item_id context header_stuff return_url
           content footer package_id
           rev_link edit_link delete_link new_link admin_link index_link 
           notification_subscribe_link notification_image 
           top_includelets page
-          views_data
+          views_data property_body property_doc
         }
       }
     } else {
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.44 -r1.45
--- openacs-4/packages/xowiki/www/oacs-view.adp	19 Nov 2007 12:28:11 -0000	1.44
+++ openacs-4/packages/xowiki/www/oacs-view.adp	18 Dec 2007 09:00:11 -0000	1.45
@@ -1,7 +1,9 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Nov 19 12:46:16 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 18 09:52:20 CET 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <property name="&body">property_body</property>
+  <property name="&doc">property_doc</property>
   <property name="header_stuff">
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
   @header_stuff;noquote@
@@ -66,7 +68,7 @@
    <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>
 <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> 
+  <FORM action='/search/search'><div><INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
 </div>
 </div>
 <div style="float:left; width: 25%; font-size: 85%;
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.23 -r1.24
--- openacs-4/packages/xowiki/www/oacs-view2.adp	19 Nov 2007 12:28:11 -0000	1.23
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	18 Dec 2007 09:00:11 -0000	1.24
@@ -1,7 +1,9 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Nov 19 12:46:16 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 18 09:52:20 CET 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <property name="&body">property_body</property>
+  <property name="&doc">property_doc</property>
   <property name="header_stuff">
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
   @header_stuff;noquote@
@@ -68,7 +70,7 @@
    <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>
 <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> 
+  <FORM action='/search/search'><div><INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
 </div>
 </div>
 <div style="float:left; width: 25%; font-size: 85%;
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.18 -r1.19
--- openacs-4/packages/xowiki/www/oacs-view3.adp	19 Nov 2007 12:28:11 -0000	1.18
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	18 Dec 2007 09:00:11 -0000	1.19
@@ -1,7 +1,9 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Nov 19 12:46:16 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 18 09:52:20 CET 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <property name="&body">property_body</property>
+  <property name="&doc">property_doc</property>
   <property name="header_stuff">
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
   @header_stuff;noquote@
@@ -68,7 +70,7 @@
    <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>
 <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> 
+  <FORM action='/search/search'><div><INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
 </div>
 </div>
 <div style="float:left; width: 245px; font-size: 85%;">
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.40 -r1.41
--- openacs-4/packages/xowiki/www/view-default.adp	19 Nov 2007 12:28:11 -0000	1.40
+++ openacs-4/packages/xowiki/www/view-default.adp	18 Dec 2007 09:00:11 -0000	1.41
@@ -1,7 +1,9 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Nov 19 12:46:16 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 18 09:52:20 CET 2007 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
+  <property name="&body">property_body</property>
+  <property name="&doc">property_doc</property>
   <property name="header_stuff">
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
   @header_stuff;noquote@
@@ -60,7 +62,7 @@
    <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>
 <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> 
+  <FORM action='/search/search'><div><INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
 </div>
 </div>
 @top_includelets;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.30 -r1.31
--- openacs-4/packages/xowiki/www/view-links.adp	19 Nov 2007 12:28:11 -0000	1.30
+++ openacs-4/packages/xowiki/www/view-links.adp	18 Dec 2007 09:00:11 -0000	1.31
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Nov 19 12:46:16 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 18 09:52:20 CET 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'>
@@ -13,7 +13,7 @@
    <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>
 <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> 
+  <FORM action='/search/search'><div><INPUT id='do_search_q' name='q' type='text'><INPUT type="hidden" name="search_package_id" value="@package_id@" ></div></FORM> 
 </div>
 </div>
 @top_includelets;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.26 -r1.27
--- openacs-4/packages/xowiki/www/view-plain.adp	19 Nov 2007 12:28:11 -0000	1.26
+++ openacs-4/packages/xowiki/www/view-plain.adp	18 Dec 2007 09:00:11 -0000	1.27
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Mon Nov 19 12:46:16 CET 2007 -->
+<!-- Generated by ::xowiki::ADP_Generator on Tue Dec 18 09:52:20 CET 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'>