diff options
| author | Fabien Meghazi <fme@openerp.com> | 2014-09-17 10:03:33 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-09-17 14:50:12 +0200 |
| commit | 8d08e067584587e9cd06a738258f2771534d6000 (patch) | |
| tree | 320536040c08b5f2cb949bc4250446c7712d861d /addons/website_quote/static/src | |
| parent | 5bfad4dd52cc96ff6a290a69b5f85d7d48ef6c8f (diff) | |
[FIX] Bundlification remains (Fixes #2463)
Diffstat (limited to 'addons/website_quote/static/src')
| -rw-r--r-- | addons/website_quote/static/src/css/website_quotation.css | 22 | ||||
| -rw-r--r-- | addons/website_quote/static/src/js/website_quotation.js | 13 |
2 files changed, 21 insertions, 14 deletions
diff --git a/addons/website_quote/static/src/css/website_quotation.css b/addons/website_quote/static/src/css/website_quotation.css index ecf67140b40..28bcf38efc1 100644 --- a/addons/website_quote/static/src/css/website_quotation.css +++ b/addons/website_quote/static/src/css/website_quotation.css @@ -1,35 +1,35 @@ -.bs-sidebar { +.o_website_quote .bs-sidebar { position: fixed; z-index : 1; background-color: #f7f5fa; border-radius: 5px; } -.bs-sidenav { +.o_website_quote .bs-sidenav { padding-top: 10px; padding-bottom: 10px; } -.bs-sidebar .nav > li > a { +.o_website_quote .bs-sidebar .nav > li > a { display: block; color: #716b7a; padding: 5px 20px; } -.bs-sidebar .nav > .active > a, -.bs-sidebar .nav > .active:hover > a, -.bs-sidebar .nav > .active:focus > a { +.o_website_quote .bs-sidebar .nav > .active > a, +.o_website_quote .bs-sidebar .nav > .active:hover > a, +.o_website_quote .bs-sidebar .nav > .active:focus > a { font-weight: bold; color: #563d7c; background-color: transparent; border-right: 1px solid #563d7c; } -.bs-sidebar .nav .nav { +.o_website_quote .bs-sidebar .nav .nav { display: none; margin-bottom: 8px; } -.bs-sidebar .nav .nav > li > a { +.o_website_quote .bs-sidebar .nav .nav > li > a { padding-top: 3px; padding-bottom: 3px; padding-left: 30px; @@ -37,15 +37,15 @@ } @media (min-width: 992px) { - .bs-sidebar .nav > .active > ul { + .o_website_quote .bs-sidebar .nav > .active > ul { display: block; } - .bs-sidebar { + .o_website_quote .bs-sidebar { width: 213px; } } @media (min-width: 1200px) { - .bs-sidebar { + .o_website_quote .bs-sidebar { width: 263px; } } diff --git a/addons/website_quote/static/src/js/website_quotation.js b/addons/website_quote/static/src/js/website_quotation.js index 1e9203b5df6..37f5e2a9a62 100644 --- a/addons/website_quote/static/src/js/website_quotation.js +++ b/addons/website_quote/static/src/js/website_quotation.js @@ -1,4 +1,9 @@ -$(document).ready(function () { +(function () { +'use strict'; +var website = openerp.website; + +website.if_dom_contains('div.o_website_quote', function () { + $('a.js_update_line_json').on('click', function (ev) { ev.preventDefault(); var $link = $(ev.currentTarget); @@ -61,7 +66,7 @@ $(document).ready(function () { $('#modelaccept').modal('hide'); window.location.href = '/quote/'+order_id[1]+'/'+token+'?message=3'; }); - return false + return false; }); // automatically generate a menu from h1 and h2 tag in content @@ -71,6 +76,7 @@ $(document).ready(function () { var sub_ul = null; $("[id^=quote_header_], [id^=quote_]", $container).attr("id", ""); $("h1, h2", $container).each(function() { + var id; switch (this.tagName.toLowerCase()) { case "h1": id = _.uniqueId('quote_header_'); @@ -90,5 +96,6 @@ $(document).ready(function () { break; } }); - }); + +}()); |
