From 72e0f8a0562c7540d15b0a233fa0032c4ff0cfed Mon Sep 17 00:00:00 2001 From: stefanorigano Date: Wed, 21 Jun 2017 14:10:55 +0200 Subject: [PATCH] [IMP] website: fix design of 'Edit Menu' modals --- .../website/static/src/js/website.contentMenu.js | 5 ++++- .../static/src/less/website.ui.components.less | 15 +++++++++++++++ .../static/src/xml/website.contentMenu.xml | 14 ++++++-------- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/website.contentMenu.js index 3a9a5cbe3b9..70f35871e74 100644 --- a/addons/website/static/src/js/website.contentMenu.js +++ b/addons/website/static/src/js/website.contentMenu.js @@ -204,7 +204,8 @@ var EditMenuDialog = widget.Dialog.extend({ this.flat = this.flatenize(menu); this.to_delete = []; this._super(parent, _.extend({}, { - title: _t("Edit Menu") + title: _t("Edit Menu"), + size: 'medium', }, options || {})); }, start: function () { @@ -332,6 +333,8 @@ var MenuEntryDialog = widget.LinkDialog.extend({ self.$('#o_link_dialog_url_input').closest('.form-group').toggle(); }); } + this.$modal.find('.modal-lg').removeClass('modal-lg') + .find('.col-md-8').removeClass('col-md-8').addClass('col-xs-12'); return this._super.apply(this, arguments); }, diff --git a/addons/website/static/src/less/website.ui.components.less b/addons/website/static/src/less/website.ui.components.less index d437233e4e7..c5f7a793f11 100644 --- a/addons/website/static/src/less/website.ui.components.less +++ b/addons/website/static/src/less/website.ui.components.less @@ -221,6 +221,21 @@ body .modal { } } + // TOP MENU EDITOR + .oe_menu_editor { + ul { + padding-left: 37px; + } + + li { + margin-top: -1px; + + .input-group-addon { + border-radius: 0; + } + } + } + // SEO CONFIGURATION &.oe_seo_configuration { #language-box { diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml index fa822226b07..d7fa51e1ad8 100644 --- a/addons/website/static/src/xml/website.contentMenu.xml +++ b/addons/website/static/src/xml/website.contentMenu.xml @@ -40,15 +40,13 @@ -
-
+
+ Drag a menu to the right to create a sub-menu -
-
- - Add Menu Entry - -
+
+ + Add Menu Entry +