diff options
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/menu/new_content.js | 9 | ||||
| -rw-r--r-- | addons/website/static/src/scss/website.ui.scss | 2 | ||||
| -rw-r--r-- | addons/website/static/src/xml/track_page.xml | 2 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.xml | 4 |
4 files changed, 11 insertions, 6 deletions
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 @@ <label class="o_switch" for="switch-track-page"> <input id="switch-track-page" type="checkbox"/> <span/> - Track visitor + Track Visitor </label> </a> </t> 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 @@ <main class="modal-body"> <form role="form" t-att-id="id"> <div class="form-group row mb0"> - <label for="page-name" class="col-md-4 col-form-label"> + <label for="page-name" class="col-md-3 col-form-label"> <t t-esc="field_name"/>: </label> - <div class="col-md-8"> + <div class="col-md-9"> <input t-if="field_type == 'input'" type="text" class="form-control" required="required"/> <textarea t-if="field_type == 'textarea'" class="form-control" required="required" rows="5"></textarea> <select t-if="field_type == 'select'" class="form-control"></select> |