summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2018-05-25 16:57:59 +0200
committerqsm-odoo <qsm@odoo.com>2018-07-27 12:36:54 +0200
commit54aee4626bd2486ff86df490e4d2350f5702f898 (patch)
treeb6ee6479ddb5d8eeb5f78a6498f54620b23cea8f
parent20d033a782f4d85fdd6f15df68d116b2fd7a7dfd (diff)
[REF] *: BS4, adapt pagination structure
Pagination elements' items must now have the 'page-item'/'page-link' classes.
-rw-r--r--addons/portal/static/src/xml/portal_chatter.xml12
-rw-r--r--addons/portal/views/portal_templates.xml10
-rw-r--r--addons/survey/views/survey_result.xml4
-rw-r--r--addons/website/views/website_templates.xml2
-rw-r--r--addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml2
-rw-r--r--addons/website_customer/views/website_customer_templates.xml2
-rw-r--r--addons/website_forum/views/website_forum.xml4
-rw-r--r--addons/website_sale/views/templates.xml2
8 files changed, 19 insertions, 19 deletions
diff --git a/addons/portal/static/src/xml/portal_chatter.xml b/addons/portal/static/src/xml/portal_chatter.xml
index 3831c5ebd2e..683317020d2 100644
--- a/addons/portal/static/src/xml/portal_chatter.xml
+++ b/addons/portal/static/src/xml/portal_chatter.xml
@@ -84,16 +84,16 @@
<div class="o_portal_chatter_pager">
<t t-if="!_.isEmpty(widget.get('pager'))">
<ul class="pagination" t-if="widget.get('pager')['pages'].length &gt; 1">
- <li t-if="widget.get('pager')['page'] != widget.get('pager')['page_previous']" t-att-data-page="widget.get('pager')['page_previous']" class="o_portal_chatter_pager_btn">
- <a href="#"><i class="fa fa-chevron-left" role="img" aria-label="Previous" title="Previous"/></a>
+ <li t-if="widget.get('pager')['page'] != widget.get('pager')['page_previous']" t-att-data-page="widget.get('pager')['page_previous']" class="page-item o_portal_chatter_pager_btn">
+ <a href="#" class="page-link"><i class="fa fa-chevron-left" role="img" aria-label="Previous" title="Previous"/></a>
</li>
<t t-foreach="widget.get('pager')['pages']" t-as="page">
- <li t-att-data-page="page" t-att-class="page == widget.get('pager')['page'] ? 'o_portal_chatter_pager_btn active' : 'o_portal_chatter_pager_btn'">
- <a href="#"><t t-esc="page"/></a>
+ <li t-att-data-page="page" t-attf-class="page-item #{page == widget.get('pager')['page'] ? 'o_portal_chatter_pager_btn active' : 'o_portal_chatter_pager_btn'}">
+ <a href="#" class="page-link"><t t-esc="page"/></a>
</li>
</t>
- <li t-if="widget.get('pager')['page'] != widget.get('pager')['page_next']" t-att-data-page="widget.get('pager')['page_next']" class="o_portal_chatter_pager_btn">
- <a href="#"><i class="fa fa-chevron-right" role="img" aria-label="Next" title="Next"/></a>
+ <li t-if="widget.get('pager')['page'] != widget.get('pager')['page_next']" t-att-data-page="widget.get('pager')['page_next']" class="page-item o_portal_chatter_pager_btn">
+ <a href="#" class="page-link"><i class="fa fa-chevron-right" role="img" aria-label="Next" title="Next"/></a>
</li>
</ul>
</t>
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index 5222c4c73d0..0e940918847 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -365,14 +365,14 @@
<template id="pager" name="Pager">
<ul t-if="pager['page_count'] > 1" t-attf-class="#{ classname or '' } pagination" t-att-style="style or None">
- <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else None ">
- <a t-att-href=" pager['page_previous']['url'] if pager['page']['num'] != 1 else None">Prev</a>
+ <li t-attf-class="page-item #{'disabled' if pager['page']['num'] == 1 else ''}">
+ <a t-att-href=" pager['page_previous']['url'] if pager['page']['num'] != 1 else None" class="page-link">Prev</a>
</li>
<t t-foreach="pager['pages']" t-as="page">
- <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else None "> <a t-att-href="page['url']" t-raw="page['num']"></a></li>
+ <li t-attf-class="page-item #{'active' if page['num'] == pager['page']['num'] else ''}"> <a t-att-href="page['url']" class="page-link" t-raw="page['num']"></a></li>
</t>
- <li t-att-class=" 'disabled' if pager['page']['num'] == pager['page_count'] else None ">
- <a t-att-href="pager['page_next']['url'] if pager['page']['num'] != pager['page_count'] else None">Next</a>
+ <li t-attf-class="page-item #{'disabled' if pager['page']['num'] == pager['page_count'] else ''}">
+ <a t-att-href="pager['page_next']['url'] if pager['page']['num'] != pager['page_count'] else None" class="page-link">Next</a>
</li>
</ul>
</template>
diff --git a/addons/survey/views/survey_result.xml b/addons/survey/views/survey_result.xml
index d28fbae279a..f3bcda59738 100644
--- a/addons/survey/views/survey_result.xml
+++ b/addons/survey/views/survey_result.xml
@@ -336,8 +336,8 @@
<t t-set="record_limit" t-value="10"/><!-- Change This record_limit to change number of record per page-->
<ul t-att-id="'pagination_%d' % question.id" class="pagination" t-att-data-question_id="question.id" t-att-data-record_limit="record_limit">
<t t-if="len(text_result) > record_limit">
- <li t-foreach="page_range(len(text_result), record_limit)" t-as="num">
- <a href="#" t-esc="num"></a>
+ <li t-foreach="page_range(len(text_result), record_limit)" t-as="num" class="page-item">
+ <a href="#" class="page-link" t-esc="num"></a>
</li>
</t>
</ul>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 1f49c482f04..375188134ea 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -440,7 +440,7 @@
<t t-call="#{ template }"></t>
</t>
<!-- pager -->
- <div t-if="1 != obj['page_end']" class="pagination pagination-centered">
+ <div t-if="1 != obj['page_end']" class="pagination pagination-centered"><!-- FIXME -->
<ul>
<li t-attf-class="prev #{'active' if obj['page'] == 1 else '' }">
<a t-att-href=" '%s,%s-%s' % (obj['kanban_url'], obj['column_id'].id, (obj['page'] &gt; 1 and obj['page']-1 or 1)) ">Prev</a></li>
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
index 8fe82cacd82..d58028e47b1 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
@@ -62,7 +62,7 @@
<div class='navbar'>
<div>
<t t-call="website.pager"/>
- <form action="" method="get" class="navbar-search pull-right pagination form-inline">
+ <form action="" method="get" class="navbar-search pull-right pagination form-inline"><!-- FIXME -->
<div class="form-group pull-right">
<input type="text" name="search" class="search-query col-lg-2 mt4 form-control" placeholder="Search" t-att-value="searches.get('search', '')"/>
</div>
diff --git a/addons/website_customer/views/website_customer_templates.xml b/addons/website_customer/views/website_customer_templates.xml
index b40caac2ffa..80e3ecda3ce 100644
--- a/addons/website_customer/views/website_customer_templates.xml
+++ b/addons/website_customer/views/website_customer_templates.xml
@@ -22,7 +22,7 @@
<t t-call="website.pager">
<t t-set="classname" t-value="'pull-left'"/>
</t>
- <form action="" method="get" class="navbar-search pull-right pagination form-inline">
+ <form action="" method="get" class="navbar-search pull-right pagination form-inline"><!-- FIXME -->
<div class="form-group">
<input type="text" name="search" class="search-query form-control"
placeholder="Search" t-att-value="post.get('search', '')"/>
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index d2678e38b3f..24d2dc2b56e 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -1125,9 +1125,9 @@
</p>
<nav t-if="pager_tag_chars">
<ul class="pagination mt0 mb0">
- <li class="disabled"><a aria-label="Filter" title="Filter"><i class="fa fa-filter"></i></a></li>
+ <li class="page-item disabled"><a class="page-link" aria-label="Filter" title="Filter"><i class="fa fa-filter"></i></a></li>
<t t-foreach="pager_tag_chars" t-as="tuple_char">
- <li t-attf-class="#{'active' if active_char_tag == tuple_char[1] else ''}"><a t-attf-href="/forum/#{slug(forum)}/tag/#{quote_plus(tuple_char[1])}"><t t-esc="tuple_char[0]"/></a></li>
+ <li t-attf-class="page-item #{'active' if active_char_tag == tuple_char[1] else ''}"><a t-attf-href="/forum/#{slug(forum)}/tag/#{quote_plus(tuple_char[1])}" class="page-link"><t t-esc="tuple_char[0]"/></a></li>
</t>
</ul>
</nav>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 329708c5e69..42777238bc8 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -180,7 +180,7 @@
<div class="products_pager">
<div class="row" style="width: 100%;">
<t t-call="website_sale.search">
- <t t-set="search_class" t-value="'pagination form-inline o_website_sale_search'"/>
+ <t t-set="search_class" t-value="'pagination form-inline o_website_sale_search'"/><!-- FIXME -->
</t>
<t t-call="website_sale.pricelist_list" />
<t t-call="website.pager" />