[MERGE] from trunk

bzr revid: xmo@openerp.com-20120515070556-l2ew6ixbup3u56md

1 files changed, 105 insertions, 100 deletions

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fb3d03e88c6..a6dc137d7c7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -125,7 +125,7 @@
                 <li><a href="#db_change_password">Password</a></li>
                 <li><a id="back_to_login" href="#">Back to Login</a></li>
             </ul>
-            <form id="db_create" name="create_db_form" class="oe_forms" method="POST">
+            <form id="db_create" name="create_db_form" method="POST">
                 <table align="center" class="db_option_table">
                     <tr>
                         <th colspan="2" class="option_string"> CREATE DATABASE </th>
@@ -165,7 +165,7 @@
                     </tr>
                 </table>
             </form>
-            <form id="db_drop" name="drop_db_form" class="oe_forms" method="POST">
+            <form id="db_drop" name="drop_db_form" method="POST">
                 <table align="center" class="db_option_table">
                     <tr>
                         <th colspan="2" class="option_string"> DROP DATABASE </th>
@@ -190,7 +190,7 @@
                     </tr>
                 </table>
             </form>
-            <form id="db_backup" name="backup_db_form" class="oe_forms" method="POST" target="backup-target" action="/web/database/backup">
+            <form id="db_backup" name="backup_db_form" method="POST" target="backup-target" action="/web/database/backup">
                 <input type="hidden" name="token"/>
                 <table align="center" class="db_option_table">
                     <tr>
@@ -216,7 +216,7 @@
                     </tr>
                 </table>
             </form>
-            <form id="db_restore" name="restore_db_form" class="oe_forms" method="POST">
+            <form id="db_restore" name="restore_db_form" method="POST">
                 <table align="center" class="db_option_table">
                     <tr>
                         <th colspan="2" class="option_string"> RESTORE DATABASE </th>
@@ -238,7 +238,7 @@
                     </tr>
                 </table>
             </form>
-            <form id="db_change_password" name="change_pwd_form" class="oe_forms" method="POST">
+            <form id="db_change_password" name="change_pwd_form" method="POST">
                 <table align="center" class="db_option_table">
                     <tr>
                         <th colspan="2" class="option_string"> CHANGE MASTER PASSWORD </th>
@@ -264,32 +264,6 @@
     </div>
 </t>
 
-<t t-name="WebClient">
-    <table class="oe_webclient">
-        <tr>
-            <td colspan="2" class="oe_topbar">
-                <div class="oe_menu_placeholder"/>
-                <div class="oe_user_menu_placeholder"/>
-                <div class="oe_systray"/>
-            </td>
-        </tr>
-        <tr>
-            <td class="oe_leftbar" valign="top">
-                <t t-js="d">
-                    d.url = '/' + (window.location.search || '');
-                </t>
-                <a t-att-href="url" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
-                <div class="oe_secondary_menus_container"/>
-                <div class="oe_footer">
-                    Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
-                </div>
-            </td>
-            <td class="oe_application">
-            </td>
-        </tr>
-    </table>
-</t>
-
 <t t-name="Menu">
     <ul class="oe_menu" t-if="widget.data">
         <li t-foreach="widget.data.data.children" t-as="menu">
@@ -333,7 +307,7 @@
         t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''"
         t-att-data-action-id="menu.action ? menu.action.split(',')[1] : ''">
         <t t-esc="menu.name"/>
-        <t t-if="menu.needaction_enabled">
+        <t t-if="menu.needaction_enabled and menu.needaction_counter">
             <div class="oe_menu_counter">
                 <t t-esc="menu.needaction_counter"/>
             </div>
@@ -349,24 +323,14 @@
                 <span class="oe_topbar_name"/>
             </a>
             <ul class="oe_dropdown_options">
-                <!--<li><a href="#" data-menu="profile">Profile</a></li>-->
-                <li><a href="#" data-menu="settings">Settings</a></li>
-                <li><a href="#" data-menu="logout">Log out</a></li>
-                <li><hr/></li>
                 <li><a href="#" data-menu="about">About OpenERP</a></li>
-                <li><hr/></li>
+                <li><a href="#" data-menu="settings">Preferences</a></li>
+                <li><a href="#" data-menu="logout">Log out</a></li>
             </ul>
         </li>
     </ul>
 </t>
