diff options
| author | Benjamin Vray <bvr@odoo.com> | 2020-07-28 06:52:26 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2020-08-14 17:40:58 +0000 |
| commit | 745ef9de97544d5c1a97e03be67e903feca40c2a (patch) | |
| tree | 39642f2c442f057a5630663b323a6b4f9a823ef5 /addons/website/static | |
| parent | 704bcc552709f3b1e024f4a7aa83743f982fd5df (diff) | |
[IMP] website, web, portal: new options language selector in footer
Add an option to display the language selection inline or with a
dropdown. Add an option to choose if language labels are flags, text
or both.
Part of https://github.com/odoo/odoo/pull/55300
task-2203383
Co-authored-by: qsm-odoo <qsm@odoo.com>
Diffstat (limited to 'addons/website/static')
| -rw-r--r-- | addons/website/static/src/js/content/website_root.js | 4 | ||||
| -rw-r--r-- | addons/website/static/src/scss/website.edit_mode.scss | 4 | ||||
| -rw-r--r-- | addons/website/static/src/scss/website.scss | 11 |
3 files changed, 15 insertions, 4 deletions
diff --git a/addons/website/static/src/js/content/website_root.js b/addons/website/static/src/js/content/website_root.js index 91581d6293f..b4c65ca11b3 100644 --- a/addons/website/static/src/js/content/website_root.js +++ b/addons/website/static/src/js/content/website_root.js @@ -42,7 +42,7 @@ var WebsiteRoot = publicRootData.PublicRoot.extend(KeyboardNavigationMixin, { KeyboardNavigationMixin.start.call(this); // Compatibility lang change ? if (!this.$('.js_change_lang').length) { - var $links = this.$('ul.js_language_selector li a:not([data-oe-id])'); + var $links = this.$('.js_language_selector a:not([data-oe-id])'); var m = $(_.min($links, function (l) { return $(l).attr('href').length; })).attr('href'); @@ -216,7 +216,7 @@ var WebsiteRoot = publicRootData.PublicRoot.extend(KeyboardNavigationMixin, { _onLangChangeClick: function (ev) { ev.preventDefault(); - var $target = $(ev.target); + var $target = $(ev.currentTarget); // retrieve the hash before the redirect var redirect = { lang: $target.data('url_code'), diff --git a/addons/website/static/src/scss/website.edit_mode.scss b/addons/website/static/src/scss/website.edit_mode.scss index dee840dded8..e0a80129113 100644 --- a/addons/website/static/src/scss/website.edit_mode.scss +++ b/addons/website/static/src/scss/website.edit_mode.scss @@ -133,8 +133,8 @@ table.editorbar-panel { } } -.editor_enable .js_language_selector { - display: none; +.editor_enable .o_add_language { + display: none !important; } // Facebook Page diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index 088ebb12b0e..8140943c9c9 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -864,6 +864,17 @@ header { } } +// Language selector +.js_language_selector .dropdown-menu { + min-width: 0; +} +.o_lang_flag { + width: 1.5em; + height: 1.5em; + margin-right: 0.2em; + border-radius: $rounded-pill; +} + // Figure with special style .o_figure_relative_layout { position: relative; |
