[MERGE]Merge with trunk upto revision no 855.

bzr revid: kch@tinyerp.com-20110825054408-0b7063yvldh60u05

1 files changed, 48 insertions, 7 deletions

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index e3deb48a14f..0660b97447d 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -326,7 +326,7 @@
     </div>
 </t>
 <t t-name="Header">
-    <a href="/" class="company_logo_link">
+    <a t-att-href="'/' + qs" class="company_logo_link">
         <div class="company_logo" />
     </a>
     <h1 class="header_title" t-if="session.session_is_valid()">
@@ -453,6 +453,40 @@
         </ul>
     </div>
 </t>
+<t t-name="TranslateDialog">
+    <ul class="oe_translate_tabs">
+        <li><a t-attf-href="##{widget.element_id}_fields">Fields</a></li>
+        <li><a t-attf-href="##{widget.element_id}_view">View labels</a></li>
+        <li><a t-attf-href="##{widget.element_id}_sidebar">Sidebar Relates</a></li>
+    </ul>
+    <div t-attf-id="#{widget.element_id}_fields">
+        <table t-if="widget.view.translatable_fields" class="oe_frame oe_forms oe_translation_form" border="0" cellpadding="0" cellspacing="0" width="100%">
+        <tr>
+            <td class="oe_form_separator" width="1%" nowrap="nowrap">
+                <div class="separator horizontal">Field</div>
+            </td>
+            <th t-foreach="widget.languages" align="left">
+                <div class="separator horizontal"><t t-esc="name"/></div>
+            </th>
+        </tr>
+        <tr t-foreach="widget.view.translatable_fields" t-as="field">
+            <td class="oe_form_frame_cell" width="1%" nowrap="nowrap">
+                <label class="oe_form_label"><t t-esc="field.string"/>:</label>
+            </td>
+            <td t-foreach="widget.languages" t-as="lg" class="oe_form_frame_cell">
+                <input t-if="field.type == 'char'" type="text" t-attf-name="#{lg.code}-#{field.name}" value="" class="oe_trad_field" style="width: 100%"/>
+                <textarea t-if="field.type == 'text'" t-attf-name="#{lg.code}-#{field.name}" class="oe_trad_field" style="width: 100%"></textarea>
+            </td>
+        </tr>
+        </table>
+    </div>
+    <div t-attf-id="#{widget.element_id}_view">
+        Translate view
+    </div>
+    <div t-attf-id="#{widget.element_id}_sidebar">
+        Translate sidebar
+    </div>
+</t>
 <t t-name="TreeView">
     <h2 class="oe_view_title"><t t-esc="title"/></h2>
     <select t-if="toolbar" style="width: 30%">
@@ -551,11 +585,14 @@
         </tr>
     </tfoot>
 </table>
-<t t-name="ListView.rows" t-foreach="rows" t-as="row">
-    <t t-call="ListView.row"/>
+<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"
-    t-att-data-index="row_index">
+        t-att-data-id="record.get('id')">
     <t t-foreach="columns" t-as="column">
         <td t-if="column.meta">
 
@@ -569,7 +606,7 @@
         <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-raw="render_cell(row.data, column)"/>
+            <t t-raw="render_cell(record.toForm().data, column)"/>
         </td>
     </t>
     <td t-if="options.deletable" class='oe-record-delete' width="1">
@@ -699,8 +736,10 @@
     <input type="text" size="1"
         t-att-name="widget.name"
         t-att-id="widget.element_id + '_field'"
-        t-att-class="'field_' + widget.type" style="width: 100%"
+        t-att-class="'field_' + widget.type"
+        t-attf-style="width: #{widget.field.translate ? '99' : '100'}%"
     />
+    <img class="oe_field_translate" t-if="widget.field.translate" src="/base/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="FieldEmail">
     <table cellpadding="0" cellspacing="0" border="0" width="100%">
@@ -731,11 +770,13 @@
     </table>
 </t>
 <t t-name="FieldText">
-    <textarea rows="6" style="width: 100%;"
+    <textarea rows="6"
         t-att-name="widget.name"
         t-att-id="widget.element_id + '_field'"
         t-att-class="'field_' + widget.type"
+        t-attf-style="width: #{widget.field.translate ? '99' : '100'}%"
     ></textarea>
+    <img class="oe_field_translate" t-if="widget.field.translate" src="/base/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
 </t>
 <t t-name="FieldDate">
     <input type="text" size="1" style="width: 100%"