-<t t-name="UserMenu.shortcut">
-    <li t-foreach="shortcuts" t-as="shortcut">
-        <a href="#" data-menu="shortcut" t-att-data-id="shortcut.res_id" t-att-data-shortcut-id="shortcut.id">
-            <t t-esc="shortcut.name"/>
-        </a>
-    </li>
-</t>
-<t t-name="About-Page">
+<t t-name="UserMenu.about">
     <div>
         <a class="oe_activate_debug_mode" href="?debug" style="float:right; font-size: 80%;">Activate the developper mode</a>
         <h1 style="margin:0;">OpenERP</h1>
@@ -383,8 +347,8 @@
         </p>
     </div>
 </t>
-<t t-name="Change_Pwd">
-    <form name="change_password_form" class="oe_forms" method="POST">
+<t t-name="UserMenu.password">
+    <form name="change_password_form" method="POST">
         <table align="center">
             <tr>
                 <td><label for="old_pwd">Old Password:</label></td>
@@ -408,27 +372,59 @@
     </form>
 </t>
 
+<t t-name="WebClient">
+    <table class="oe_webclient">
+        <tr>
+            <td colspan="2" class="oe_topbar">
+                <div class="oe_menu_placeholder"/>
+                <div class="oe_user_menu_placeholder"/>
+                <div class="oe_systray"/>
+            </td>
+        </tr>
+        <tr>
+            <td class="oe_leftbar" valign="top">
+                <t t-js="d">
+                    d.url = '/' + (window.location.search || '');
+                </t>
+                <a t-att-href="url" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+                <div class="oe_secondary_menus_container"/>
+                <div class="oe_footer">
+                    Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
+                </div>
+            </td>
+            <td class="oe_application">
+            </td>
+        </tr>
+    </table>
+</t>
+
 <t t-name="ViewManager">
     <div class="oe_view_manager">
-        <table class="oe_view_manager_header2">
+        <table class="oe_view_manager_header">
             <col width="33%"/>
             <col width="33%"/>
             <col width="34%"/>
-            <tr>
+            <tr class="oe_header_row">
                 <td colspan="2">
-                    <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
-                        <span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
-                    </h2>
+                        <h2 class="oe_view_title" t-if="widget.flags.display_title !== false">
+                            <span class="oe_view_title_text"><t t-esc="widget.display_title()"/></span>
+                        </h2>
+                </td>
+                <td>
+                        <div class="oe_view_manager_view_search" t-opentag="true"/>
                 </td>
-                <td> <div class="oe_view_manager_view_search" t-opentag="true"/> </td>
             </tr>
-            <tr>
-                <td> <div class="oe_view_manager_buttons"/> </td>
-                <td> <div class="oe_view_manager_sidebar"/> </td>
+            <tr class="oe_header_row">
+                <td>
+                        <div class="oe_view_manager_buttons"/>
+                </td>
+                <td>
+                        <div class="oe_view_manager_sidebar"/>
+                </td>
                 <td>
                     <ul class="oe_view_manager_switch oe_button_group oe_right">
-                        <t t-if="widget.views_src.length != 1" t-foreach="widget.views_src" t-as="view">
-                          <li><a t-attf-class="oe_vm_switch_#{view.view_type} oe_i" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
+                        <t t-if="widget.views_src.length > 2" t-foreach="widget.views_src" t-as="view">
+                          <li t-if="view.view_type != 'form'" class="oe_e"><a t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="view.label || view.view_type">
                             </a></li>
                         </t>
                     </ul>
@@ -436,6 +432,8 @@
                 </td>
             </tr>
         </table>
+
+
         <div class="oe_view_manager_body">
             <t t-foreach="widget.views_src" t-as="view">
                 <div t-attf-class="oe_view_manager_view_#{view.view_type}"/>
@@ -443,12 +441,9 @@
         </div>
     </div>
 </t>
+
 <t t-name="ViewManagerAction" t-extend="ViewManager">
-    <t t-jquery="h2.oe_view_title" t-operation="prepend">
-        <a t-if="widget.flags.display_title !== false" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
-            href="javascript: void(0)"> </a>
-    </t>
-    <t t-jquery="h2.oe_view_title" t-operation="after">
+    <t t-jquery="h2.oe_view_title" t-operation="before">
         <select t-if="widget.session.debug" class="oe_debug_view"/>
     </t>
 </t>
@@ -608,9 +603,9 @@
 </tr>
 
 <table t-name="ListView" class="oe-listview-content">
-    <t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0) + (options.isClarkGable ? 1 : 0)"/>
+    <t t-set="columns_count" t-value="visible_columns.length + (options.selectable ? 1 : 0) + (options.deletable ? 1 : 0)"/>
     <thead>
-        <tr t-if="options.action_buttons !== false or options.pager !== false">
+        <tr t-if="(!!options.action_buttons and !options.$buttons) or (!!options.pager and !options.$pager)">
             <th t-att-colspan="columns_count">
                 <div class="oe_list_buttons"/>
                 <div class="oe_list_sidebar"/>
