diff options
| author | sri-odoo <sri@odoo.com> | 2019-09-27 10:29:35 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2019-09-27 14:22:10 +0000 |
| commit | 09c9d1f0d0d1db251c074045e5c2fdc52165c6b7 (patch) | |
| tree | faaa63e8d20a8c7fce6e95df012e190b997631bd /addons | |
| parent | f68c946f6ccd0bcf745b2605cd808629b332d69e (diff) | |
[IMP] utm,crm,link_tracker,sale: improve utm.campaign kanban view
This commit slightly improves the utm.campaign kanban view by reordering statistics and changing
their display.
Task#2077579
closes odoo/odoo#37518
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/crm/views/utm_campaign_views.xml | 12 | ||||
| -rw-r--r-- | addons/link_tracker/views/utm_campaign_views.xml | 5 | ||||
| -rw-r--r-- | addons/mass_mailing/views/utm_campaign_views.xml | 2 | ||||
| -rw-r--r-- | addons/mass_mailing_sms/views/utm_campaign_views.xml | 2 | ||||
| -rw-r--r-- | addons/sale/views/utm_campaign_views.xml | 15 | ||||
| -rw-r--r-- | addons/utm/views/utm_campaign_views.xml | 13 |
6 files changed, 29 insertions, 20 deletions
diff --git a/addons/crm/views/utm_campaign_views.xml b/addons/crm/views/utm_campaign_views.xml index bb6e0abb78d..ea64301402e 100644 --- a/addons/crm/views/utm_campaign_views.xml +++ b/addons/crm/views/utm_campaign_views.xml @@ -7,15 +7,15 @@ <field name="arch" type="xml"> <xpath expr="//div[@id='utm_statistics']" position="inside"> <field name="crm_lead_activated" invisible="1"/> - <div class="d-flex justify-content-between align-items-center w-100 order-3 mb-1" - groups="sales_team.group_sale_salesman" + <div class="px-2 text-center" groups="sales_team.group_sale_salesman" attrs="{'invisible': [('crm_lead_activated', '=', False)]}"> - <strong>Leads</strong> <span><field name="lead_count"/></span> + <small>Leads:</small> + <small class="font-weight-bold"><field name="lead_count"/></small> </div> - <div class="d-flex justify-content-between align-items-center w-100 order-3 mb-1" - groups="sales_team.group_sale_salesman" + <div class="px-2 text-center" groups="sales_team.group_sale_salesman" attrs="{'invisible': [('crm_lead_activated', '=', True)]}"> - <strong>Opportunities</strong> <span><field name="opportunity_count"/></span> + <small>Opportunities:</small> + <small class="font-weight-bold"><field name="opportunity_count"/></small> </div> </xpath> </field> diff --git a/addons/link_tracker/views/utm_campaign_views.xml b/addons/link_tracker/views/utm_campaign_views.xml index e39c1ec1845..f74df86a717 100644 --- a/addons/link_tracker/views/utm_campaign_views.xml +++ b/addons/link_tracker/views/utm_campaign_views.xml @@ -23,8 +23,9 @@ <field name="click_count"/> </xpath> <xpath expr="//div[@id='utm_statistics']" position="inside"> - <div class="d-flex justify-content-between align-items-center w-100 order-1 mb-1"> - <strong>Clicks</strong> <span><t t-esc="record.click_count.raw_value"/></span> + <div class="px-2 text-center"> + <small>Clicks:</small> + <small class="font-weight-bold" t-esc="record.click_count.raw_value" /> </div> </xpath> </field> diff --git a/addons/mass_mailing/views/utm_campaign_views.xml b/addons/mass_mailing/views/utm_campaign_views.xml index 87c9d64a27a..00088aabb38 100644 --- a/addons/mass_mailing/views/utm_campaign_views.xml +++ b/addons/mass_mailing/views/utm_campaign_views.xml @@ -80,7 +80,7 @@ <xpath expr="//field[@name='user_id']" position="after"> <field name="mailing_mail_ids"/> </xpath> - <xpath expr="//div[hasclass('o_kanban_record_headings')]"> + <xpath expr="//div[hasclass('o_kanban_record_body')]"> <a name="%(action_view_mass_mailings_from_campaign)d" type="action" class="oe_mailings o_kanban_record_subtitle d-inline-block"> <t t-raw="record.mailing_mail_ids.raw_value.length"/> Mailings diff --git a/addons/mass_mailing_sms/views/utm_campaign_views.xml b/addons/mass_mailing_sms/views/utm_campaign_views.xml index 8657e3f81aa..d9962682fde 100644 --- a/addons/mass_mailing_sms/views/utm_campaign_views.xml +++ b/addons/mass_mailing_sms/views/utm_campaign_views.xml @@ -44,7 +44,7 @@ <xpath expr="//field[@name='user_id']" position="after"> <field name="mailing_sms_count"/> </xpath> - <xpath expr="//div[hasclass('o_kanban_record_headings')]"> + <xpath expr="//div[hasclass('o_kanban_record_body')]"> <a name="action_redirect_to_mailing_sms" type="object" class="oe_mailings o_kanban_record_subtitle d-inline-block"> <t t-raw="record.mailing_sms_count.raw_value"/> SMS diff --git a/addons/sale/views/utm_campaign_views.xml b/addons/sale/views/utm_campaign_views.xml index 943a951752d..b0cee3f96f1 100644 --- a/addons/sale/views/utm_campaign_views.xml +++ b/addons/sale/views/utm_campaign_views.xml @@ -6,12 +6,17 @@ <field name="inherit_id" ref="utm.utm_campaign_view_kanban"/> <field name="arch" type="xml"> <xpath expr="//div[@id='utm_statistics']" position="inside"> - <div class="d-flex justify-content-between align-items-center w-100 order-2 mb-1"> - <field name="currency_id" invisible="True"/> - <strong>Revenues</strong> <span><field name="invoiced_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/></span> + <div class="px-2 text-center"> + <small>Quotations:</small> + <small class="font-weight-bold"> + <field name="quotation_count"/> + </small> </div> - <div class="d-flex justify-content-between align-items-center w-100 order-4 mb-1"> - <strong>Quotations</strong> <span><field name="quotation_count"/></span> + <div class="px-2 text-center"> + <small>Revenues:</small> + <small class="font-weight-bold"> + <field name="invoiced_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/> + </small> </div> </xpath> </field> diff --git a/addons/utm/views/utm_campaign_views.xml b/addons/utm/views/utm_campaign_views.xml index 50704cda280..5f22bc0f92c 100644 --- a/addons/utm/views/utm_campaign_views.xml +++ b/addons/utm/views/utm_campaign_views.xml @@ -64,7 +64,7 @@ <field name="stage_id"/> <templates> <t t-name="kanban-box"> - <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click"> + <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click p-0"> <div class="o_dropdown_kanban dropdown"> <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu"> <span class="fa fa-ellipsis-v"/> @@ -82,16 +82,19 @@ </div> </div> <div class="oe_kanban_content"> - <div class="o_kanban_record_top mb16"> + <div class="o_kanban_record_top p-2"> <div class="o_kanban_record_headings"> <h3 class="oe_margin_bottom_8 o_kanban_record_title"><field name="name"/></h3> </div> </div> - <div class="o_kanban_record_body"> + <div class="o_kanban_record_body px-2"> <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/> </div> - <div class="o_kanban_record_bottom mt16" style="height:90px"> - <div id="utm_statistics" class="d-flex flex-column justify-content-start align-items-start w-100"/> + <div id="utm_statistics" class="d-flex bg-100 px-3 py-1 border-bottom border-top justify-content-between"/> + <div class="d-flex flex-grow-0 flex-column align-items-end px-3 py-2"> + <img t-att-src="kanban_image('res.users', 'image_128', record.user_id.raw_value)" + t-att-data-member_id="record.user_id.raw_value" + t-att-alt="record.user_id.raw_value" width="32" height="32" class="oe_kanban_avatar"/> </div> </div> <div class="oe_clear"></div> |
