[MERGE] merge with openerp-web.

bzr revid: bth@tinyerp.com-20110712123638-nebxv16iddwsjbzz

1 files changed, 36 insertions, 52 deletions

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index a761318f084..215c22e9492 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -87,18 +87,7 @@
                     <tr>
                         <td><label for="password">Password:</label></td>
                         <td><input type="password" name="password"
-                            t-att-value="selected_password || ''"/></td>
-                    </tr>
-                    <tr t-if="has_local_storage">
-                        <td><label for="remember">Remember 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>
+                                t-att-value="selected_password || ''"/></td>
                     </tr>
                     <tr>
                         <td></td>
@@ -279,11 +268,11 @@
             <th t-if="actions_span" t-att-colspan="actions_span"
                 class="oe-actions">
                 <t t-if="flags.action_buttons !== false">
-                    <button type="button" id="oe-list-add"
+                    <button type="button" class="oe-list-add"
                             t-if="options.addable">
                         <t t-esc="options.addable"/>
                     </button>
-                    <button type="button" id="oe-list-delete"
+                    <button type="button" class="oe-list-delete"
                             t-if="options.selectable and options.deletable">
                         Delete
                     </button>
@@ -292,16 +281,19 @@
             <th t-att-colspan="columns_count - actions_span"
                 class="oe-list-pager">
                 <t t-if="flags.pager !== false">
-                    <button type="button" data-pager-action="first">First</button>
-                    <button type="button" data-pager-action="previous"
+                    <button type="button" disabled="disabled"
+                            data-pager-action="first">First</button>
+                    <button type="button" disabled="disabled"
+                            data-pager-action="previous"
                             >&lt;&lt;</button>
 
-                    <span class="oe-pager-first">1</span>
-                    to <span class="oe-pager-last">1</span>
-                    of <span class="oe-pager-total">1</span>
+                    <span class="oe-pager-state">
+                    </span>
 
-                    <button type="button" data-pager-action="next">&gt;&gt;</button>
-                    <button type="button" data-pager-action="last">Last</button>
+                    <button type="button" disabled="disabled"
+                            data-pager-action="next">&gt;&gt;</button>
+                    <button type="button" disabled="disabled"
+                            data-pager-action="last">Last</button>
                 </t>
             </th>
         </tr>
@@ -311,7 +303,7 @@
                     <t t-esc="column.string"/>
                 </th>
             </t>
-            <th t-if="options.selectable"/>
+            <th t-if="options.selectable" width="1"/>
             <t t-foreach="columns" t-as="column">
                 <th t-if="!column.meta and column.invisible !== '1'" t-att-data-id="column.id"
                     t-att-class="((options.sortable and column.tag !== 'button') ? 'oe-sortable' : null)">
@@ -321,7 +313,7 @@
                     </t>
                 </th>
             </t>
-            <th t-if="options.deletable"/>
+            <th t-if="options.deletable" width="1"/>
         </tr>
     </thead>
     <tfoot class="ui-widget-header">
@@ -349,7 +341,7 @@
 
         </td>
     </t>
-    <th t-if="options.selectable" class="oe-record-selector">
+    <th t-if="options.selectable" class="oe-record-selector" width="1">
         <input type="checkbox"/>
     </th>
     <t t-foreach="columns" t-as="column">
@@ -357,23 +349,10 @@
         <td t-if="!column.meta and column.invisible !== '1'" t-att-title="column.help"
             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'"/>
-                <!-- TODO: get correct widget from form -->
-                <t t-if="!is_button and row['data'][column.id].value !== false">
-                    <t t-set="value" t-value="row['data'][column.id].value"/>
-                    <t t-esc="value instanceof Array ? value[1] : value"/>
-                </t>
-                <button type="button" t-att-title="column.string"
-                        t-if="is_button">
-                    <img t-att-src="'/base/static/src/img/icons/' + column.icon + '.png'"
-                         t-att-alt="column.string"/>
-                </button>
-            </t>
+            <t t-raw="render_cell(row.data, column)"/>
         </td>
     </t>
-    <td t-if="options.deletable" class='oe-record-delete'>
+    <td t-if="options.deletable" class='oe-record-delete' width="1">
         <button type="button" name="delete">♻</button>
     </td>
 </tr>
@@ -465,18 +444,21 @@
 </t>
 <t t-name="WidgetNotebook">
     <ul>
-        <li t-foreach="widget.pages" t-as="page">
-            <a t-att-href="'#' + widget.element_id + '-' + page_index">
+        <li t-foreach="widget.pages" t-as="page" t-att-id="page.element_tab_id">
+            <a t-att-href="'#' + page.element_id">
                 <t t-esc="page.string"/>
             </a>
         </li>
     </ul>
     <t t-foreach="widget.pages" t-as="page">
-        <div t-att-id="widget.element_id + '-' + page_index">
-            <t t-raw="page.render()"/>
-        </div>
+        <t t-raw="page.render()"/>
     </t>
 </t>
+<t t-name="WidgetNotebookPage">
+    <div t-att-id="widget.element_id">
+        <t t-call="WidgetFrame"/>
+    </div>
+</t>
 <t t-name="WidgetSeparator">
     <div t-att-class="'separator ' + (widget.node.attrs.orientation || 'horizontal')">
         <t t-esc="widget.string"/>
@@ -550,9 +532,9 @@
         t-att-id="widget.element_id + '_field'"
         t-att-class="'field_' + widget.type"
         style="width: 100%">
-            <t t-foreach="widget.field.selection" t-as="options">
-                <option t-att-value="options[0]">
-                    <t t-esc="options[1]"/>
+            <t t-foreach="widget.field_index" t-as="options">
+                <option t-att-value="options.ikey">
+                    <t t-esc="options.label"/>
                 </option>
             </t>
     </select>
@@ -565,9 +547,9 @@
         <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>
+            <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>
@@ -827,8 +809,8 @@
 <t t-name="SearchView.extended_search.group">
     <div t-att-id="element_id" class="searchview_extended_group">
         <select class="searchview_extended_group_choice">
-            <option value="all">All the following conditions must match</option>
             <option value="any">Any of the following conditions must match</option>
+            <option value="all">All the following conditions must match</option>
             <option value="none">None of the following conditions must match</option>
         </select>
         <a class="searchview_extended_delete_group"
@@ -910,7 +892,9 @@
         <td>
             <p>
                 <t t-js="d">
-                    d.html_error = context.engine.tools.html_escape(d.error.data.fault_code).replace(/\n/g, '<br/>');
+                    var message = d.message ? d.message : d.error.data.fault_code;
+                    d.html_error = context.engine.tools.html_escape(message)
+                        .replace(/\n/g, '<br/>');
                 </t>
                 <t t-raw="html_error"/>
             </p>