diff --git a/addons/website/static/src/css/snippets.css b/addons/website/static/src/css/snippets.css index a873e3d6fec..f787a10003f 100644 --- a/addons/website/static/src/css/snippets.css +++ b/addons/website/static/src/css/snippets.css @@ -795,3 +795,20 @@ table.table_desc tr td:last-child{ .oe_snippet.o_block_quotes_slider .oe_snippet_thumbnail_img { background-image: url("/website/static/src/img/blocks/block_quotes_slider.png"); } + +/* Blog Demo Snippet */ +.oe_snippet.o_block_demo_blog .oe_snippet_thumbnail_img { + background-image: url("/website/static/src/img/blocks/block_demo_blog.jpg"); +} + +.oe_demo_blog .oe_blog_demo_content { + height: 200px; + width: 400px; + padding: 5px; + margin-bottom: 30px; + float: right; +} +.oe_demo_blog .oe_blog_demo_img { + width: 100%; + height: 180px; +} diff --git a/addons/website/static/src/css/snippets.sass b/addons/website/static/src/css/snippets.sass index 2dd267b1bc3..1a6004b83c2 100644 --- a/addons/website/static/src/css/snippets.sass +++ b/addons/website/static/src/css/snippets.sass @@ -636,3 +636,18 @@ table.table_desc tr td &.o_block_quotes_slider .oe_snippet_thumbnail_img background-image: url('/website/static/src/img/blocks/block_quotes_slider.png') // }}} + +/* Blog Demo Snippet */ +.oe_snippet.o_block_demo_blog .oe_snippet_thumbnail_img + background-image: url("/website/static/src/img/blocks/block_demo_blog.jpg") + +.oe_demo_blog + .oe_blog_demo_content + height: 200px + width: 400px + padding: 5px + margin-bottom: 30px + float: right + .oe_blog_demo_img + width: 100% + height: 180px diff --git a/addons/website/static/src/img/blocks/block_demo_blog.jpg b/addons/website/static/src/img/blocks/block_demo_blog.jpg new file mode 100644 index 00000000000..84677462c2f Binary files /dev/null and b/addons/website/static/src/img/blocks/block_demo_blog.jpg differ diff --git a/addons/website/static/src/img/odoo.jpg b/addons/website/static/src/img/odoo.jpg new file mode 100644 index 00000000000..e9c5ac231b1 Binary files /dev/null and b/addons/website/static/src/img/odoo.jpg differ diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index eeb8261217c..85c37a1484d 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -1517,6 +1517,26 @@ }, }); + website.snippet.options.demo_blog = website.snippet.Option.extend({ + set_active: function () { + var classes = _.uniq((this.$target.find('.oe_blog_demo_content').attr("class") || '').split(/\s+/)); + this.$el.find('[data-select_class]') + .add(this.$el) + .filter('[data-select_class]') + .removeClass("active") + .filter('[data-select_class="' + classes.join('"], [data-select_class="') + '"]') + .addClass("active"); + }, + select_class: function (type, value, $li) { + var $lis = this.$el.find('[data-select_class]').add(this.$el).filter('[data-select_class]'); + + var classes = $lis.map(function () {return $(this).data('select_class');}).get(); + var $img = this.$target.find('.oe_blog_demo_content'); + $img.removeClass(classes.join(" ")); + if(value) $img.addClass(value); + }, + }); + website.snippet.Editor = openerp.Class.extend({ init: function (BuildingBlock, dom) { this.BuildingBlock = BuildingBlock; diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index 4f0b5b7da8c..c05f0bdf4a2 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -328,6 +328,32 @@ +
+
+ + What a day it was yesterday - such a big day for us! + In case you still feel a bit puzzled about all + of our yesterday's announcements, here is a little + summary for you. We have decided to change the + name because "OpenERP" didn't reflect the offering + of the company anymore. With our newest apps, such + as Website Builder, PoS or eCommerce, we have + moved beyond the ERP territory. But don't worry, + Odoo is and always will be fully open source. You can + read more about the new name here.We have also + prepared a short FAQ to explain all these changes to all of you. +
+