summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRishabh Jadia <rja@odoo.com>2018-05-16 12:38:07 +0000
committerRomain Derie <rde@odoo.com>2019-04-19 12:41:43 +0000
commitae8d68c0fdaddb26da6e9825df00a1329c907bca (patch)
treee115c19713303f2ed20e6fe4c4abb2a72ab87abd
parent49bc5750a3542deca59515a1144c2a602e116b5c (diff)
[IMP] account, payment, sale, portal, *: unify section title on portal
* website_crm_partner_assign Before this task, portal section titles were not unified, some titles had 'your', some 'my', some none. This commit unifies everything. task-51585 closes odoo/odoo#24697 Signed-off-by: Romain Derie (rde) <rde@odoo.com>
-rw-r--r--addons/account/views/account_portal_templates.xml2
-rw-r--r--addons/payment/views/payment_portal_templates.xml4
-rw-r--r--addons/portal/views/portal_templates.xml11
-rw-r--r--addons/sale/views/sale_portal_templates.xml2
-rw-r--r--addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml18
5 files changed, 19 insertions, 18 deletions
diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml
index 858a7cf58df..4123da601d1 100644
--- a/addons/account/views/account_portal_templates.xml
+++ b/addons/account/views/account_portal_templates.xml
@@ -105,7 +105,7 @@
</div>
</li>
<li t-if="invoice.user_id" class="list-group-item flex-grow-1">
- <div class="small mb-1"><strong class="text-muted">Your Contact</strong></div>
+ <div class="small mb-1"><strong class="text-muted">Salesperson</strong></div>
<div class="row">
<div class="col flex-grow-0 pr-2">
<img t-if="invoice.user_id.image" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(invoice.user_id.image)" alt="Contact"/>
diff --git a/addons/payment/views/payment_portal_templates.xml b/addons/payment/views/payment_portal_templates.xml
index 8328fac20c8..989916c778e 100644
--- a/addons/payment/views/payment_portal_templates.xml
+++ b/addons/payment/views/payment_portal_templates.xml
@@ -17,7 +17,7 @@
<div class="clearfix">
<div class="row">
<div class="col-md-8">
- <h3>Manage your Payment Methods</h3>
+ <h3>Manage Payment Methods</h3>
<t t-call="payment.payment_tokens_list">
<t t-set="acquirers" t-value="acquirers"/>
<t t-set="mode" t-value="'manage'"/>
@@ -35,7 +35,7 @@
<template id="pay_meth_link" inherit_id="portal.portal_layout">
<xpath expr="//div[hasclass('o_portal_my_details')]" position="inside">
<t t-if="request.env['payment.acquirer'].search([('website_published', '=', True), ('registration_view_template_id', '!=', False), ('payment_flow', '=', 's2s'), ('company_id', '=', request.env.user.company_id.id)])">
- <div class='manage_payment_method mt16'><a href="/my/payment_method">Manage your payment methods</a></div>
+ <div class='manage_payment_method mt16'><a href="/my/payment_method">Manage payment methods</a></div>
</t>
</xpath>
</template>
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index 40d97e6b520..e07fa52fb2e 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -74,7 +74,7 @@
<template id="portal_breadcrumbs" name="Portal Breadcrumbs">
<ol t-if="page_name != 'home'" class="o_portal_submenu breadcrumb mb-0 py-2 flex-grow-1">
<li class="breadcrumb-item"><a href="/my/home" aria-label="Home" title="Home"><i class="fa fa-home"/></a></li>
- <li t-if="page_name == 'my_details'" class="breadcrumb-item">Your Details</li>
+ <li t-if="page_name == 'my_details'" class="breadcrumb-item">Details</li>
</ol>
</template>
@@ -113,7 +113,7 @@
<t t-call="portal.portal_contact"/>
</div>
<div class="o_portal_my_details">
- <h4>Your Details <a role="button" href="/my/account" class="btn btn-sm btn-link"><i class="fa fa-pencil"/> Edit</a></h4>
+ <h4>Details <a role="button" href="/my/account" class="btn btn-sm btn-link"><i class="fa fa-pencil"/> Edit</a></h4>
<hr class="mt-1 mb-0"/>
<div t-field="user_id.partner_id" t-options='{"widget": "contact", "fields": ["email", "phone", "address", "name"]}'/>
</div>
@@ -147,7 +147,7 @@
<t t-set="my_details" t-value="True"/>
<div class="o_portal_my_home">
<div class="oe_structure" id="oe_structure_portal_my_home_1"/>
- <h3>Your Documents</h3>
+ <h3>Documents</h3>
<div class="o_portal_docs list-group">
</div>
</div>
@@ -350,8 +350,7 @@
<template id="portal_my_details">
<t t-call="portal.portal_layout">
- <t t-set="additional_title">Your Contact Details</t>
- <h3>Your Details</h3>
+ <t t-set="additional_title">Contact Details</t>
<form action="/my/account" method="post">
<input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
<div class="row o_portal_details">
@@ -363,7 +362,7 @@
</div>
</div>
<div t-attf-class="form-group #{error.get('name') and 'o_has_error' or ''} col-xl-6">
- <label class="col-form-label" for="name">Your Name</label>
+ <label class="col-form-label" for="name">Name</label>
<input type="text" name="name" t-attf-class="form-control #{error.get('name') and 'is-invalid' or ''}" t-att-value="name or partner.name" />
</div>
<div t-attf-class="form-group #{error.get('email') and 'o_has_error' or ''} col-xl-6">
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index 3f59a26dd3d..31cc5e3ee6f 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -180,7 +180,7 @@
</t>
<li t-if="sale_order.user_id" class="list-group-item flex-grow-1">
- <div class="small mb-1"><strong class="text-muted">Your Contact</strong></div>
+ <div class="small mb-1"><strong class="text-muted">Salesperson</strong></div>
<div class="row flex-nowrap">
<div class="col flex-grow-0 pr-2">
<img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="sale_order.user_id.image" t-att-src="image_data_uri(sale_order.user_id.image)" alt="Contact"/>
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 63475851e7f..a0b38555724 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
@@ -187,10 +187,10 @@
<xpath expr="//ol[hasclass('o_portal_submenu')]" position="inside">
<li t-if="page_name == 'lead' or lead" t-attf-class="breadcrumb-item #{'active ' if not lead else ''}">
<a t-if="lead" t-attf-href="/my/leads?{{ keep_query() }}">
- My Leads
+ Leads
</a>
<t t-else="">
- My Leads
+ Leads
</t>
</li>
<li t-if="lead" class="breadcrumb-item active">
@@ -198,10 +198,10 @@
</li>
<li t-if="page_name == 'opportunity' or opportunity" t-attf-class="breadcrumb-item #{'active ' if not opportunity else ''}">
<a t-if="opportunity" t-attf-href="/my/opportunities?{{ keep_query() }}">
- My Opportunities
+ Opportunities
</a>
<t t-else="">
- My Opportunities
+ Opportunities
</t>
</li>
<li t-if="opportunity" class="breadcrumb-item active">
@@ -213,12 +213,12 @@
<template id="portal_my_home_lead" name="Portal My Home : lead entries" inherit_id="portal.portal_my_home" priority="15">
<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="title">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="title">Opportunities</t>
<t t-set="url" t-value="'/my/opportunities'"/>
<t t-set="count" t-value="opp_count"/>
</t>
@@ -227,8 +227,10 @@
<template id="portal_my_leads" name="My Leads">
<t t-call="portal.portal_layout">
+ <t t-set="breadcrumbs_searchbar" t-value="True"/>
+
<t t-call="portal.portal_searchbar">
- <t t-set="title">My Leads</t>
+ <t t-set="title">Leads</t>
</t>
<div t-if="not leads" class="alert alert-warning mt8" role="alert">
There are no leads.
@@ -259,7 +261,7 @@
<t t-set="breadcrumbs_searchbar" t-value="True"/>
<t t-call="portal.portal_searchbar">
- <t t-set="title">My Opportunities</t>
+ <t t-set="title">Opportunities</t>
<div class="form-inline ml-lg-4" t-if="request.env.user.partner_id.grade_id or request.env.user.commercial_partner_id.grade_id">
<button class="btn btn-success btn-sm" name='new_opp' data-toggle="modal" data-target=".modal_new_opp" title="Add an opportunity" aria-label="Add an opportunity">