diff --git a/addons/crm/views/utm_campaign_views.xml b/addons/crm/views/utm_campaign_views.xml index ea64301402e..d995ca00826 100644 --- a/addons/crm/views/utm_campaign_views.xml +++ b/addons/crm/views/utm_campaign_views.xml @@ -7,14 +7,16 @@ -
- Leads: +
+
-
- Opportunities: +
+
diff --git a/addons/link_tracker/views/utm_campaign_views.xml b/addons/link_tracker/views/utm_campaign_views.xml index f74df86a717..f4ae6b464dc 100644 --- a/addons/link_tracker/views/utm_campaign_views.xml +++ b/addons/link_tracker/views/utm_campaign_views.xml @@ -23,8 +23,8 @@ -
- Clicks: +
+
diff --git a/addons/mass_mailing/views/utm_campaign_views.xml b/addons/mass_mailing/views/utm_campaign_views.xml index 00088aabb38..b269bc3a3fb 100644 --- a/addons/mass_mailing/views/utm_campaign_views.xml +++ b/addons/mass_mailing/views/utm_campaign_views.xml @@ -80,9 +80,9 @@ - + + t-attf-class="oe_mailings #{record.mailing_mail_ids.raw_value.length === 0 ? 'text-muted' : ''}"> Mailings diff --git a/addons/mass_mailing_sms/views/utm_campaign_views.xml b/addons/mass_mailing_sms/views/utm_campaign_views.xml index d9962682fde..4a9f1eb5768 100644 --- a/addons/mass_mailing_sms/views/utm_campaign_views.xml +++ b/addons/mass_mailing_sms/views/utm_campaign_views.xml @@ -44,9 +44,9 @@ - + + t-attf-class="oe_mailings #{record.mailing_sms_count.raw_value === 0 ? 'text-muted' : ''}"> SMS diff --git a/addons/sale/views/utm_campaign_views.xml b/addons/sale/views/utm_campaign_views.xml index b0cee3f96f1..62eace8d766 100644 --- a/addons/sale/views/utm_campaign_views.xml +++ b/addons/sale/views/utm_campaign_views.xml @@ -6,18 +6,18 @@ -
- Quotations: - - - -
-
- Revenues: +
+
+
+ + + + +
@@ -29,11 +29,11 @@ diff --git a/addons/utm/__manifest__.py b/addons/utm/__manifest__.py index b7f56a957a9..ca7e9f9707e 100644 --- a/addons/utm/__manifest__.py +++ b/addons/utm/__manifest__.py @@ -8,9 +8,10 @@ Enable management of UTM trackers: campaign, medium, source. """, 'version': '1.0', - 'depends': ['base'], + 'depends': ['base', 'web'], 'data': [ 'data/utm_data.xml', + 'views/assets.xml', 'views/utm_campaign_views.xml', 'views/utm_views.xml', 'security/ir.model.access.csv', diff --git a/addons/utm/static/src/scss/utm_views.scss b/addons/utm/static/src/scss/utm_views.scss new file mode 100644 index 00000000000..25c537c8a12 --- /dev/null +++ b/addons/utm/static/src/scss/utm_views.scss @@ -0,0 +1,27 @@ +.o_kanban_view.o_utm_kanban { + .o_kanban_group { + padding: 0 ($grid-gutter-width * .25) $grid-gutter-width; + + &:not(.o_column_folded) { + width: 380px; + } + } + + #o_utm_actions { + margin: 0 ($o-kanban-dashboard-hpadding * -.5); + + > a { + border-color: rgba($border-color, .5); + padding: ($o-kanban-dashboard-hpadding * .25) ($o-kanban-dashboard-hpadding * .5); + white-space: nowrap; + } + + > :first-child { + border-left: 0; + } + + > :last-child { + border-right: 0; + } + } +} diff --git a/addons/utm/views/assets.xml b/addons/utm/views/assets.xml new file mode 100644 index 00000000000..c104d7b39ab --- /dev/null +++ b/addons/utm/views/assets.xml @@ -0,0 +1,8 @@ + + + + diff --git a/addons/utm/views/utm_campaign_views.xml b/addons/utm/views/utm_campaign_views.xml index 5f22bc0f92c..79e15ee4cdd 100644 --- a/addons/utm/views/utm_campaign_views.xml +++ b/addons/utm/views/utm_campaign_views.xml @@ -58,13 +58,13 @@ utm.campaign.view.kanban utm.campaign - + -