@@ -626,7 +621,6 @@
             <th t-if="options.selectable" width="1"  >
                 <input type="checkbox" class="all-record-selector"/>
             </th>
-            <th t-if="options.isClarkGable" width="1"></th>
             <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)">
@@ -639,7 +633,6 @@
     <tfoot>
         <tr>
             <td t-if="options.selectable"/>
-            <td t-if="options.isClarkGable"/>
             <td t-foreach="aggregate_columns" t-as="column" class="oe-list-footer oe-number"
                 t-att-data-field="column.id" t-att-title="column.label">
             </td>
@@ -649,12 +642,10 @@
 </table>
 <div t-name="ListView.buttons" class="oe_list_buttons">
     <t t-if="!widget.no_leaf and widget.options.action_buttons !== false">
-        <button type="button" class="oe_button oe_list_add" t-if="widget.options.addable">
+        <button type="button" class="oe_button oe_list_add oe_form_button_hi" t-if="widget.options.addable">
             <t t-esc="widget.options.addable"/>
         </button>
-        <button type="button" class="oe_button oe_list_delete" t-if="widget.options.selectable and widget.options.deletable">
-            Delete
-        </button>
+        <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_list_button_import">Import</a>
     </t>
 </div>
 <t t-name="ListView.pager">
@@ -684,9 +675,6 @@
         <input t-if="options.radio" type="radio" name="radiogroup" t-att-checked="checked"/>
         <input t-if="!options.radio" type="checkbox" name="radiogroup" t-att-checked="checked"/>
     </th>
-    <th t-if="options.isClarkGable" class="oe-record-edit-link" width="1">
-        <img src="/web/static/src/img/pencil.gif" width="12" height="12" class="oe-record-edit-link-img"/>
-    </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"
@@ -714,12 +702,9 @@
         <span class="oe_form_buttons_view">
             <button type="button" class="oe_button oe_form_button_edit">Edit</button>
             <button type="button" class="oe_button oe_form_button_create">Create</button>
-            <button type="button" class="oe_button oe_form_button_duplicate">Duplicate</button>
-            <button type="button" class="oe_button oe_form_button_delete">Delete</button>
         </span>
         <span class="oe_form_buttons_edit">
-            <button type="button" class="oe_button oe_form_button_save">Save</button> or
-            <a href="#" class="oe_form_button_cancel">Discard</a>
+            <button type="button" class="oe_button oe_form_button_save">Save</button> <span class="oe_fade">or</span> <a href="#" class="oe_bold oe_form_button_cancel">Discard</a>
         </span>
     </t>
 </div>
@@ -730,7 +715,7 @@
         </t>
     </div>
 </t>
-<form t-name="FormView.set_default" class="oe_forms oe_frame">
+<form t-name="FormView.set_default">
     <t t-set="args" t-value="widget.dialog_options.args"/>
     <table style="width: 100%">
         <tr>
@@ -793,10 +778,12 @@
 <t t-name="FormRenderingForm">
     <div class="oe_form_sheetbg">
         <div t-attf-class="oe_form_sheet oe_form_sheet_width #{classnames}">
-            <group col="4"/>
+            <group t-if="layout === 'auto'" col="4"/>
         </div>
     </div>
 </t>
+<t t-name="FormRenderingSheet" t-extend="FormRenderingForm">
+</t>
 <t t-name="FormRenderingGroup">
     <t t-set="table">
         <table border="0" cellpadding="0" cellspacing="0" width="100%" t-att-class="classnames"/>
@@ -837,8 +824,6 @@
             t-att-title="help"
             t-attf-class="#{classnames} oe_form_label#{help ? '_help' : ''} oe_align_#{align}">
         <t t-esc="string"/>
-        <span t-if="help">?</span>
-        :
     </label>
 </t>
 
@@ -850,7 +835,7 @@
     <div class="oe_tooltip_string" t-if="widget.string">
         <t t-esc="widget.node.attrs.string"/> <t t-if="debug and widget.nolabel">(nolabel)</t>
     </div>
-    <p t-if="widget.help" class="oe_tooltip_help"><t t-esc="widget.help"/></p>
+    <p t-if="widget.node.attrs.help or (widget.field and widget.field.help)" class="oe_tooltip_help"><t t-esc="widget.node.attrs.help || widget.field.help"/></p>
     <ul t-if="debug" class="oe_tooltip_technical">
         <li data-item="field" t-if="widget.name">
             <span class="oe_tooltip_technical_title">Field:</span>
