From de351e4873ca0625c6dc6a00dfe62d5fd911a6fd Mon Sep 17 00:00:00 2001 From: xO-Tx Date: Mon, 1 Mar 2021 09:43:53 +0000 Subject: [PATCH] [IMP] website: add theme loader tips MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The goal of this commit is to add tips when theme is loaded to encourage users to follow the tour (in Edit mode). task-2440450 closes odoo/odoo#67007 X-original-commit: f5f9f336b052ddc4bd327618bad6d2a3284aa3ff Signed-off-by: Quentin Smetz (qsm) Signed-off-by: Jérémy Kersten (jke) --- addons/website/i18n/website.pot | 21 +++++++++++++++++++ .../static/src/js/theme_preview_form.js | 10 +++------ .../src/scss/website.theme_install.scss | 18 +++++++++++++++- .../website/static/src/xml/theme_preview.xml | 9 +++++++- .../views/website_navbar_templates.xml | 9 +++++++- 5 files changed, 57 insertions(+), 10 deletions(-) diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot index 98d336ea5c4..1bccc985a18 100644 --- a/addons/website/i18n/website.pot +++ b/addons/website/i18n/website.pot @@ -1533,6 +1533,13 @@ msgstr "" msgid "Building blocks system" msgstr "" +#. module: website +#. openerp-web +#: code:addons/website/static/src/xml/theme_preview.xml:0 +#, python-format +msgid "Building your website..." +msgstr "" + #. module: website #: model_terms:ir.ui.view,arch_db:website.s_tabs_options #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -6340,6 +6347,13 @@ msgstr "" msgid "Switch Theme" msgstr "" +#. module: website +#. openerp-web +#: code:addons/website/static/src/xml/theme_preview.xml:0 +#, python-format +msgid "TIP: Once loaded, follow the" +msgstr "" + #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar msgid "TRANSLATE" @@ -8291,6 +8305,13 @@ msgstr "" msgid "phone" msgstr "" +#. module: website +#. openerp-web +#: code:addons/website/static/src/xml/theme_preview.xml:0 +#, python-format +msgid "pointer to build the perfect page in 7 steps." +msgstr "" + #. module: website #: model_terms:ir.ui.view,arch_db:website.snippets msgid "pricing" diff --git a/addons/website/static/src/js/theme_preview_form.js b/addons/website/static/src/js/theme_preview_form.js index 2519da77443..aada899b7a1 100644 --- a/addons/website/static/src/js/theme_preview_form.js +++ b/addons/website/static/src/js/theme_preview_form.js @@ -11,13 +11,6 @@ var qweb = core.qweb; * Common code for theme installation/update handler. */ const ThemePreviewControllerCommon = { - /** - * @override - */ - init() { - this._super(...arguments); - this.$loader = $(qweb.render('website.ThemePreview.Loader')); - }, /** * Called to add loading effect and install/pdate the selected theme depending on action. * @@ -26,6 +19,9 @@ const ThemePreviewControllerCommon = { * @param {String} action */ _handleThemeAction(res_id, action) { + this.$loader = $(qweb.render('website.ThemePreview.Loader', { + 'showTips': action !== 'button_refresh_theme', + })); let actionCallback = undefined; this._addLoader(); switch (action) { diff --git a/addons/website/static/src/scss/website.theme_install.scss b/addons/website/static/src/scss/website.theme_install.scss index cfa4a00cbcd..9374275f5b6 100644 --- a/addons/website/static/src/scss/website.theme_install.scss +++ b/addons/website/static/src/scss/website.theme_install.scss @@ -1,11 +1,27 @@ .o_theme_install_loader_container { + padding: 7%; background-color: rgba($o-shadow-color, .9); + font-size: 37px; + font-family: "Montserrat", $font-family-sans-serif; pointer-events: all; + justify-content: space-evenly; // above menu bar z-index: $zindex-modal - 1; + .o_tooltip { + top: auto !important; + bottom: 11px !important; + left: 0 !important; + margin-right: 7px !important; + padding-left: 33px !important; + } + .o_theme_install_loader_tip { + font-size: 0.5em; + @include media-breakpoint-down(md) { + width: 50% !important; + } + } } .o_theme_install_loader { - position: relative; display: inline-block; width: 400px; height: 220px; diff --git a/addons/website/static/src/xml/theme_preview.xml b/addons/website/static/src/xml/theme_preview.xml index 99e50a76f2f..75c07957abe 100644 --- a/addons/website/static/src/xml/theme_preview.xml +++ b/addons/website/static/src/xml/theme_preview.xml @@ -24,8 +24,15 @@ -
+
+ Building your website...
+

+ TIP: Once loaded, follow the + +
pointer to build the perfect page in 7 steps. +

diff --git a/addons/website/views/website_navbar_templates.xml b/addons/website/views/website_navbar_templates.xml index 4176e04e8f9..a4fc8dbd64b 100644 --- a/addons/website/views/website_navbar_templates.xml +++ b/addons/website/views/website_navbar_templates.xml @@ -20,8 +20,15 @@ -
+
+ Building your website...
+

+ TIP: Once loaded, follow the + +
pointer to build the perfect page in 7 steps. +