diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-09 15:44:05 +0000 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-09 15:56:53 +0000 |
| commit | 8aa8548d8ab68feb13f3bde51c557db84877e809 (patch) | |
| tree | 930790c1c84a4412db777986f6b2077808560d95 /addons/website/static/src | |
| parent | 55a48e341580a6a400c36b6ba0d7b12ff9997f12 (diff) | |
| parent | 3e4138deaa23b3631dc3fce33cd6d1b3be28ffbd (diff) | |
[MERGE] forward port branch 12.0 up to 3e4138deaa2
closes odoo/odoo#30045
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/menu/seo.js | 2 | ||||
| -rw-r--r-- | addons/website/static/src/scss/website.scss | 5 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.seo.xml | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/addons/website/static/src/js/menu/seo.js b/addons/website/static/src/js/menu/seo.js index 899d3b8746d..a0a2d0f6b60 100644 --- a/addons/website/static/src/js/menu/seo.js +++ b/addons/website/static/src/js/menu/seo.js @@ -764,7 +764,7 @@ var SeoConfigurator = Dialog.extend({ if (!obj) { return $.Deferred().reject(); } else { - return rpc.query({ + return this._rpc({ model: obj.model, method: 'write', args: [[obj.id], data], diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index eb350d658ce..e1c7bff9750 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -1070,3 +1070,8 @@ table.table_desc tr td { @each $media, $color in $o-social-colors { @include text-emphasis-variant(".text-#{$media}", $color); } + +// TODO: Will be handled properly in master/saas-12.2, temp fix for website_event.registration_attendee_details +.modal-footer > .float-left { + margin-right: auto; +} diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml index 7dc54f7cfc5..bf2de26d4ce 100644 --- a/addons/website/static/src/xml/website.seo.xml +++ b/addons/website/static/src/xml/website.seo.xml @@ -90,7 +90,7 @@ <div class="form-inline" role="form"> <div class="input-group"> <input type="text" name="website_meta_keywords" id="website_meta_keywords" class="form-control" placeholder="Keyword" maxlength="30"/> - <span class="input-group-append"> + <span title="The language of the keyword and related keywords." class="input-group-append"> <select name="seo_page_language" id="language-box" class="btn form-control"/> </span> <span class="input-group-append"> |