diff options
| author | Sébastien Theys <seb@odoo.com> | 2018-09-13 15:42:46 +0200 |
|---|---|---|
| committer | Romain Derie <rde@odoo.com> | 2018-09-19 12:00:37 +0200 |
| commit | 6cde21413c6f3bd9e1bcf3094481ffd0c8bc72db (patch) | |
| tree | d61385d4803507234799bf276a632dd67e719bc1 | |
| parent | 4decbcc55c6c468b7572fc8840d344bf1947c42b (diff) | |
[IMP] sale: improve left menu and quotation builder
Adapt the left menu to correctly display each heading on a new line.
Always show the left menu navigation, especially on mobile where it is the most useful to quickly go below.
Remove unnecessary code from the quotation builder template.
PR: #26801
task-1876864
| -rw-r--r-- | addons/sale/static/src/js/sale_portal_sidebar.js | 19 | ||||
| -rw-r--r-- | addons/sale/views/sale_portal_templates.xml | 4 | ||||
| -rw-r--r-- | addons/sale_quotation_builder/views/sale_portal_templates.xml | 11 |
3 files changed, 5 insertions, 29 deletions
diff --git a/addons/sale/static/src/js/sale_portal_sidebar.js b/addons/sale/static/src/js/sale_portal_sidebar.js index eea2f061726..b3b7f85f675 100644 --- a/addons/sale/static/src/js/sale_portal_sidebar.js +++ b/addons/sale/static/src/js/sale_portal_sidebar.js @@ -24,9 +24,6 @@ odoo.define('sale.SalePortalSidebar', function (require) { var PortalSidebar = require('portal.PortalSidebar'); var SalePortalSidebar = PortalSidebar.extend({ - events: { - 'click .o_portal_sale_print': '_onPrintSaleOrder', - }, /** * @override * @param {Object} $watched_selector @@ -97,7 +94,7 @@ var SalePortalSidebar = PortalSidebar.extend({ } if (lastLI) { if (!lastUL) { - lastUL = $("<ul class='nav'>").appendTo(lastLI); + lastUL = $("<ul class='nav flex-column'>").appendTo(lastLI); } $("<li class='nav-item'>").append($('<a class="nav-link" href="#' + id + '"/>').text(text)).appendTo(lastUL); } @@ -126,20 +123,6 @@ var SalePortalSidebar = PortalSidebar.extend({ }); return rawText.join(' '); }, - - //-------------------------------------------------------------------------- - // Handlers - //-------------------------------------------------------------------------- - - /** - * @private - * @param {MouseEvent} ev - */ - _onPrintSaleOrder: function (ev) { - ev.preventDefault(); - var href = $(ev.currentTarget).attr('href'); - this._printIframeContent(href); - }, }); return SalePortalSidebar; diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml index 58b2752430e..bf382905b3f 100644 --- a/addons/sale/views/sale_portal_templates.xml +++ b/addons/sale/views/sale_portal_templates.xml @@ -150,8 +150,8 @@ </div> </li> - <li class="navspy list-group-item pl-0 d-none d-lg-block flex-grow-1" t-ignore="true" role="complementary"> - <ul class="nav flex-column bs-sidenav" data-id="quote_sidebar"></ul> + <li class="navspy list-group-item pl-0 flex-grow-1" t-ignore="true" role="complementary"> + <ul class="nav flex-column bs-sidenav"></ul> </li> <t t-if="not sale_order.is_expired and sale_order.state in ['draft', 'sent']"> diff --git a/addons/sale_quotation_builder/views/sale_portal_templates.xml b/addons/sale_quotation_builder/views/sale_portal_templates.xml index 8a43ab4f1bd..2b68055b954 100644 --- a/addons/sale_quotation_builder/views/sale_portal_templates.xml +++ b/addons/sale_quotation_builder/views/sale_portal_templates.xml @@ -18,17 +18,10 @@ <!-- Template to edit the quotation template with the website editor --> <template id="so_template" name="SO Template"> <t t-call="website.layout"> - <body data-spy="scroll" data-target=".navspy" data-offset="50"> + <body> <div class="container o_sale_order"> <div class="row mt16"> - <div class="col-lg-3 d-print-none"> - <div class="bs-sidebar"> - <div class="navspy" role="complementary" t-ignore="True"> - <ul class="nav bs-sidenav" data-id="quote_sidebar"/> - </div> - </div> - </div> - <div class="col-lg-9"> + <div class="col-lg-9 ml-auto"> <div class="row mb8"> <div t-ignore="true" class="css_editable_mode_hidden offset-lg-11"> <a role="button" class="btn btn-info d-print-none" t-att-href="'/web#return_label=Website&model=%s&id=%s&action=%s&view_type=form' % (template._name, template.id, request.env.ref('sale_management.sale_order_template_action').id)">Back</a> |
