Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.139 -r1.140
--- openacs-4/packages/xowiki/xowiki.info	20 May 2011 09:52:45 -0000	1.139
+++ openacs-4/packages/xowiki/xowiki.info	26 May 2011 18:29:27 -0000	1.140
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.138" url="http://openacs.org/repository/download/apm/xowiki-0.138.apm">
+    <version name="0.139" url="http://openacs.org/repository/download/apm/xowiki-0.139.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A more generic xotcl-based wikis example with object types
 and subtypes based on the content repository (with category support)</summary>
@@ -56,12 +56,12 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.138"/>
+        <provides url="xowiki" version="0.139"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
         <requires url="general-comments" version="4.6.1"/>
-        <requires url="xotcl-core" version="0.118"/>
+        <requires url="xotcl-core" version="0.119"/>
 
         <callbacks>
             <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
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.435 -r1.436
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	25 May 2011 12:40:44 -0000	1.435
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	26 May 2011 18:29:27 -0000	1.436
@@ -3228,11 +3228,11 @@
     return $name
   }
 
-  FormPage instproc include_header_info {prefix} {
-    foreach line [my get_from_template ${prefix}_js] {
-      ::xo::Page requireJS $line
-    }
-    foreach line [my get_from_template ${prefix}_css] {
+  FormPage instproc include_header_info {{-prefix ""} {-js ""} {-css ""}} {
+    if {$css eq ""} {set css [my get_from_template ${prefix}_css]}
+    if {$js eq ""}  {set js [my get_from_template ${prefix}_js]}
+    foreach line [split $js \n] {::xo::Page requireJS $line}
+    foreach line [split $css \n] {
       set order 1
       if {[llength $line]>1} {
 	set e1 [lindex $line 0]
@@ -3247,7 +3247,8 @@
 
   FormPage instproc render_content {} {
     my instvar doc root package_id page_template
-    my include_header_info form_view
+    my include_header_info -prefix form_view
+    if {[::xo::cc mobile]} {my include_header_info -prefix mobile}
 
     set text [my get_from_template text]
     if {$text ne ""} {
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.294 -r1.295
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	26 May 2011 11:30:43 -0000	1.294
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	26 May 2011 18:29:27 -0000	1.295
@@ -610,7 +610,7 @@
     #my log "edit [self args]"
 
     ::xowiki::Form requireFormCSS
-    my include_header_info form_edit
+    my include_header_info -prefix form_edit
 
     set form [my get_form]
     set anon_instances [my get_anon_instances]