diff --git a/addons/web_editor/static/src/scss/web_editor.common.scss b/addons/web_editor/static/src/scss/web_editor.common.scss index 6d84b6ed568..d04dada823f 100644 --- a/addons/web_editor/static/src/scss/web_editor.common.scss +++ b/addons/web_editor/static/src/scss/web_editor.common.scss @@ -545,11 +545,11 @@ a.o_underline { // modal select media .o_technical_modal.o_web_editor_dialog { // see template 'web_editor.FieldTextHtml.fullscreen' - z-index: 2001; + z-index: $o-we-technical-modal-zindex; > .o_select_media_dialog { max-width: inherit !important; - z-index: 2001; + z-index: $o-we-technical-modal-zindex; .modal-dialog, .model-content { height: 100%; diff --git a/addons/web_editor/static/src/scss/web_editor.variables.scss b/addons/web_editor/static/src/scss/web_editor.variables.scss index fd8b053e6aa..109f008fd9c 100644 --- a/addons/web_editor/static/src/scss/web_editor.variables.scss +++ b/addons/web_editor/static/src/scss/web_editor.variables.scss @@ -187,6 +187,8 @@ $o-we-sidebar-content-field-toggle-control-height: $o-we-sidebar-content-field-t $o-we-sidebar-content-field-toggle-control-bg: $o-we-fg-lighter !default; $o-we-sidebar-content-field-toggle-control-shadow: 0 2px 3px 0 $o-we-bg-darkest !default; +$o-we-technical-modal-zindex: 2001; + //------------------------------------------------------------------------------ // Preview component Mixins //------------------------------------------------------------------------------ diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js index 7a8a4967a4b..b721250c978 100644 --- a/addons/website/static/src/js/menu/content.js +++ b/addons/website/static/src/js/menu/content.js @@ -132,8 +132,20 @@ var PagePropertiesDialog = weWidgets.Dialog.extend({ }); dep_text = dep_text.join(', '); self.$('#dependencies_redirect').html(qweb.render('website.show_page_dependencies', { dependencies: dependencies, dep_text: dep_text })); - self.$('#dependencies_redirect [data-toggle="popover"]').popover({ - container: 'body', + self.$('a.o_dependencies_redirect_link').on('click', () => { + self.$('.o_dependencies_redirect_list_popover').popover({ + html: true, + title: _t('Dependencies'), + boundary: 'viewport', + placement: 'right', + trigger: 'focus', + content: () => { + return qweb.render('website.get_tooltip_dependencies', { + dependencies: dependencies, + }); + }, + template: qweb.render('website.page_dependencies_popover'), + }).popover('toggle'); }); })); diff --git a/addons/website/static/src/scss/website.ui.scss b/addons/website/static/src/scss/website.ui.scss index 5336b7ef0aa..4031b67311d 100644 --- a/addons/website/static/src/scss/website.ui.scss +++ b/addons/website/static/src/scss/website.ui.scss @@ -555,3 +555,15 @@ body .modal { } } } + +// Page Properties +.o_redirect_old_url { + @include media-breakpoint-down(sm) { + // Because o_technical_modal class class has a higher z-index than $zindex-modal. + z-index: $o-we-technical-modal-zindex + ($zindex-popover - $zindex-modal); + } + .popover-body { + overflow-y: auto; + max-height: 14.2rem; + } +} diff --git a/addons/website/static/src/xml/website.pageProperties.xml b/addons/website/static/src/xml/website.pageProperties.xml index 5afdbb5f121..292e06f06f5 100644 --- a/addons/website/static/src/xml/website.pageProperties.xml +++ b/addons/website/static/src/xml/website.pageProperties.xml @@ -33,7 +33,14 @@ - (could be used in ) + (could be used in ) + + +