[MERGE]

bzr revid: nicolas.vanhoren@openerp.com-20110404160926-f1uwddcknsezvamr
bzr revid: nicolas.vanhoren@openerp.com-20110405101739-iubtgou4lrnftmi2

1 files changed, 23 insertions, 30 deletions

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 535d7291c59..7a82ef0447f 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -20,7 +20,7 @@
         </td>
         <td valign="top" width="100%" height="100%">
             <div id="oe_main" class="main">
-                <div id="oe_application" class="application"></div>
+                <div id="oe_app" class="application"></div>
                 <div id="oe_sidebar"></div>
             </div>
         </td>
@@ -32,13 +32,6 @@
             </div>
         </td>
     </tr>
-    <tr>
-        <td colspan="2">
-            <div id="oe_errors">
-                Debug:
-            </div>
-        </td>
-    </tr>
     </table>
 </t>
 <t t-name="Loading">
@@ -128,18 +121,18 @@
     <table class="view-manager-main-table">
     <tr>
     <td class="view-manager-main-content">
-        <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
-        <div class="views-switchers">
-            <t t-foreach="views" t-as="view">
-                <button type="button" t-att-data-view-type="view[1]">
-                    <t t-esc="view[1]"/>
-                </button>
-            </t>
-        </div>
-        <div t-attf-id="#{prefix}_search"/>
+    <!-- TODO prefix id with the element_id of the controller t-attf-id="#{prefix}_localid" -->
+    <div class="oe_vm_switch">
         <t t-foreach="views" t-as="view">
-            <div t-attf-id="#{prefix}_view_#{view[1]}"/>
+            <button type="button" t-att-data-view-type="view[1]">
+                <t t-esc="view[1]"/>
+            </button>
         </t>
+    </div>
+    <div t-attf-id="#{prefix}_search"/>
+    <t t-foreach="views" t-as="view">
+        <div t-attf-id="#{prefix}_view_#{view[1]}"/>
+    </t>
 	</td>
 	<td class="view-manager-main-sidebar">
 	</td>
@@ -160,13 +153,15 @@
     <table id="todo_use_unique_id" class="jqGrid"></table>
 </t>
 <t t-name="FormView">
-    <h3 class="title"><t t-esc="view.fields_view.arch.attrs.string"/></h3>
-    <div style="text-align:right;">
-        <input type="button" value="First"/>
-        <input type="button" value="&lt;&lt;"/>
-        0 / 0
-        <input type="button" value="&gt;&gt;"/>
-        <input type="button" value="Last"/>
+    <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2>
+    <div class="oe_form_pager">
+        <button type="button" data-pager-action="first">First</button>
+        <button type="button" data-pager-action="previous">&lt;&lt;</button>
+
+        <span class="oe_pager_index">0</span> / <span class="oe_pager_count">0</span>
+
+        <button type="button" data-pager-action="next">&gt;&gt;</button>
+        <button type="button" data-pager-action="last">Last</button>
     </div>
     <t t-raw="frame.render()"/>
     <div style="text-align:right;">
@@ -256,10 +251,10 @@
     </select>
 </t>
 <t t-name="FieldMany2One">
-    <input type="text" t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%;" placeholder="Many 2 One: Please, enter the ID of the object. Thank you !"/>
+    <input type="text" t-att-name="widget.name" t-att-id="widget.element_id" t-att-class="'field_' + widget.type" style="width: 100%;"/>
 </t>
 <t t-name="FieldOne2Many">
-    <div style="background: #ccc; padding: 20px">
+    <div t-att-id="widget.element_id">
         One2Many widget
     </div>
 </t>
@@ -281,11 +276,9 @@
     </button>
 </t>
 <t t-name="SearchView">
-    <h3 class="title"><t t-esc="view.attrs['string']"/></h3>
-
+    <h2 class="oe_view_title"><t t-esc="view.attrs['string']"/></h2>
     <form>
         <t t-call="SearchView.render_lines"/>
-
         <div style="text-align:right;">
             <input type="submit" value="Search"/>
             <input type="reset" value="Clear"/>