[MERGE]merge with trunk

bzr revid: sgo@tinyerp.com-20120727050154-148msw0jzppgc66w

1 files changed, 87 insertions, 90 deletions

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index b26e9169034..fc83ecd30ca 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -329,21 +329,20 @@
     </span>
 </t>
 <t t-name="UserMenu.about">
-    <div>
-        <a class="oe_activate_debug_mode" href="?debug" style="float:right; font-size: 80%;">Activate the developer mode</a>
-        <h1 style="margin:0;">OpenERP</h1>
-        <h3 style="margin:15px 0;padding:0;">Version <t t-esc="version_info.version"/></h3>
-        <p>
-            Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br />
-            OpenERP is a trademark of the <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP SA Company</a>.
-        </p>
-        <p>
-            Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a>
-        </p>
-        <p>
-            For more information visit <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP.com</a>
-        </p>
+
+    <div class="oe_about">
+      <a class="oe_activate_debug_mode oe_right" href="?debug">Activate the developer mode</a>
+      <img class="oe_logo" src="/web/static/src/img/logo2.png"/>
+      <h3>Version <t t-esc="version_info.version"/></h3>
+
+      <div class="oe_bottom">
+        <p>Copyright © 2004-TODAY OpenERP SA. All Rights Reserved.<br />
+            OpenERP is a trademark of the <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP SA Company</a>.</p>
+        <p>Licenced under the terms of <a target="_blank" href="http://www.gnu.org/licenses/agpl.html" style="text-decoration: underline;">GNU Affero General Public License</a></p>
+        <p>For more information visit <a target="_blank" href="http://openerp.com/" style="text-decoration: underline;">OpenERP.com</a></p>
+      </div>
     </div>
+
 </t>
 <t t-name="UserMenu.password">
     <form name="change_password_form" method="POST">
@@ -519,25 +518,25 @@
             <div class="oe_form_dropdown_section">
                 <button class="oe_dropdown_toggle oe_dropdown_arrow">
                     <t t-esc="section.label"/>
-                    <ul class="oe_dropdown_menu">
-                        <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
-                            <a class="oe_sidebar_action_a" t-att-title="item.title" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">
-                                <t t-raw="item.label"/>
-                            </a>
-                            <a t-if="section.name == 'files'" class="oe_sidebar_delete_item" t-att-data-id="item.id" title="Delete this attachment">x</a>
-                        </li>
-                        <li t-if="section.name == 'files'" class="oe_sidebar_add_attachment">
-                            <t t-call="HiddenInputFile">
-                                <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
-                                <t t-set="fileupload_action">/web/binary/upload_attachment</t>
-                                <input type="hidden" name="model" t-att-value="widget.dataset and widget.dataset.model"/>
-                                <input type="hidden" name="id" t-att-value="widget.model_id"/>
-                                <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
-                                <span>Add...</span>
-                            </t>
-                        </li>
-                    </ul>
                 </button>
+                <ul class="oe_dropdown_menu">
+                    <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
+                        <a class="oe_sidebar_action_a" t-att-title="item.title" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">
+                            <t t-raw="item.label"/>
+                        </a>
+                        <a t-if="section.name == 'files'" class="oe_sidebar_delete_item" t-att-data-id="item.id" title="Delete this attachment">x</a>
+                    </li>
+                    <li t-if="section.name == 'files'" class="oe_sidebar_add_attachment">
+                        <t t-call="HiddenInputFile">
+                            <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
+                            <t t-set="fileupload_action">/web/binary/upload_attachment</t>
+                            <input type="hidden" name="model" t-att-value="widget.dataset and widget.dataset.model"/>
+                            <input type="hidden" name="id" t-att-value="widget.model_id"/>
+                            <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
+                            <span>Add...</span>
+                        </t>
+                    </li>
+                </ul>
             </div>
         </t>
     </div>
@@ -646,17 +645,14 @@
 <t t-name="ListView.rows" t-foreach="records.length" t-as="index">
     <t t-call="ListView.row">
         <t t-set="record" t-value="records.at(index)"/>
-        <t t-set="row_parity" t-value="index_parity"/>
     </t>
 </t>
-<tr t-name="ListView.row" t-att-class="row_parity"
+<tr t-name="ListView.row"
         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">
