From 5f71dad5e34cc9ef5a59ba2dd770c39816cee2e2 Mon Sep 17 00:00:00 2001
From: sri-odoo <sri@odoo.com>
Date: Wed, 29 Aug 2018 14:28:21 +0200
Subject: [PATCH] [IMP] portal, *: review home entries templates

* account, project, purchase, sale, website_crm_partner_assign

- Create a single template to be used for all doc's entry in order to
  simplify maintenance
- Make the entire entry clickable using bts4 classes
- Fix an alignment issue between title and badge
---
 .../views/account_portal_templates.xml        | 11 +++++-----
 addons/portal/views/portal_templates.xml      | 11 ++++++++--
 .../views/project_portal_templates.xml        | 20 ++++++++++---------
 addons/purchase/views/portal_templates.xml    | 11 +++++-----
 addons/sale/views/sale_portal_templates.xml   | 20 ++++++++++---------
 .../website_crm_partner_assign_templates.xml  | 20 ++++++++++---------
 6 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml
index 7dd506c2cf0..4e44dbd3f8f 100644
--- a/addons/account/views/account_portal_templates.xml
+++ b/addons/account/views/account_portal_templates.xml
@@ -13,11 +13,12 @@
     </template>
 
     <template id="portal_my_home_invoice" name="Portal My Home : invoice entries" inherit_id="portal.portal_my_home" priority="30">
-        <xpath expr="//ul[hasclass('o_portal_docs')]" position="inside">
-            <li t-if="invoice_count" class="list-group-item">
-                <span class="badge badge-secondary badge-pill float-right" t-esc="invoice_count"/>
-                <a href="/my/invoices">Invoices</a>
-            </li>
+        <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
+			<t t-if="invoice_count" t-call="portal.portal_docs_entry">
+                <t t-set="title">Invoices</t>
+                <t t-set="url" t-value="'/my/invoices'"/>
+                <t t-set="count" t-value="invoice_count"/>
+            </t>
         </xpath>
     </template>
 
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index af2d69a10c7..f78fa107b32 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -128,13 +128,20 @@
             <div class="o_portal_my_home">
                 <div class="oe_structure"></div>
                 <h3>Your Documents</h3>
-                <ul class="o_portal_docs list-group">
-                </ul>
+                <div class="o_portal_docs list-group">
+                </div>
             </div>
             <div class="col-lg-12 oe_structure"/>
         </t>
     </template>
 
+    <template id="portal_docs_entry" name="My Portal Docs Entry">
+        <a t-att-href="url" t-att-title="title" class="list-group-item list-group-item-action d-flex align-items-center justify-content-between">
+            <t t-esc="title"/>
+            <span class="badge badge-secondary badge-pill" t-esc="count"/>
+        </a>
+    </template>
+
     <!--
         The search bar is composed of 2 buttons : a "filter by" and a "sort by". Changing the 'sortby'
         criteria will keep the number of page, query params, ... Changing the 'filterby' param will
diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml
index 1db0eddc660..7f4e00fc1d7 100644
--- a/addons/project/views/project_portal_templates.xml
+++ b/addons/project/views/project_portal_templates.xml
@@ -20,15 +20,17 @@
     </template>
 
     <template id="portal_my_home" name="Portal My Home: project entries" inherit_id="portal.portal_my_home" priority="40">
-        <xpath expr="//ul[hasclass('o_portal_docs')]" position="inside">
-            <li t-if="project_count" class="list-group-item">
-                <span class="badge badge-secondary badge-pill float-right" t-esc="project_count"/>
-                <a href="/my/projects">Projects</a>
-            </li>
-            <li t-if="task_count" class="list-group-item">
-                <span class="badge badge-secondary badge-pill float-right" t-esc="task_count"/>
-                <a href="/my/tasks">Tasks</a>
-            </li>
+        <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
+            <t t-if="project_count" t-call="portal.portal_docs_entry">
+                <t t-set="title">Projects</t>
+                <t t-set="url" t-value="'/my/projects'"/>
+                <t t-set="count" t-value="project_count"/>
+            </t>
+            <t t-if="task_count" t-call="portal.portal_docs_entry">
+                <t t-set="title">Tasks</t>
+                <t t-set="url" t-value="'/my/tasks'"/>
+                <t t-set="count" t-value="task_count"/>
+            </t>
         </xpath>
     </template>
 
