diff options
| author | rde <rde@odoo.com> | 2017-09-18 15:20:41 +0200 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2017-09-25 10:53:28 +0200 |
| commit | acd0b6da14e520d47df30b13cc0197443dedc696 (patch) | |
| tree | 2e62a8aad12d795319b8ddeb24d59c501dc20530 /addons/website/static/src | |
| parent | 23bf7fc7df6327e480c236ad82520c19f63476d0 (diff) | |
[IMP] website: pageManagement - improvements according to first feedbacks
- labelling and screen redesign (update labels, hide labels, hide fields, ...)
- make UI more mobile friendly (icon biggest, color using less variables,...)
- Page & Redirection menu are for visible only in debug mode
- Add meta noindex for website.page not shown in sitemap
- Add mechanism to be able to edit in backend a broken view
(Needed for - Internal Error 500, css, js file, ...)
- website pagemanager dedicated to website_publisher only
Diffstat (limited to 'addons/website/static/src')
5 files changed, 13 insertions, 18 deletions
diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js index 9a7e38244cf..cfc22c8bbee 100644 --- a/addons/website/static/src/js/menu/content.js +++ b/addons/website/static/src/js/menu/content.js @@ -267,6 +267,8 @@ var MenuEntryDialog = widget.LinkDialog.extend({ this.$('label[for="o_link_dialog_label_input"]').text(_t("Menu Label")); if (this.menu_link_options) { // add menu link option only when adding new menu this.$('#o_link_dialog_label_input').closest('.form-group').after(qweb.render('website.contentMenu.dialog.edit.link_menu_options')); + // remove the label that is automatically added before + this.$('#o_link_dialog_url_input').parent().siblings().html(''); this.$('input[name=link_menu_options]').on('change', function () { self.$('#o_link_dialog_url_input').closest('.form-group').toggle(); }); diff --git a/addons/website/static/src/js/utils.js b/addons/website/static/src/js/utils.js index e7f76376480..b00192c87d9 100644 --- a/addons/website/static/src/js/utils.js +++ b/addons/website/static/src/js/utils.js @@ -25,12 +25,7 @@ function autocompleteWithPages(self, $input) { }, }).then(function (exists) { var rs = _.map(exists, function (r) { - if (show_only_website_page_model) { - return r.loc + ' (' + r.name + ')'; - } - else { - return r.loc; - } + return r.loc; }); response(rs); }); diff --git a/addons/website/static/src/less/website.ui.components.less b/addons/website/static/src/less/website.ui.components.less index c1381f09e99..7f85829460a 100644 --- a/addons/website/static/src/less/website.ui.components.less +++ b/addons/website/static/src/less/website.ui.components.less @@ -454,7 +454,7 @@ body .modal { // Pages Management .o_page_management_info .o_switch{ - padding-top:7px; + padding-top: 7px; } #edit_website_pages{ .fa-check{ @@ -464,18 +464,16 @@ body .modal { color: #00a09d; } th{ - background-color: #875A7B; + background-color: @odoo-brand-primary; color: white; - opacity:0.8; } td{ a.fa{ - color:#875A7B; - opacity:0.8; - margin-left:5px; + color: @odoo-brand-primary; + margin-left: 5px; } .text-muted{ - opacity:0.5; + opacity: 0.5; } } }
\ No newline at end of file diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml index a5b7590ba53..82746308701 100644 --- a/addons/website/static/src/xml/website.contentMenu.xml +++ b/addons/website/static/src/xml/website.contentMenu.xml @@ -58,7 +58,7 @@ <label class="checkbox-inline" for="new_page"><input type="radio" name="link_menu_options" id="new_page" value="new_page" checked="checked"/>New Page</label> </div> <div class="radio"> - <label class="checkbox-inline" for="url"><input type="radio" name="link_menu_options" id="url" value="url" />URL or Email</label> + <label class="checkbox-inline" for="url"><input type="radio" name="link_menu_options" id="url" value="url" />Existing Page, URL or Email</label> </div> </div> </div> diff --git a/addons/website/static/src/xml/website.pageProperties.xml b/addons/website/static/src/xml/website.pageProperties.xml index f21b0213f4e..b7b3b337d91 100644 --- a/addons/website/static/src/xml/website.pageProperties.xml +++ b/addons/website/static/src/xml/website.pageProperties.xml @@ -15,7 +15,7 @@ </div> </div> <div class="form-group"> - <label class="control-label col-sm-3" for="page_url">Page Url</label> + <label class="control-label col-sm-3" for="page_url">Page URL</label> <div class="col-sm-9"> <div class="input-group"> <span class="input-group-addon" t-att-title="widget.serverUrl"><small><t t-esc="widget.serverUrlTrunc" /></small></span> @@ -24,7 +24,7 @@ </div> </div> <div class="form-group ask_for_redirect"> - <label class="control-label col-sm-3" for="is_homepage">Redirect old url</label> + <label class="control-label col-sm-3" for="is_homepage">Redirect Old URL</label> <div class="col-sm-2"> <a> <label class="o_switch" for="create_redirect" > @@ -48,7 +48,7 @@ </div> <div id="advances_page_info" class="tab-pane fade"> <div class="form-group"> - <label class="control-label col-sm-3" for="is_menu">Show in top menu</label> + <label class="control-label col-sm-3" for="is_menu">Show in Top Menu</label> <div class="col-sm-2"> <a> <label class="o_switch" for="is_menu" > @@ -59,7 +59,7 @@ </div> </div> <div class="form-group"> - <label class="control-label col-sm-3" for="is_homepage">Use as homepage</label> + <label class="control-label col-sm-3" for="is_homepage">Use as Homepage</label> <div class="col-sm-2"> <a> <label class="o_switch" for="is_homepage" > |