-
-        </td>
+        <td t-if="column.meta"> </td>
     </t>
     <th t-if="options.selectable" class="oe_list_record_selector" width="1">
         <t t-set="checked" t-value="options.select_view_id == record.get('id') ? 'checked' : null"/>
@@ -675,7 +671,6 @@
         <button type="button" name="delete" class="oe_i">d</button>
     </td>
 </tr>
-
 <t t-extend="ListView.buttons">
     <t t-jquery="button.oe_list_add" t-operation="after">
         <button class="oe_button oe_list_save oe_highlight"
@@ -685,6 +680,15 @@
         <a href="#" class="oe_bold oe_list_discard">discard</a>
     </t>
 </t>
+<t t-extend="ListView.row">
+    <!-- adds back padding to row being rendered after edition, if necessary
+         (if not deletable add back padding), otherwise the row being added is
+         missing columns
+     -->
+    <t t-jquery="&gt; :last" t-operation="after">
+        <td t-if="edited and !options.deletable" class="oe-listview-padding"/>
+    </t>
+</t>
 
 <t t-name="FormView">
     <div class="oe_formview">
@@ -956,11 +960,13 @@
 <t t-name="FieldMany2One">
     <span class="oe_form_field oe_form_field_many2one oe_form_field_with_button" t-att-style="widget.node.attrs.style">
         <t t-if="widget.get('effective_readonly')">
-            <a href="#" class="oe_form_uri"/>
+            <a t-if="! widget.get_definition_options().no_open" href="#" class="oe_form_uri"/>
+            <span t-if="widget.get_definition_options().no_open" href="#" class="oe_form_uri"/>
             <span class="oe_form_m2o_follow"/>
         </t>
         <t t-if="!widget.get('effective_readonly')">
-            <a href="#" tabindex="-1" class="oe_m2o_cm_button oe_e oe_right">/</a>
+            <a t-if="! widget.get_definition_options().no_open" href="#" tabindex="-1"
+                class="oe_m2o_cm_button oe_e oe_right">/</a>
             <div>
                 <input type="text"
                     t-att-id="widget.id_for_label"
@@ -975,7 +981,6 @@
         </t>
     </span>
 </t>
-<!-- Collection of m2m tags -->
 <t t-name="FieldMany2ManyTags">
     <div class="oe_form_field oe_tags" t-att-style="widget.node.attrs.style">
         <t t-if="! widget.get('effective_readonly')">
@@ -984,7 +989,6 @@
         </t>
     </div>
 </t>
-<!-- Individual m2m tag element -->
 <t t-name="FieldMany2ManyTag">
     <t t-set="i" t-value="0"/>
     <t t-foreach="elements" t-as="el">
@@ -1132,7 +1136,7 @@
         t-att-style="widget.node.attrs.style"
         t-att-tabindex="widget.node.attrs.tabindex"
         t-att-autofocus="widget.node.attrs.autofocus">
-        <img t-if="widget.node.attrs.icon" t-att-src="_s + '/web/static/src/img/icons/' + widget.node.attrs.icon + '.png'" width="16" height="16"/>
+        <img t-if="widget.node.attrs.icon" t-att-src="_s + widget.node.attrs.icon" width="16" height="16"/>
         <span t-if="widget.string"><t t-esc="widget.string"/></span>
     </button>
 </t>
@@ -1190,6 +1194,41 @@
     </table>
 </t>
 
+<t t-name="AbstractFormPopup.render">
+    <div>
+        <table style="width:100%">
+            <tr style="width:100%">
+                <td style="width:100%">
+                    <div class="oe_popup_search" style="width:100%"></div>
+                </td>
+            </tr>
+            <tr style="width:100%">
+                <td style="width:100%">
+                    <div class="oe_popup_list" style="width:100%"></div>
+                </td>
+            </tr>
+        </table>
+        <div class="oe_popup_form" style="width:100%"></div>
+    </div>
+</t>
+<t t-name="SelectCreatePopup.search.buttons">
+    <t t-if="! widget.options.disable_multiple_selection">
+        <button type="button" class="oe_button oe_selectcreatepopup-search-select" disabled="disabled">Select</button>
+        or
+    </t>
+    <a class="oe_button oe_selectcreatepopup-search-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Cancel</a>
+</t>
+<t t-name="AbstractFormPopup.buttons">
+    <t t-if="! multi_select">
+        <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save</button>
+    </t>
+    <t t-if="multi_select">
+        <button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save &amp; New</button>
+        <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save &amp; Close</button>
+    </t>
+    or <a class="oe_button oe_abstractformpopup-form-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Discard</a>
+</t>
+
 <t t-name="One2Many.viewmanager" t-extend="ViewManager">
     <t t-jquery=".oe-view-manager-header">
         this.attr('t-if', 'views.length != 1');
