[MERGE] overlay editable list a la rache

bzr revid: al@openerp.com-20120723174341-byh5ep8pg15kpeg9

1 files changed, 17 insertions, 13 deletions

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 54bf221fc26..ed63b5fbfbe 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -630,9 +630,9 @@
         <button type="button" class="oe_button oe_list_add oe_highlight">
             <t t-esc="widget.options.addable"/>
         </button>
-        <t t-if="widget.options.import_enabled">
+        <span class="oe_alternative" t-if="widget.options.import_enabled">
             <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a>
-        </t>
+        </span>
     </t>
 </div>
 <t t-name="ListView.pager">
@@ -652,6 +652,7 @@
 <tr t-name="ListView.row" t-att-class="row_parity"
         t-att-data-id="record.get('id')"
         t-att-style="view.style_for(record)">
+    <t t-set="asData" t-value="record.toForm().data"/>
     <t t-foreach="columns" t-as="column">
         <td t-if="column.meta">
 
@@ -663,23 +664,26 @@
         <input t-if="!options.radio" type="checkbox" name="radiogroup" t-att-checked="checked"/>
     </th>
     <t t-foreach="columns" t-as="column">
-        <t t-set="align" t-value="column.type === 'integer' or column.type == 'float'"/>
+        <t t-set="number" t-value="column.type === 'integer' or column.type == 'float'"/>
+        <t t-set="modifiers" t-value="column.modifiers_for(asData)"/>
         <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help"
-            t-att-class="'oe_list_field_cell' + (align ? ' oe_number' : '')
-                         + (column.tag === 'button' ? ' oe_button' : '')"
-            t-att-data-field="column.id">
-            <t t-raw="render_cell(record, column)"/>
-        </td>
+            t-attf-class="oe_list_field_cell oe_list_field_#{column.widget or column.type} #{number ? 'oe_number' : ''} #{column.tag === 'button' ? 'oe-button' : ''} #{modifiers.readonly ? 'oe_readonly' : ''}"
+            t-att-data-field="column.id"
+            ><t t-raw="render_cell(record, column)"/></td>
     </t>
     <td t-if="options.deletable" class='oe_list_record_delete' width="1">
         <button type="button" name="delete" class="oe_i">d</button>
     </td>
 </tr>
 
-<t t-name="ListView.row.save">
-    <td>
-        <button class='oe_i oe_list_edit_row_save' type='button' name='save'/>
-    </td>
+<t t-extend="ListView.buttons">
+    <t t-jquery="button.oe_list_add" t-operation="after">
+        <button class="oe_button oe_list_save oe_highlight"
+                type="button">Save</button>
+    </t>
+    <t t-jquery="a.oe_list_button_import" t-operation="after">
+        <a href="#" class="oe_bold oe_list_discard">discard</a>
+    </t>
 </t>
 
 <t t-name="FormView">
@@ -1498,7 +1502,7 @@
          missing columns
      -->
     <t t-jquery="&gt; :last" t-operation="after">
-        <td t-if="edited and !options.deletable" class="oe_list_padding"/>
+        <td t-if="edited and !options.deletable" class="oe-listview-padding"/>
     </t>
 </t>