diff --git a/addons/web_editor/static/src/js/tour.rte.js b/addons/web_editor/static/src/js/tour.rte.js index 9094e64531f..c940c40c221 100644 --- a/addons/web_editor/static/src/js/tour.rte.js +++ b/addons/web_editor/static/src/js/tour.rte.js @@ -166,16 +166,16 @@ odoo.define('web_editor.tour', function (require) { extra_trigger: '#editable_area > section .row > div:first span.fa.pull-right', }, { content: "click on color style", - trigger: '.o-link-color-selector > .o-link-color.btn-success', + trigger: '.o_link_dialog_color > .o_link_dialog_color_item.btn-success', extra_trigger: 'a#link-preview:containsRegex(/^]+><\\/span>$/) > span.fa.fa-3x.pull-right', }, { content: "insert a link url", - trigger: '#link-external', + trigger: '#o_link_dialog_url_input', extra_trigger: 'a#link-preview.btn', run: "text http://www.odoo.com", }, { content: "change text label", - trigger: '#link-text', + trigger: '#o_link_dialog_label_input', run: "text ABC[IMG] DEF", }, { content: "save link", @@ -191,11 +191,11 @@ odoo.define('web_editor.tour', function (require) { extra_trigger: '#editable_area > section .row > div:first span.fa.pull-right', }, { content: "click on color style again", - trigger: '.o-link-color-selector > .o-link-color.btn-success', + trigger: '.o_link_dialog_color > .o_link_dialog_color_item.btn-success', extra_trigger: 'a#link-preview:containsRegex(/^]+>$/) img', }, { content: "insert an email", - trigger: '#link-external', + trigger: '#o_link_dialog_url_input', extra_trigger: 'a#link-preview.btn', run: "text test@test.test", }, { diff --git a/addons/web_editor/static/src/js/widgets.js b/addons/web_editor/static/src/js/widgets.js index 2baedf8d04b..e5b4c825786 100644 --- a/addons/web_editor/static/src/js/widgets.js +++ b/addons/web_editor/static/src/js/widgets.js @@ -945,7 +945,7 @@ var LinkDialog = Dialog.extend({ 'keyup :input.url': 'onkeyup', 'keyup :input': 'preview', 'click button.remove': 'remove_link', - 'change input#link-text': function (e) { + 'change input#o_link_dialog_label_input': function (e) { this.text = $(e.target).val(); }, 'change .link-style': function (e) { @@ -1041,6 +1041,7 @@ var LinkDialog = Dialog.extend({ start: function () { this.bind_data(); this.$('input.url-source:eq(1)').closest('.list-group-item').addClass('active'); + this.$('#o_link_dialog_label_input').focus(); return this._super.apply(this, arguments); }, get_data: function (test) { @@ -1051,7 +1052,7 @@ var LinkDialog = Dialog.extend({ $e = this.$('input.url-source:first'); } var val = $e.val(); - var label = this.$('#link-text').val() || val; + var label = this.$('#o_link_dialog_label_input').val() || val; if (label && this.data.images) { for(var i=0; i .o_link_dialog_color_item { + position: relative; + width: 30px; + height: 30px; + border: 2px solid rgba(0, 0, 0, 0.25); + border-radius: 50%; + + input:checked + i::before { + content: "\f00c"; + .o-position-absolute(@top: 6px, @left: 5px); + } + + &.btn-link { + padding: 3px 9px; + + > span { + text-decoration: underline; } } } - .o-link-vr{ - border-right: 1px solid @gray-lighter; + .o_link_dialog_preview { + border-left: 1px solid @gray-lighter; } } - } // FIXME bootstrap modal : 1050 diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml index 1e0d7d9aa43..e8fdacc42d3 100644 --- a/addons/web_editor/static/src/xml/editor.xml +++ b/addons/web_editor/static/src/xml/editor.xml @@ -218,58 +218,61 @@ -
+
-
-
-
- -
- -
+ +
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
- -
+
+
+ +
+
-
- -
-
- - - -
-
-
-
-
- +
+
+ +
+
+ + + +
-
-
+
+
+ +
+
+ +
@@ -278,7 +281,7 @@
- +
diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/website.contentMenu.js index 3910825405d..c1c0a44a63e 100644 --- a/addons/website/static/src/js/website.contentMenu.js +++ b/addons/website/static/src/js/website.contentMenu.js @@ -321,23 +321,13 @@ var MenuEntryDialog = widget.LinkDialog.extend({ return this._super.apply(this, arguments); }, start: function () { - var self = this; - - this.$(".link-style").remove(); - this.$("label[for=link-new]").text("Menu Label"); - - return $.when(this._super.apply(this, arguments)).then(function () { - var $link_text = self.$('#link-text').focus(); - self.$('#link-page').change(function (e) { - if ($link_text.val()) { return; } - var data = $(this).select2('data'); - $link_text.val(data.create ? data.id : data.text); - $link_text.focus(); - }); - }); + this.$(".o_link_dialog_preview").remove(); + this.$(".window-new, .link-style").closest(".form-group").remove(); + this.$("label[for='o_link_dialog_label_input']").text(_t("Menu Label")); + return this._super.apply(this, arguments); }, save: function () { - var $e = this.$('#link-text'); + var $e = this.$('#o_link_dialog_label_input'); if (!$e.val() || !$e[0].checkValidity()) { $e.closest('.form-group').addClass('has-error'); $e.focus(); diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 1b302b9ea2a..fb2e03f3aa8 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -112,8 +112,8 @@ website.TopBar.include({ widget.LinkDialog.include({ bind_data: function () { - this.$( "#link-external" ).autocomplete({ - source: function(request, response) { + this.$( "#o_link_dialog_url_input" ).autocomplete({ + source: function (request, response) { return ajax.jsonRpc('/web/dataset/call_kw', 'call', { model: 'website', method: 'search_pages',