[Merge] Merged with main branch.

bzr revid: noz@tinyerp.com-20110713093209-3f2njjjhp0cgd5rj

1 files changed, 29 insertions, 15 deletions

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index e2b67c3aa8e..035332d2961 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -270,7 +270,8 @@
                     </tr>
                     <tr>
                         <td><label for="password">Password:</label></td>
-                        <td><input type="password" name="password"/></td>
+                        <td><input type="password" name="password"
+                                t-att-value="selected_password || ''"/></td>
                     </tr>
                     <tr>
                         <td></td>
@@ -463,7 +464,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)">
@@ -473,7 +474,7 @@
                     </t>
                 </th>
             </t>
-            <th t-if="options.deletable"/>
+            <th t-if="options.deletable" width="1"/>
         </tr>
     </thead>
     <tfoot class="ui-widget-header">
@@ -501,7 +502,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">
@@ -512,7 +513,7 @@
             <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>
@@ -604,18 +605,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"/>
@@ -704,9 +708,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 + '_create'">Create and Edit...</li>
+            <li t-att-id="widget.cm_id + '_search'">Search...</li>
         </ul></div>
     </div>
 </t>
@@ -1066,9 +1070,19 @@
 </t>
 <t t-name="SelectCreatePopup">
     <div t-att-id="element_id">
-        <div t-att-id="element_id + '_search'"></div>
-        <div t-att-id="element_id + '_view_list'"></div>
-        <div t-att-id="element_id + '_view_form'"></div>
+        <table style="width:100%">
+            <tr style="width:100%">
+                <td style="width:100%">
+                    <div t-att-id="element_id + '_search'" style="width:100%"></div>
+                </td>
+            </tr>
+            <tr style="width:100%">
+                <td style="width:100%">
+                    <div t-att-id="element_id + '_view_list'" style="width:100%"></div>
+                </td>
+            </tr>
+        </table>
+        <div t-att-id="element_id + '_view_form'" style="width:100%"></div>
     </div>
 </t>
 <t t-name="SelectCreatePopup.search.buttons">