follow-up bug fix to 7bcc8107

core/src/main/resources/lib/form/radioBlock.jelly

@@ -52,13 +52,15 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
 
-  <st:adjunct includes="lib.form.hetero-list.radioBlock.radioBlock"/>
+  <st:adjunct includes="lib.form.radioBlock.radioBlock"/>
 
 	<tr class="radio-block-start ${attrs.inline?'':'row-set-start'}" hasHelp="${attrs.help!=null}"><!-- this ID marks the beginning -->
 	  <td colspan="3">
-	    <input type="radio" name="${name}" value="${value}"
+      <label>
+	      <input type="radio" name="${name}" value="${value}"
              class="radio-block-control" checked="${checked?'true':null}" />
-      <label class="attach-previous">${title}</label>
+        ${title}
+      </label>
     </td>
     <j:if test="${attrs.help!=null}">
       <td>

core/src/main/resources/lib/form/radioBlock/radioBlock.js

@@ -24,7 +24,10 @@ var radioBlockSupport = {
     }
 };
 
-Behaviour.register({
+Behaviour.list.unshift({
+    // this needs to happen before TR.row-set-end rule kicks in.
+    // but this is a hack.
+    // TODO: how do we handle ordering?
     "INPUT.radio-block-control" : function(r) {
         r.id = "radio-block-"+(iota++);