diff --git a/addons/purchase/views/portal_templates.xml b/addons/purchase/views/portal_templates.xml
index 273d9a99a52..42da1704631 100644
--- a/addons/purchase/views/portal_templates.xml
+++ b/addons/purchase/views/portal_templates.xml
@@ -14,11 +14,12 @@
   </template>
 
   <template id="portal_my_home_purchase" name="Portal My Home : purchase entry" inherit_id="portal.portal_my_home" priority="25">
-    <xpath expr="//ul[hasclass('o_portal_docs')]" position="inside">
-        <li t-if="purchase_count" class="list-group-item">
-          <span class="badge badge-secondary badge-pill float-right" t-esc="purchase_count"/>
-          <a href="/my/purchase">Purchase Orders</a>
-        </li>
+    <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
+        <t t-if="purchase_count" t-call="portal.portal_docs_entry">
+            <t t-set="title">Purchase Orders</t>
+            <t t-set="url" t-value="'/my/purchase'"/>
+            <t t-set="count" t-value="purchase_count"/>
+        </t>
     </xpath>
   </template>
 
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index de73eff2ba7..32869046bd9 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -19,15 +19,17 @@
     </template>
 
     <template id="portal_my_home_sale" name="Portal My Home : sales entries" inherit_id="portal.portal_my_home" priority="20">
-        <xpath expr="//ul[hasclass('o_portal_docs')]" position="inside">
-            <li t-if="quotation_count" class="list-group-item">
-                <span class="badge badge-secondary badge-pill float-right" t-esc="quotation_count"/>
-                <a href="/my/quotes">Quotations</a>
-            </li>
-            <li t-if="order_count" class="list-group-item">
-                <span class="badge badge-secondary badge-pill float-right" t-esc="order_count"/>
-                <a href="/my/orders">Sales Orders</a>
-            </li>
+        <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
+            <t t-if="quotation_count" t-call="portal.portal_docs_entry">
+                <t t-set="title">Quotations</t>
+                <t t-set="url" t-value="'/my/quotes'"/>
+                <t t-set="count" t-value="quotation_count"/>
+            </t>
+            <t t-if="order_count" t-call="portal.portal_docs_entry">
+                <t t-set="title">Sales Orders</t>
+                <t t-set="url" t-value="'/my/orders'"/>
+                <t t-set="count" t-value="order_count"/>
+            </t>
         </xpath>
     </template>
 
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 1df963c77a1..b933d432224 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
@@ -213,15 +213,17 @@
     </template>
 
     <template id="portal_my_home_lead" name="Portal My Home : lead entries" inherit_id="portal.portal_my_home" priority="15">
-        <xpath expr="//ul[hasclass('o_portal_docs')]" position="inside">
-            <li t-if="lead_count" class="list-group-item">
-                <span class="badge badge-secondary badge-pill float-right" t-esc="lead_count"/>
-                <a href="/my/leads">My Leads</a>
-            </li>
-            <li class="list-group-item">
-                <span class="badge badge-secondary badge-pill float-right" t-esc="opp_count"/>
-                <a href="/my/opportunities">My Opportunities</a>
-            </li>
+        <xpath expr="//div[hasclass('o_portal_docs')]" position="inside">
+            <t t-if="lead_count" t-call="portal.portal_docs_entry">
+                <t t-set="title">My Leads</t>
+                <t t-set="url" t-value="'/my/leads'"/>
+                <t t-set="count" t-value="lead_count"/>
+            </t>
+            <t t-call="portal.portal_docs_entry">
+                <t t-set="title">My Opportunities</t>
+                <t t-set="url" t-value="'/my/opportunities'"/>
+                <t t-set="count" t-value="opp_count"/>
+            </t>
         </xpath>
     </template>