From 4e162a4e7559491af651ab8da197fb16a5212bb0 Mon Sep 17 00:00:00 2001 From: Bhavita Bhatt Date: Mon, 16 Dec 2019 10:42:04 +0000 Subject: [IMP] website, website_link: improve frontend config screens Following things are done in this commit: 1. changed some labeling and string for more readable and helpful to the user 2. added extra width to the text box 3. added publish/unpublish option for mobile view. 4. track page option auto-activated for any new page,event,job offer,course, blog. task-2088546 closes #40085 Co-authored-by: jpr-odoo --- addons/website/static/src/js/menu/new_content.js | 9 +++++++-- addons/website/static/src/scss/website.ui.scss | 2 +- addons/website/static/src/xml/track_page.xml | 2 +- addons/website/static/src/xml/website.xml | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) (limited to 'addons/website/static/src') diff --git a/addons/website/static/src/js/menu/new_content.js b/addons/website/static/src/js/menu/new_content.js index 50d46e81221..918a840561d 100644 --- a/addons/website/static/src/js/menu/new_content.js +++ b/addons/website/static/src/js/menu/new_content.js @@ -267,7 +267,10 @@ var NewContentMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({ }).last(); if ($finalPosition) { $el.fadeTo(400, 0, function () { - $el.insertAfter($finalPosition); + // if once installed, button disapeear, don't need to move it. + if (!$el.hasClass('o_new_content_element_once')) { + $el.insertAfter($finalPosition); + } // change style to use spinner $i.removeClass() .addClass('fa fa-spin fa-spinner fa-pulse'); @@ -278,7 +281,9 @@ var NewContentMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({ } self._install(moduleId).then(function () { - window.location.href = window.location.origin + window.location.pathname + '?' + enableFlag; + var origin = window.location.origin; + var redirectURL = $el.find('a').data('url') || (window.location.pathname + '?' + enableFlag); + window.location.href = origin + redirectURL; }, function () { $i.removeClass() .addClass('fa fa-exclamation-triangle'); diff --git a/addons/website/static/src/scss/website.ui.scss b/addons/website/static/src/scss/website.ui.scss index 0027d792093..8ac07bc6ade 100644 --- a/addons/website/static/src/scss/website.ui.scss +++ b/addons/website/static/src/scss/website.ui.scss @@ -245,7 +245,7 @@ body .modal { transition: 200ms; display: inline-block; padding: 23px 27px; - border: 2px dashed lighten(gray('600'), 30%); + border: 3px dashed lighten(gray('700'), 30%); vertical-align: top; cursor: pointer; color: lighten(gray('600'), 30%); diff --git a/addons/website/static/src/xml/track_page.xml b/addons/website/static/src/xml/track_page.xml index 11311156ca7..2d4093dc0d2 100644 --- a/addons/website/static/src/xml/track_page.xml +++ b/addons/website/static/src/xml/track_page.xml @@ -7,7 +7,7 @@ diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index 61528303768..d4193d7cbc2 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -11,10 +11,10 @@
-