From f84bbda2218793d0f0de74466cf41e2029508be8 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Wed, 15 Jul 2015 11:26:07 +0200 Subject: [PATCH 1/8] [FIX] website: fix snippet comparisons --- addons/website/static/src/css/snippets.css | 5 +++++ addons/website/static/src/css/snippets.sass | 7 ++++++- addons/website/views/snippets.xml | 6 +++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css index 4c219f7dda8..efaa275bd4c 100644 --- a/addons/website/static/src/css/snippets.css +++ b/addons/website/static/src/css/snippets.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; /* ---- SNIPPET EDITOR ---- {{{ */ #oe_snippets #o_left_bar, #oe_snippets #o_arrow { position: fixed; @@ -870,3 +871,7 @@ table.table_desc tr td:last-child { .s_features_grid { margin-bottom: 16px; } + +.s_comparisons .panel .list-group-item:not(.active) { + color: #666; +} diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass index 62a3040c19c..0753aefb226 100644 --- a/addons/website/static/src/css/snippets.sass +++ b/addons/website/static/src/css/snippets.sass @@ -81,7 +81,7 @@ .oe_snippet display: inline-block vertical-align: top - width: 93px + width: 92px margin-left: 3px margin-right: 3px margin-top: 1px @@ -701,3 +701,8 @@ table.table_desc tr td .s_features_grid margin-bottom: 16px + +.s_comparisons + .panel + .list-group-item:not(.active) + color: #666 diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index 1414335ea99..8dda4f64fdd 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -350,7 +350,7 @@
-
+
@@ -379,7 +379,7 @@
-
+
@@ -408,7 +408,7 @@
-
+
From c1d290d69977a7d5ec5261898022098646deda86 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Wed, 15 Jul 2015 11:26:38 +0200 Subject: [PATCH 2/8] [FIX] website: fix snippet references --- addons/website/static/src/css/snippets.css | 5 ++++ addons/website/static/src/css/snippets.sass | 7 ++++++ addons/website/views/snippets.xml | 27 ++++++++++++--------- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css index efaa275bd4c..6f7ec863677 100644 --- a/addons/website/static/src/css/snippets.css +++ b/addons/website/static/src/css/snippets.css @@ -872,6 +872,11 @@ table.table_desc tr td:last-child { margin-bottom: 16px; } +/* other snippet styles */ .s_comparisons .panel .list-group-item:not(.active) { color: #666; } + +.s_references .img-thumbnail { + border: none; +} diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass index 0753aefb226..7e33c14fd44 100644 --- a/addons/website/static/src/css/snippets.sass +++ b/addons/website/static/src/css/snippets.sass @@ -702,7 +702,14 @@ table.table_desc tr td .s_features_grid margin-bottom: 16px + +/* other snippet styles */ + .s_comparisons .panel .list-group-item:not(.active) color: #666 + +.s_references + .img-thumbnail + border: none diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index 8dda4f64fdd..97a5bc91868 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -519,7 +519,7 @@ More than 500 happy customers.
-
+

Write a quote here from one of your customers. Quotes are a @@ -528,7 +528,7 @@ Author of this quote

-
+

Odoo provides essential platform for our project management. @@ -537,20 +537,23 @@ John Doe, CEO

-
- OpenERP logo +
+ Logo
-
- OpenERP logo +
+ Logo
-
- OpenERP logo +
+ Logo
-
- OpenERP logo +
+ Logo
-
- OpenERP logo +
+ Logo +
+
+ Logo
From 4a1986b341415c34bcda466170952691f449288d Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Wed, 15 Jul 2015 11:27:39 +0200 Subject: [PATCH 3/8] [FIX] website: allow change banner once custom img has been selected --- addons/website/static/src/js/website.snippets.editor.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index e760e7abefc..b622cfa9aa0 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -1067,6 +1067,10 @@ this.$bg.removeClass("oe_img_bg").removeClass("oe_custom_bg"); } }, + select_class : function(type, value, $li) { + this.background(type, '', $li); + this._super(type, value, $li); + }, choose_image: function(type, value, $li) { if(type !== "click") return; From de5515ab454bf139849a2993479ba59dea5823ee Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 16 Jul 2015 16:44:31 +0200 Subject: [PATCH 4/8] [FIX] website: editor don't save content if change only the background color --- addons/website/static/src/js/website.snippets.editor.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index b622cfa9aa0..139e77a2e95 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -1162,6 +1162,7 @@ .click(function () { $td.removeClass("selected"); $(this).parent().addClass("selected"); + self.$target.closest(".o_editable").trigger("content_changed"); }); } }); From a74601d9015c89bfa7b51239ec8a9408f96cebf0 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 16 Jul 2015 16:47:24 +0200 Subject: [PATCH 5/8] [FIX] website: wrong undo step if insert a table --- addons/website/static/src/js/summernote.js | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/addons/website/static/src/js/summernote.js b/addons/website/static/src/js/summernote.js index 70678e58014..d57110cd332 100644 --- a/addons/website/static/src/js/summernote.js +++ b/addons/website/static/src/js/summernote.js @@ -920,19 +920,21 @@ define(['summernote/editing/Editor', 'summernote/summernote'], function (Editor) options.keyMap.mac['ESCAPE'] = 'cancel'; $.summernote.pluginEvents.insertTable = function (event, editor, layoutInfo, sDim) { - var $editable = layoutInfo.editable(); - var dimension = sDim.split('x'); - var rng = range.create(); - rng = rng.deleteContents(); + var $editable = layoutInfo.editable(); + $editable.data('NoteHistory').recordUndo($editable, 'enter'); - var isBodyContainer = dom.isBodyContainer; - dom.isBodyContainer = dom.isNotBreakable; - rng.insertNode(editor.table.createTable(dimension[0], dimension[1])); - dom.isBodyContainer = isBodyContainer; + var dimension = sDim.split('x'); + var rng = range.create(); + rng = rng.deleteContents(); - editor.afterCommand($editable); - event.preventDefault(); - return false; + var isBodyContainer = dom.isBodyContainer; + dom.isBodyContainer = dom.isNotBreakable; + rng.insertNode(editor.table.createTable(dimension[0], dimension[1])); + dom.isBodyContainer = isBodyContainer; + + editor.afterCommand($editable); + event.preventDefault(); + return false; }; $.summernote.pluginEvents.tab = function (event, editor, layoutInfo, outdent) { var $editable = layoutInfo.editable(); From fe7007450680d1fd96cf9d2cd890ea3b54726de8 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 16 Jul 2015 17:03:54 +0200 Subject: [PATCH 6/8] [FIX] ir_qweb: template error because search method return an id list --- openerp/addons/base/ir/ir_qweb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py index a3a80de0893..324f39a79f6 100644 --- a/openerp/addons/base/ir/ir_qweb.py +++ b/openerp/addons/base/ir/ir_qweb.py @@ -1559,7 +1559,7 @@ class PreprocessedCSS(StylesheetAsset): datas = self.content.encode('utf8').encode('base64') if ira_id: # TODO: update only if needed - ira.write(self.cr, openerp.SUPERUSER_ID, [ira_id], {'datas': datas}, + ira.write(self.cr, openerp.SUPERUSER_ID, ira_id, {'datas': datas}, context=self.context) else: ira.create(self.cr, openerp.SUPERUSER_ID, dict( From f52c6bfaebb1180413efad16e0955655e895df25 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Thu, 16 Jul 2015 17:28:05 +0200 Subject: [PATCH 7/8] [FIX] website: editor: when create a link, the saved range is obsolete, and when the user click on an other option the range selection fail --- addons/website/static/src/js/website.editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 2f187ad5bf9..66ca8d9cb48 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -366,9 +366,9 @@ define(['summernote/summernote'], function () { var def = new $.Deferred(); editor.on("save", this, function (linkInfo) { - linkInfo.range.select(); $editable.data('range', linkInfo.range); def.resolve(linkInfo); + $editable.data('range', range.create()); $('.note-popover .note-link-popover').show(); }); editor.on("cancel", this, function () { From 9687a579f42114d06b6e79719c9ec1fe193783ef Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 17 Jul 2015 11:59:27 +0200 Subject: [PATCH 8/8] [FIX] website: media editor don't manage the font awsome alias --- .../website/static/src/js/website.editor.js | 71 +++++++++++-------- .../website/static/src/xml/website.editor.xml | 8 ++- .../static/src/js/website_email_designer.js | 2 +- 3 files changed, 48 insertions(+), 33 deletions(-) diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 66ca8d9cb48..a1cfb7a2e38 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -410,7 +410,7 @@ define(['summernote/summernote'], function () { if (node && (nodeName === "SPAN" || nodeName === "I") && className.length) { var classNames = className.split(/\s+/); for (var k=0; k - + diff --git a/addons/website_mail/static/src/js/website_email_designer.js b/addons/website_mail/static/src/js/website_email_designer.js index 4bc778c2130..51ec4d5b017 100644 --- a/addons/website_mail/static/src/js/website_email_designer.js +++ b/addons/website_mail/static/src/js/website_email_designer.js @@ -326,7 +326,7 @@ var content; _.find(website.editor.fontIcons, function (font) { return _.find(website.editor.getCssSelectors(font.parser), function (css) { - if ($font.is(css[0].replace(/::?before$/, ''))) { + if ($font.is(css[2])) { content = css[1].match(/content:\s*['"](.)['"]/)[1]; return true; }