@@ -1220,6 +1259,8 @@
     <div class="oe_searchview_clear"/>
     <div class="oe_searchview_unfold_drawer" title="Advanced Search..."/>
     <div class="oe_searchview_drawer"/>
+    <button type="button" class="oe_searchview_search"
+            title="Search Again">Search</button>
 </div>
 
 <div t-name="SearchView.InputView"
@@ -1240,7 +1281,6 @@
 <span t-name="SearchView.FacetView.Value" class="oe_facet_value">
     <t t-esc="widget.model.get('label')"/>
 </span>
-
 <t t-name="SearchView.managed-filters">
     <option class="oe_search_filters_title" value="">Filters</option>
     <optgroup label="-- Filters --">
@@ -1265,7 +1305,6 @@
         <p>(Any existing filter with the same name will be replaced)</p>
     </div>
 </t>
-
 <t t-name="SearchView.render_lines">
     <table class="oe_search_render_line" border="0" cellspacing="0" cellpadding="0"
            t-foreach="lines" t-as="line">
@@ -1407,8 +1446,8 @@
 <div t-name="SearchView.addtodashboard" class="oe_searchview_dashboard">
     <h4>Add to Dashboard</h4>
     <form>
-         <input placeholder ="Title of new Dashboard item" title = "Title of new Dashboard item" type="text"/>
-         <button class="oe_apply" type="submit">save</button>
+        <p><input placeholder ="Title of new Dashboard item" title = "Title of new Dashboard item" type="text"/></p>
+        <button class="oe_apply" type="submit">Save</button>
     </form>
 </div>
 <t t-name="SearchView.addtodashboard.selection">
@@ -1462,49 +1501,6 @@
         </t>
     </select>
 </t>
-<t t-name="AbstractFormPopup.render">
-    <div>
-        <table style="width:100%">
-            <tr style="width:100%">
-                <td style="width:100%">
-                    <div class="oe_popup_search" style="width:100%"></div>
-                </td>
-            </tr>
-            <tr style="width:100%">
-                <td style="width:100%">
-                    <div class="oe_popup_list" style="width:100%"></div>
-                </td>
-            </tr>
-        </table>
-        <div class="oe_popup_form" style="width:100%"></div>
-    </div>
-</t>
-<t t-name="SelectCreatePopup.search.buttons">
-    <t t-if="! widget.options.disable_multiple_selection">
-        <button type="button" class="oe_button oe_selectcreatepopup-search-select" disabled="disabled">Select</button>
-        or
-    </t>
-    <a class="oe_button oe_selectcreatepopup-search-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Cancel</a>
-</t>
-<t t-name="AbstractFormPopup.buttons">
-    <t t-if="! multi_select">
-        <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save</button>
-    </t>
-    <t t-if="multi_select">
-        <button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save &amp; New</button>
-        <button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save &amp; Close</button>
-    </t>
-    or <a class="oe_button oe_abstractformpopup-form-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Cancel</a>
-</t>
-<t t-extend="ListView.row">
-    <!-- adds back padding to row being rendered after edition, if necessary
-         (if not deletable add back padding), otherwise the row being added is
-         missing columns
-     -->
-    <t t-jquery="&gt; :last" t-operation="after">
-        <td t-if="edited and !options.deletable" class="oe-listview-padding"/>
-    </t>
-</t>
 
 <t t-name="view_editor">
     <table class="oe_view_editor">
@@ -1569,6 +1565,7 @@
 <t t-name="vieweditor_boolean">
     <input type="checkbox" t-att-id="widget.name"/>
 </t>
+
 <t t-name="ExportView">
     <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
 </t>