From 5c5542e179e5a35bc91720b993e5edb5c973ee46 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 12 Apr 2011 13:17:12 +0200
Subject: [PATCH] [IMP] merge pager into list table header, remove template
 call between table and table.header

bzr revid: xmo@openerp.com-20110412111712-j3ma06fcec7rhi47
---
 addons/base/static/src/css/base.css |  7 +++++
 addons/base/static/src/xml/base.xml | 47 ++++++++++++-----------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 535d152839f..ee15d02f3f7 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -441,6 +441,13 @@ body.openerp {
     opacity: 0.5;
 }
 
+.openerp .oe-listview th.oe-actions {
+    text-align: left;
+}
+.openerp .oe-listview th.oe-list-pager {
+    text-align: right;
+}
+
 /** list rounded corners
 
     rounded corners are a pain on tables: need to round not only table, but
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 97f656378bf..607260018d4 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -152,38 +152,29 @@
 	</tr>
     </table>
 </t>
-<t t-name="ListView">
-    <!--
-    <h3><t t-esc="fields_view.arch['@string']"/></h3>
-    -->
-    <div class="oe_list_header">
-        <div class="oe_list_buttons">
-            <!--<button type="button" class="oe_list_button_new">New</button>-->
-        </div>
-        <div class="oe_list_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>
-    </div>
-    <table>
-        <t t-call="ListView.header"/>
-    </table>
-</t>
-<t t-name="ListView.header">
-    <thead t-if="options.header" class="ui-widget-header">
+<table t-name="ListView">
+    <thead class="ui-widget-header">
         <tr t-if="options.selectable and options.deletable">
-            <th t-att-colspan="visible_columns.length + 2">
+            <th t-att-colspan="Math.floor((visible_columns.length + 2) / 2)"
+                class="oe-actions">
                 <button type="button" id="oe-list-delete">
-                    Delete Selected
+                    Delete
                 </button>
             </th>
+            <th t-att-colspan="Math.ceil((visible_columns.length + 2) / 2)"
+                class="oe-list-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">1</span>
+                / <span class="oe-pager-count">1</span>
+
+                <button type="button" data-pager-action="next">&gt;&gt;</button>
+                <button type="button" data-pager-action="last">Last</button>
+            </th>
         </tr>
-        <tr>
+        <tr t-if="options.header">
             <th t-if="options.selectable"/>
             <t t-foreach="columns" t-as="column">
                 <th t-if="column.invisible !== '1'">
@@ -195,7 +186,7 @@
             <th t-if="options.deletable"/>
         </tr>
     </thead>
-</t>
+</table>
 <t t-name="ListView.rows" t-foreach="rows" t-as="row">
     <t t-call="ListView.row">
         <t t-set="style" t-value="null"/>