Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.72 -r1.73
--- openacs-4/packages/xowiki/xowiki.info	26 Nov 2007 09:14:43 -0000	1.72
+++ openacs-4/packages/xowiki/xowiki.info	17 Dec 2007 12:22:52 -0000	1.73
@@ -8,7 +8,7 @@
     <singleton-p>f</singleton-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.79" url="http://openacs.org/repository/download/apm/xowiki-0.79.apm">
+    <version name="0.80" url="http://openacs.org/repository/download/apm/xowiki-0.80.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>
@@ -54,7 +54,7 @@
         <license>BSD-Style</license>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.79"/>
+        <provides url="xowiki" version="0.80"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
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.47 -r1.48
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	14 Dec 2007 10:24:51 -0000	1.47
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	17 Dec 2007 12:22:52 -0000	1.48
@@ -28,7 +28,7 @@
   # ::xowiki::FormField (Base Class)
   #
   ###########################################################
-  Class FormField -parameter {
+  Class FormField -superclass ::xo::tdom::Object -parameter {
     {required false} 
     {display_field true} 
     {hide_value false} 
@@ -256,31 +256,6 @@
     return $spec
   }
 
-  FormField ad_instproc get_attributes {
-    args
-  } {
-    Get a list of attribute value pairs
-    of instance attributes. It returns only those
-    pairs for which a value exists.
-
-    @return flattened list of attribute value pairs
-  } {
-    set pairs [list]
-    foreach attribute $args {
-      set l [split $attribute]
-      if {[llength $l] > 1} {
-        foreach {attribute HTMLattribute} $l break
-      } else {
-        set HTMLattribute $attribute
-      }
-      #my msg "[my name] check for $attribute => [my exists $attribute]"
-      if {[my exists $attribute]} {
-        lappend pairs $HTMLattribute [my set $attribute]
-      }
-    }
-    return $pairs
-  }
-  
   FormField instproc render {} {
     # In case, we use an asHTML of a FormField, we use this
     # render definition 
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.6 -r1.7
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	7 Dec 2007 14:25:04 -0000	1.6
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	17 Dec 2007 12:22:52 -0000	1.7
@@ -73,19 +73,10 @@
     return $result
   }
 
-  ::xowiki::Includelet instproc initialize {} {
-    # This method is called at a time after init and before render.
-    # It can be used to alter specified parameter from the user,
-    # or to influence the rendering of a decoration (e.g. title etc.)
+  ::xowiki::Includelet proc js_name {name} {
+    return [string map [list : _ # _] $name]
   }
   
-  ::xowiki::Includelet instproc js_name {} {
-    return [string map [list : _ # _] [self]]
-  }
-
-  ::xowiki::Includelet instproc self_id {} {
-    return [string map [list : _ # _] [self]]
-  }
   ::xowiki::Includelet proc html_id {name} {
     # Construct a valid HTML id or name. 
     # For details, see http://www.w3.org/TR/html4/types.html
@@ -118,11 +109,6 @@
     return $link
   }
 
-  ::xowiki::Includelet instproc screen_name {user_id} {
-    acs_user::get -user_id $user_id -array user
-    return [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}]
-  }
-
   ::xowiki::Includelet proc incr_page_order {p} {
     regexp {^(.*[.]?)([^.])$} $p _ prefix suffix
     if {[string is integer -strict $suffix]} {
@@ -236,7 +222,21 @@
       foreach page $pages {set page_order($page) [incr i]}
     }
   }
+
+  ::xowiki::Includelet instproc initialize {} {
+    # This method is called at a time after init and before render.
+    # It can be used to alter specified parameter from the user,
+    # or to influence the rendering of a decoration (e.g. title etc.)
+  }
   
+  ::xowiki::Includelet instproc js_name {} {
+    return [[self class] js_name [self]]
+  }
+
+  ::xowiki::Includelet instproc screen_name {user_id} {
+    acs_user::get -user_id $user_id -array user
+    return [expr {$user(screen_name) ne "" ? $user(screen_name) : $user(name)}]
+  }  
 }
 
 namespace eval ::xowiki::includelet {