diff options
| author | Csaba Fazekas <csabafazekasster@gmail.com> | 2016-06-22 10:55:33 +0200 |
|---|---|---|
| committer | Martin Geubelle <mge@odoo.com> | 2016-08-22 13:48:49 +0200 |
| commit | 1ede17978b14782a2dc9730b7face2ffbb4c7561 (patch) | |
| tree | 1e353b147656ab4447beecc8ae9d641ab1086a88 /addons/website_crm/static | |
| parent | b94ddcbd70750d6232e381c89f210b5b56735085 (diff) | |
[IMP] website: improve dashboard design
Diffstat (limited to 'addons/website_crm/static')
| -rw-r--r-- | addons/website_crm/static/src/js/website_crm_backend.js | 4 | ||||
| -rw-r--r-- | addons/website_crm/static/src/xml/website_crm_dashboard.xml | 29 |
2 files changed, 15 insertions, 18 deletions
diff --git a/addons/website_crm/static/src/js/website_crm_backend.js b/addons/website_crm/static/src/js/website_crm_backend.js index 88546a395db..cc860c5c673 100644 --- a/addons/website_crm/static/src/js/website_crm_backend.js +++ b/addons/website_crm/static/src/js/website_crm_backend.js @@ -45,8 +45,8 @@ WebsiteBackend.include({ return this._super().then(function() { var leads = self.dashboards_data.leads.leads; if (leads && leads.length) { - self.lead_fields = Object.keys(self.dashboards_data.leads.leads[0]); - self.lead_field = self.lead_fields[0]; + self.lead_fields = self.dashboards_data.leads.lead_fields; + self.lead_field = Object.keys(self.lead_fields)[0]; self.compute_percentages(); } }); diff --git a/addons/website_crm/static/src/xml/website_crm_dashboard.xml b/addons/website_crm/static/src/xml/website_crm_dashboard.xml index a47c74172e0..ff3814affd6 100644 --- a/addons/website_crm/static/src/xml/website_crm_dashboard.xml +++ b/addons/website_crm/static/src/xml/website_crm_dashboard.xml @@ -4,26 +4,23 @@ <t t-name="website_crm.dashboard_leads"> <div class="row o_dashboard_leads"> <div class="col-xs-12 o_box"> - <h2>Lead Acquisition</h2> + <div class="col-md-6 col-xs-12"> + <h2>Leads Acquisition / <t t-esc="widget.date_range"></t></h2> + <div id="o_graph_leads" class="o_graph" data-type="leads"/> + </div> - <div class="row"> - <div class="col-md-6"> - <div id="o_graph_leads" class="o_graph" data-type="leads"/> + <div class="col-md-6 col-xs-12"> + <h4>Leads Analysis</h4> + <div t-if="!widget.leads_table || !widget.leads_table.length"> + <i>There is no recent lead.</i> </div> - <div class="col-md-6"> - <h4>Leads Analysis</h4> - <div t-if="!widget.leads_table || !widget.leads_table.length"> - <i>There is no recent lead.</i> - </div> - - <div t-if="widget.leads_table && widget.leads_table.length" class="table-responsive"> - <select class="js_field_selection"> - <option t-foreach="widget.lead_fields" t-as="field" t-att-value="field"><t t-esc="field.split('_id')[0]"/></option> - </select> + <div t-if="widget.leads_table && widget.leads_table.length" class="table-responsive"> + <select class="js_field_selection"> + <option t-foreach="widget.lead_fields" t-as="field" t-att-value="field"><t t-esc="widget.lead_fields[field]"/></option> + </select> - <t t-call="website_crm.LeadsTable"/> - </div> + <t t-call="website_crm.LeadsTable"/> </div> </div> </div> |