[MERGE] Latest openerp-web

bzr revid: bth@tinyerp.com-20110614123718-v2wn43dwjz5y2zf1

1 files changed, 69 insertions, 22 deletions

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 45914c5a3c3..c038ba1a282 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -60,14 +60,20 @@
                 <table align="center" cellspacing="2px" cellpadding="0">
                     <tr>
                         <td><label for="db">Database:</label></td>
-                        <td class="oe_field_value">
+                        <td>
                             <t t-if="!db_list">
                                 <input type="text" name="db" value="trunk" autofocus="true"/>
                             </t>
                             <t t-if="db_list">
                                 <select name="db">
                                     <t t-foreach="db_list" t-as="db">
-                                        <option t-att-value="db" t-att-selected="db == 'trunk'"><t t-esc="db"/></option>
+                                        <t t-if="selected_db === db">
+                                            <option t-att-value="db" selected="true">
+                                                <t t-esc="db"/></option>
+                                        </t>
+                                        <t t-if="selected_db !== db">
+                                            <option t-att-value="db"><t t-esc="db"/></option>
+                                        </t>
                                     </t>
                                 </select>
                             </t>
@@ -75,15 +81,28 @@
                     </tr>
                     <tr>
                         <td><label for="login">User:</label></td>
-                        <td class="oe_field_value"><input type="text" name="login" value="admin" autofocus="true"/></td>
+                        <td><input type="text" name="login"
+                            t-att-value="selected_login || ''" autofocus="true"/></td>
                     </tr>
                     <tr>
                         <td><label for="password">Password:</label></td>
-                        <td class="oe_field_value"><input type="password" name="password" value="a"/></td>
+                        <td><input type="password" name="password"
+                            t-att-value="selected_password || ''"/></td>
+                    </tr>
+                    <tr t-if="has_local_storage">
+                        <td><label for="remember">Rember password:</label></td>
+                        <td class="oe_remember">
+                            <t t-if="remember">
+                            <input type="checkbox" name="remember" checked="yes"/>
+                            </t>
+                            <t t-if="!remember">
+                            <input type="checkbox" name="remember"/>
+                            </t>
+                        </td>
                     </tr>
                     <tr>
                         <td></td>
-                        <td class="oe_field_value">
+                        <td>
                             <button type="submit" name="submit">Login</button>
                         </td>
                     </tr>
@@ -311,11 +330,13 @@
             <th t-if="options.deletable"/>
         </tr>
     </thead>
-    <tfoot class="ui-widget-header" t-if="aggregate_columns.length">
+    <tfoot class="ui-widget-header">
         <tr>
-            <td t-att-colspan="columns_count" class='oe-list-footer'>
-
+            <td t-if="options.selectable"/>
+            <td t-foreach="aggregate_columns" t-as="column" class="oe-list-footer oe-number"
+                t-att-data-field="column.field" t-att-title="column.label">
             </td>
+            <td t-if="options.deletable"/>
         </tr>
     </tfoot>
 </table>
@@ -327,7 +348,8 @@
         </t-if>
     </t>
 </t>
-<tr t-name="ListView.row" t-att-style="style" t-att-class="row_parity">
+<tr t-name="ListView.row" t-att-style="style" t-att-class="row_parity"
+    t-att-data-index="row_index">
     <t t-foreach="columns" t-as="column">
         <td t-if="column.meta">
 
@@ -337,8 +359,10 @@
         <input type="checkbox"/>
     </th>
     <t t-foreach="columns" t-as="column">
+        <t t-set="align" t-value="column.type === 'integer' or column.type == 'float'"/>
         <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help"
-            class="oe-field-cell" t-att-data-field="column.id">
+            t-att-class="'oe-field-cell' + (align ? ' oe-number' : '')"
+            t-att-data-field="column.id">
             <t t-set="attrs" t-value="column.attrs_for(row.data)"/>
             <t t-if="!attrs.invisible">
                 <t t-set="is_button" t-value="column.tag === 'button'"/>
@@ -359,6 +383,9 @@
         <button type="button" name="delete">♻</button>
     </td>
 </tr>