@@ -916,12 +901,12 @@
                 t-att-tabindex="widget.node.attrs.tabindex"
                 t-att-autofocus="widget.node.attrs.autofocus"
                 t-attf-class="field_char #{widget.is_field_number ? 'oe-number' : ''}"
+                t-att-placeholder="widget.node.attrs.placeholder"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </div>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <div t-attf-class="oe_form_field_char #{widget.is_field_number ? 'oe-number' : ''}">
-        </div>
+        <span t-attf-class="oe_form_field_char #{widget.is_field_number ? 'oe-number' : ''}"/>
     </t>
 </t>
 <t t-name="FieldEmail">
@@ -933,6 +918,7 @@
                     t-att-id="widget.id_for_label"
                     t-att-tabindex="widget.node.attrs.tabindex"
                     t-att-autofocus="widget.node.attrs.autofocus"
+                    t-att-placeholder="widget.node.attrs.placeholder"
                 />
             </td>
             <td width="16">
@@ -944,9 +930,9 @@
         </table>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <div>
+        <span>
             <a href="#" class="oe_form_uri"/>
-        </div>
+        </span>
     </t>
 </t>
 <t t-name="FieldUrl">
@@ -958,6 +944,7 @@
                     t-att-id="widget.id_for_label"
                     t-att-tabindex="widget.node.attrs.tabindex"
                     t-att-autofocus="widget.node.attrs.autofocus"
+                    t-att-placeholder="widget.node.attrs.placeholder"
                 />
             </td>
             <td width="16">
@@ -969,9 +956,9 @@
         </table>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <div>
+        <span>
             <a href="#" class="oe_form_uri"/>
-        </div>
+        </span>
     </t>
 </t>
 <t t-name="FieldText">
@@ -981,6 +968,7 @@
             class="field_text"
             t-att-tabindex="widget.node.attrs.tabindex"
             t-att-autofocus="widget.node.attrs.autofocus"
+            t-att-placeholder="widget.node.attrs.placeholder"
         ></textarea>
         <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate"
             t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
@@ -991,7 +979,8 @@
         <input type="text" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
         <input type="text"
             t-att-name="widget.name"
-            t-attf-class="oe_datepicker_master field_#{widget.type_of_date}"
+            t-att-placeholder="widget.getParent().node.attrs.placeholder"
+            t-attf-class="oe_datepicker_master field_#{widget.type_of_date} oe_form_field_#{widget.type_of_date}"
         /><img class="oe_input_icon oe_datepicker_trigger" t-att-src='_s + "/web/static/src/img/ui/field_calendar.png"'
              title="Select date" width="16" height="16" border="0"/>
     </div>
@@ -1011,8 +1000,7 @@
         </div>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <div class="field_selection">
-        </div>
+        <span class="field_selection"/>
     </t>
 </t>
 <t t-name="FieldMany2One">
@@ -1024,26 +1012,43 @@
                     t-att-id="widget.id_for_label"
                     t-att-tabindex="widget.node.attrs.tabindex"
                     t-att-autofocus="widget.node.attrs.autofocus"
+                    t-att-placeholder="widget.node.attrs.placeholder"
                 />
                 <span class="oe-m2o-drop-down-button">
                     <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>
             </td>
             <td width="16">
-                <button class="oe_button oe_field_button oe-m2o-cm-button">
-                    <img t-att-src='_s + "/web/static/src/img/icons/gtk-go-forward.png"'/>
+                <button class="oe_button oe_field_button oe-m2o-cm-button" title="Open Resource">
+                    <img t-att-src='_s + "/web/static/src/img/icons/terp-folder-yellow.png"'/>
                 </button>
             </td>
         </tr>
         </table>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <div>
+        <span>
             <a href="#" class="oe_form_uri"/>
-        </div>
+        </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>
@@ -1195,9 +1200,9 @@
         </table>
     </t>
     <t t-if="widget.get('effective_readonly')">
-        <div>
+        <span>
             <a href="javascript:void(0)" class="oe_form_uri"/>
-        </div>
+        </span>
     </t>
 </t>
 <t t-name="WidgetButton">
@@ -1341,7 +1346,7 @@
     </div>
 </t>
 <t t-name="SearchView.add_to_dashboard">
-    <div class="oe_forms">
+    <div class="oe_form">
         <p><b>Select Dashboard to add this filter to:</b></p>
         <select style="width: 100%; margin-right: 1em;">
             <option t-foreach="dashboards" t-as="menu" t-att-value="menu.id" t-att-selected="(menu.id == selected_menu_id) || undefined"><t t-esc="menu.name"/></option>