summaryrefslogtreecommitdiff
path: root/addons/base/static/src/xml
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2011-04-12 13:17:12 +0200
committerXavier Morel <xmo@openerp.com>2011-04-12 13:17:12 +0200
commit5c5542e179e5a35bc91720b993e5edb5c973ee46 (patch)
tree2dcd673c53d79ce56b7d91126b1c2a85b8943c8d /addons/base/static/src/xml
parent4e1b38312e6a97522051a4c8548bb480bff480a8 (diff)
[IMP] merge pager into list table header, remove template call between table and table.header
bzr revid: xmo@openerp.com-20110412111712-j3ma06fcec7rhi47
Diffstat (limited to 'addons/base/static/src/xml')
-rw-r--r--addons/base/static/src/xml/base.xml47
1 files changed, 19 insertions, 28 deletions
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"/>