+<t t-name="ListView.row.form">
+    <t t-raw="frame.render()"/>
+</t>
 <t t-name="FormView">
     <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2>
     <div class="oe_form_header" t-att-id="view.element_id + '_header'">
@@ -420,7 +447,7 @@
     <t t-raw="console.log('Unhandled widget', widget)"/>
 </t>
 <t t-name="WidgetFrame">
-    <table border="0" width="100%" cellpadding="2" cellspacing="2" class="oe_frame">
+    <table border="0" width="100%" cellpadding="0" cellspacing="0" class="oe_frame">
     <tr t-foreach="widget.table" t-as="row">
         <t t-foreach="row" t-as="td">
             <td t-att-colspan="td.colspan gt 1 ? td.colspan : undefined"
@@ -428,7 +455,7 @@
                 t-att-nowrap="td.is_field_label or td.is_field_m2o? 'true' : undefined"
                 t-att-valign="td.table ? 'top' : undefined"
                 t-att-id="td.element_id"
-                t-att-class="'oe_form_' + (td.is_field_label ? 'label' : (td.field ? 'field_' + td.type : td.type))"
+                t-att-class="'oe_form_frame_cell oe_form_' + (td.is_field_label ? 'label' : (td.field ? 'field_' + td.type : td.type))"
             >
                 <t t-raw="td.render()"/>
             </td>
@@ -528,15 +555,17 @@
     </select>
 </t>
 <t t-name="FieldMany2One">
-    <div style="padding-right: 16px;white-space: nowrap;">
-        <input type="text"
-            t-att-name="widget.name"
-            t-att-id="widget.element_id + '_field'"
-            t-att-class="'field_' + widget.type"
-            t-att-type="widget.type"
-            style="width: 100%;"/>
-        <span type='button' t-att-class="'ui_combo'" tabindex="'-1'" title="'Show All Items'"></span>
-        <img t-att-id="widget.name + '_open'" t-att-alt="'Open'" t-att-title="'Create'" t-att-src="'/base/static/src/img/iconset-d-drop.gif'" t-att-class="'m2o_open'"/>
+    <div t-att-id="widget.element_id" class="oe-m2o">
+        <input t-att-id="widget.element_id + '_input'" type="text" style="width: 100%;"/>
+        <span class="oe-m2o-drop-down-button" t-att-id="widget.element_id + '_drop_down'">
+            <img src="/base/static/src/img/down-arrow.png" /></span>
+        <span class="oe-m2o-cm-button" t-att-id="widget.name + '_open'">
+            <img src="/base/static/src/img/icons/gtk-index.png"/></span>
+        <div t-att-id="widget.cm_id" class="contextMenu" style="display:none"><ul>
+            <li t-att-id="widget.cm_id + '_search'">Search</li>
+            <li t-att-id="widget.cm_id + '_create'">Create New</li>
+            <li t-att-id="widget.cm_id + '_open'" style="color:grey">Open</li>
+        </ul></div>
     </div>
 </t>
 <t t-name="FieldOne2Many">
@@ -893,4 +922,22 @@
     <button type="button" class="oe_many2xselectpopup-form-save">Save</button>
     <button type="button" class="oe_many2xselectpopup-form-close">Close</button>
 </t>
-</templates>
\ No newline at end of file
+<t t-name="ListView.row.frame" t-extend="WidgetFrame">
+    <t t-jquery="tr">
+        $(document.createElement('t'))
+            .append(this.contents())
+            .attr({
+                't-foreach': this.attr('t-foreach'),
+                't-as': this.attr('t-as')
+            })
+            .replaceAll(this)
+            .after($(document.createElement('td')).append(
+                $(document.createElement('button')).attr({
+                    'class': 'oe-edit-row-save', 'type': 'button'}).text('Save')))
+            .before($(document.createElement('td')).append(
+                $(document.createElement('button')).attr({
+                    'class': 'oe-edit-row-cancel', 'type': 'button'}).text('Cancel')))
+            .unwrap();
+    </t>
+</t>
+</templates>