Some macros do not work properly and have some UI related issues

STEPS TO REPRODUCE

1. Edit a page in CKEditor mode
2. Click on "XWiki Macro" Button
3. Search for a Macro (e.g. Velocity) and click 'Select'
4. Paste a Velocity content e.g.:

   #set($words = ["Some", "velocity", "code"])
   #foreach($word in $words)
     $word
   #end

1. Click on 'More' to display the hidden options
2. Observe the available options and their checkboxes (including the placement)
3. Click 'Submit' and 'Save & View'

EXPECTED RESULTS

The Velocity Macro's output is displayed properly. The checkboxes are inline with the their corresponding options.

ACTUAL RESULTS

When click 'Submit', there is no output displayed, although the 'Output' and 'Wiki' chechboxes were ticked. In Source mode, the following is displayed (notice the first line):

{{velocity output="true,false" wiki="true,false"}}
#set($words = ["Some", "velocity", "code"])
#foreach($word in $words)
  $word
#end
{{/velocity}}

If the macro is edited at this point (double-click in normal edit mode), both the 'Output' and 'Wiki' chechboxes are not ticked. If the checkboxes are manually ticked and the macro is submitted again, there is also no change (thus no output).

I've noticed that if in Source mode the 'false' value is manually deleted, the output is displayed properly.

Also, the checkboxes are displayed below their corresponding options (instead of being displayed inline). The identified macros that also have these issues are (may not be the complete list):

• Container
• Groovy
• HTML
• Office Document Viewer
• Python
• RSS
• Script
• Table of contents
• Template
• Velocity

The issues could not be reproduced on CKEditor Integration 1.29.