[MERGE] Merge trunk

bzr revid: fme@openerp.com-20120514084623-kxu8o8bu03qzfl3f

diff --cc addons/web/static/src/css/base.css
Simple merge

diff --cc addons/web/static/src/css/base.sass
Simple merge

diff --cc addons/web/static/src/js/view_form.js
Simple merge

diff --cc addons/web/static/src/xml/base.xml
index 3af02f3,3a24beb..c0c86af
--- 1/addons/web/static/src/xml/base.xml
--- 2/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@@ -1054,8 -1047,24 +1054,24 @@@
          </span>
      </t>
  </t>
+ <t t-name="FieldMany2ManyTags">
+     <div class="oe_form_field_many2manytags">
+         <t t-if="! widget.get('effective_readonly')">
+             <textarea rows="1" style="width: 100%"></textarea>
+         </t>
+     </div>
+ </t>
+ <t t-name="FieldMany2ManyTags.box">
+     <t t-set="i" t-value="0"/>
+     <t t-foreach="elements" t-as="el">
+         <span class="oe_form_field_many2manytags_box" t-att-data-index="i">
+             <t t-esc="el[1]"/>
+         </span>
+         <t t-set="i" t-value="i + 1"/>
+     </t>
+ </t>
  <t t-name="FieldReference">
 -    <table class="oe_form_field_reference oe_frame oe_forms" border="0" cellpadding="0" cellspacing="0">
 +    <table class="oe_form_field_reference oe_form" border="0" cellpadding="0" cellspacing="0">
      <tr>
          <td t-attf-class="oe_form_frame_cell oe_form_selection oe_form_view_reference_selection">
          </td>

diff --cc addons/web_kanban/static/src/js/kanban.js
Simple merge

diff --cc addons/web_kanban/static/src/xml/web_kanban.xml
Simple merge