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.248.2.44 -r1.248.2.45
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	2 Mar 2017 16:15:01 -0000	1.248.2.44
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	5 Mar 2017 15:50:07 -0000	1.248.2.45
@@ -2568,7 +2568,7 @@
     set value [my value]
     foreach o [my options] {
       lassign $o label rep
-      set atts [my get_attributes disabled {CSSclass class}]
+      set atts [my get_attributes disabled]
       if {[my exists forced_name]} {
         set name [my forced_name]
       } {
@@ -2579,9 +2579,11 @@
       if {$value eq $rep} {
         lappend atts checked checked
       }
-      ::html::input $atts {}
-      ::html::label -for $id {
-        html::t "$label  "
+      set label_class ""
+      if {[my horizontal]} {set label_class "radio-inline"}
+      ::html::label -for $id -class $label_class {
+        ::html::input $atts {}
+        ::html::t " $label "
       }
       if {![my horizontal]} {
         html::br
Index: openacs-4/packages/xowiki/www/resources/repeat.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/repeat.js,v
diff -u -r1.3.2.4 -r1.3.2.5
--- openacs-4/packages/xowiki/www/resources/repeat.js	23 Dec 2016 14:41:21 -0000	1.3.2.4
+++ openacs-4/packages/xowiki/www/resources/repeat.js	5 Mar 2017 15:50:07 -0000	1.3.2.5
@@ -207,14 +207,17 @@
  */
 xowiki.repeat.renameItem = function(top, e, from, to) {
     if (e == undefined) {return;}
-    //console.log('renameItem: work on ' + e.nodeName + ' ' + from + ' ' + to);
     //console.info(e);
     var items = e.children;
+    //console.log('renameItem: work on ' + e.nodeName + ' ' + from + ' ' + to + ' items.length: ' + items.length);
+
     if (items.length == 0 || e.nodeName == 'SELECT') {
         var name = e.name;
+
         if (typeof name != "undefined" && name != "") {
-            //console.log('renameItem: compare ' + name + ' from ' + from);
+            //console.log('renameItem: subitem compare ' + name + ' from ' + from);
             var compareLength = from.length;
+            
             if (name.substring(0,compareLength) == from) {
                 //console.log('renameItem: RENAME ' + name + ' from ' + from);
                 var new_name = to;
@@ -223,6 +226,8 @@
                 }
                 e.name = new_name;
                 e.disabled = false;
+                //console.log('remove disable attribute from ' + e.nodeName);
+
                 // we have also to remove the disabled attribute for options of a select field
                 if (e.nodeName == 'SELECT') {
                     $(e).find('option:disabled').each(function() {
@@ -246,7 +251,7 @@
 
             }
         }
-    } else if (e.nodeName == 'DIV' || e.nodeName == 'FIELDSET') {
+    } else if (e.nodeName == 'DIV' || e.nodeName == 'FIELDSET' || e.nodeName == 'LABEL') {
         //
         // Check, if there is a data-repeat attribute.
         //