[MERGE] Merge with trunk upto revision no 1432.

bzr revid: ysa@tinyerp.com-20111110051150-b1b7e0c3qqowb6u3

1 files changed, 25 insertions, 34 deletions

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 95bd6f663dd..f5448168f5e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -457,7 +457,11 @@
         </button>
     </t>
     <t t-jquery=".oe-view-manager-header" t-operation="after">
-        <ul class="oe-view-manager-logs"></ul>
+        <div class="oe-view-manager-logs oe-folded">
+            <ul></ul>
+            <a class="oe-more-logs" href="#">More…</a>
+            <a class="oe-remove-everything ui-icon ui-icon-closethick"/>
+        </div>
     </t>
 </t>
 
@@ -482,38 +486,25 @@
 </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_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="" data-value="" class="oe_trad_field" style="width: 100%"/>
-                <textarea t-if="field.type == 'text'" t-attf-name="#{lg.code}-#{field.name}" data-value="" 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>
+    <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" t-att-data-field="field.name">
+        <td class="oe_form_frame_cell" width="1%" nowrap="nowrap">
+            <label class="oe_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="" data-value="" class="oe_trad_field" style="width: 100%"/>
+            <textarea t-if="field.type == 'text'" t-attf-name="#{lg.code}-#{field.name}" data-value="" class="oe_trad_field" style="width: 100%"></textarea>
+        </td>
+    </tr>
+    </table>
 </t>
 <t t-name="TreeView">
     <select t-if="toolbar" style="width: 30%">
@@ -1015,7 +1006,7 @@
 <t t-name="SearchView">
     <form class="oe_forms">
         <t t-call="SearchView.render_lines"/>
-        <div class="oe_search-view-buttons" style="text-align: right;">
+        <div class="oe_search-view-buttons">
             <input type="submit" value="Search"/>
             <input type="reset" value="Clear"/>
             <button class="oe_search-view-custom-filter-btn"><span>Advanced Filter</span></button>