diff --git a/assets/css/src/newsletter_editor/contentBlocks/container.styl b/assets/css/src/newsletter_editor/contentBlocks/container.styl index cc59536c24..77c1527a09 100644 --- a/assets/css/src/newsletter_editor/contentBlocks/container.styl +++ b/assets/css/src/newsletter_editor/contentBlocks/container.styl @@ -52,7 +52,8 @@ $three-column-width = ($newsletter-width / 3) - (2 * $column-margin) width: $column-margin + $one-column-width + $column-margin // More than one column - & > .mailpoet_container_block > .mailpoet_container > .mailpoet_container_block > .mailpoet_container_horizontal + & > .mailpoet_container_block > .mailpoet_container > .mailpoet_container_block > .mailpoet_container_horizontal, + & > .mailpoet_container_block > .mailpoet_container > .mailpoet_posts_block > .mailpoet_posts_container > .mailpoet_container_block > .mailpoet_container > .mailpoet_container_block > .mailpoet_container_horizontal // Column number detection technique found here: // http://stackoverflow.com/questions/8720931/can-css-detect-the-number-of-children-an-element-has diff --git a/assets/css/src/newsletter_editor/contentBlocks/posts.styl b/assets/css/src/newsletter_editor/contentBlocks/posts.styl index 25094c90ba..1dc7e86dbc 100644 --- a/assets/css/src/newsletter_editor/contentBlocks/posts.styl +++ b/assets/css/src/newsletter_editor/contentBlocks/posts.styl @@ -54,3 +54,6 @@ .mailpoet_post_selection_loading color: #999 + +.mailpoet_posts_container > .mailpoet_droppable_block + width: 100% diff --git a/assets/js/src/newsletter_editor/blocks/container.js b/assets/js/src/newsletter_editor/blocks/container.js index 3be7a76c30..0843fee878 100644 --- a/assets/js/src/newsletter_editor/blocks/container.js +++ b/assets/js/src/newsletter_editor/blocks/container.js @@ -59,7 +59,7 @@ define([ }, parse: function (response) { // If container has any blocks - add them to a collection - if (response.type === 'container' && _.has(response, 'blocks')) { + if (response.type === 'container' && _.has(response, 'blocks') && response.blocks.constructor === Array) { response.blocks = new BlockCollection(response.blocks, { parse: true }); diff --git a/assets/js/src/newsletter_editor/blocks/posts.js b/assets/js/src/newsletter_editor/blocks/posts.js index 43e2f164c4..7544f18a4c 100644 --- a/assets/js/src/newsletter_editor/blocks/posts.js +++ b/assets/js/src/newsletter_editor/blocks/posts.js @@ -52,6 +52,7 @@ define([ defaults: function () { return this._getDefaults({ type: 'posts', + withLayout: true, amount: '10', offset: 0, contentType: 'post', // 'post'|'page'|'mailpoet_page' @@ -64,7 +65,7 @@ define([ titleAlignment: 'left', // 'left'|'center'|'right' titleIsLink: false, // false|true imageFullWidth: false, // true|false - featuredImagePosition: 'belowTitle', // 'aboveTitle'|'belowTitle'|'none' + featuredImagePosition: 'centered', // 'centered'|'right'|'left'|'alternate'|'none' showAuthor: 'no', // 'no'|'aboveText'|'belowText' authorPrecededBy: 'Author:', showCategories: 'no', // 'no'|'aboveText'|'belowText' @@ -190,7 +191,7 @@ define([ getTemplate: function () { return window.templates.postsBlock; }, modelEvents: {}, // Forcefully disable all events regions: _.extend({ - postsRegion: '.mailpoet_posts_block_posts' + postsRegion: '.mailpoet_posts_container' }, base.BlockView.prototype.regions), onDragSubstituteBy: function () { return Module.PostsWidgetView; }, initialize: function () { diff --git a/views/newsletter/templates/blocks/posts/block.hbs b/views/newsletter/templates/blocks/posts/block.hbs index 2d6297c5ed..a3c837e650 100644 --- a/views/newsletter/templates/blocks/posts/block.hbs +++ b/views/newsletter/templates/blocks/posts/block.hbs @@ -1,5 +1,3 @@
-