From e9345e9f091321ff17a07bd4c73be48705c08783 Mon Sep 17 00:00:00 2001 From: Connor Brough Date: Mon, 7 Jan 2019 14:38:01 +0000 Subject: [PATCH 1/4] Added background image option to section. --- block-languages/benenson-blocks.pot | 27 +++++++++---------- .../blocks/section/DisplayComponent.js | 25 ++++++++++++++++- src/scripts/blocks/section/index.js | 6 +++++ 3 files changed, 43 insertions(+), 15 deletions(-) diff --git a/block-languages/benenson-blocks.pot b/block-languages/benenson-blocks.pot index f07b5f5..b25cb65 100644 --- a/block-languages/benenson-blocks.pot +++ b/block-languages/benenson-blocks.pot @@ -41,7 +41,7 @@ msgid "Standard" msgstr "" #: src/scripts/blocks/action/BlockEdit.js:62 -#: src/scripts/blocks/section/DisplayComponent.js:53 +#: src/scripts/blocks/section/DisplayComponent.js:70 msgid "Wide" msgstr "" @@ -103,7 +103,7 @@ msgstr "" #: src/scripts/blocks/blockquote/index.js:238 #: src/scripts/blocks/header/DisplayComponent.js:102 #: src/scripts/blocks/menu/DisplayComponent.js:10 -#: src/scripts/blocks/section/DisplayComponent.js:20 +#: src/scripts/blocks/section/DisplayComponent.js:37 msgid "White" msgstr "" @@ -122,7 +122,7 @@ msgstr "" #: src/scripts/blocks/link/DisplayComponent.js:16 #: src/scripts/blocks/menu/DisplayComponent.js:91 #: src/scripts/blocks/post-list/DisplayComponent.js:54 -#: src/scripts/blocks/section/DisplayComponent.js:16 +#: src/scripts/blocks/section/DisplayComponent.js:33 #: src/scripts/blocks/slider/DisplayComponent.js:203 msgid "Options" msgstr "" @@ -184,7 +184,6 @@ msgstr "" #: src/scripts/blocks/header/DisplayComponent.js:80 #: src/scripts/blocks/image/BlockEdit.js:205 #: src/scripts/blocks/link/DisplayComponent.js:60 -#: src/scripts/blocks/link/DisplayComponent.js:63 #: src/scripts/blocks/slider/DisplayComponent.js:35 msgid "Left" msgstr "" @@ -200,7 +199,6 @@ msgstr "" #: src/scripts/blocks/header/DisplayComponent.js:87 #: src/scripts/blocks/image/BlockEdit.js:208 #: src/scripts/blocks/link/DisplayComponent.js:66 -#: src/scripts/blocks/link/DisplayComponent.js:69 #: src/scripts/blocks/slider/DisplayComponent.js:38 msgid "Right" msgstr "" @@ -223,7 +221,7 @@ msgstr "" #: src/scripts/blocks/header/DisplayComponent.js:117 #: src/scripts/blocks/links-with-icons/InnerBlockEdit.js:228 #: src/scripts/blocks/logo-list/InnerBlockEdit.js:145 -#: src/scripts/blocks/section/DisplayComponent.js:35 +#: src/scripts/blocks/section/DisplayComponent.js:52 msgid "Small" msgstr "" @@ -249,7 +247,7 @@ msgstr "" #: src/scripts/blocks/links-with-icons/BlockEdit.js:67 #: src/scripts/blocks/logo-list/BlockEdit.js:58 #: src/scripts/blocks/menu/DisplayComponent.js:11 -#: src/scripts/blocks/section/DisplayComponent.js:23 +#: src/scripts/blocks/section/DisplayComponent.js:40 #: src/scripts/blocks/section/index.js:27 msgid "Grey" msgstr "" @@ -441,7 +439,7 @@ msgid "Edit File" msgstr "" #: src/scripts/blocks/header/DisplayComponent.js:114 -#: src/scripts/blocks/section/DisplayComponent.js:47 +#: src/scripts/blocks/section/DisplayComponent.js:64 msgid "Normal" msgstr "" @@ -472,6 +470,7 @@ msgid "" msgstr "" #: src/scripts/blocks/header/DisplayComponent.js:144 +#: src/scripts/blocks/section/DisplayComponent.js:82 msgid "Background Image" msgstr "" @@ -506,7 +505,7 @@ msgstr "" #: src/scripts/blocks/links-with-icons/BlockEdit.js:62 #: src/scripts/blocks/logo-list/BlockEdit.js:53 #: src/scripts/blocks/menu/DisplayComponent.js:102 -#: src/scripts/blocks/section/DisplayComponent.js:18 +#: src/scripts/blocks/section/DisplayComponent.js:35 msgid "Background Colour" msgstr "" @@ -519,7 +518,7 @@ msgstr "" #: src/scripts/blocks/link/DisplayComponent.js:45 #: src/scripts/blocks/links-with-icons/BlockEdit.js:66 #: src/scripts/blocks/logo-list/BlockEdit.js:57 -#: src/scripts/blocks/section/DisplayComponent.js:38 +#: src/scripts/blocks/section/DisplayComponent.js:55 msgid "None" msgstr "" @@ -569,7 +568,7 @@ msgid "Write caption…" msgstr "" #: src/scripts/blocks/iframe/DisplayComponent.js:91 -#: src/scripts/blocks/section/DisplayComponent.js:45 +#: src/scripts/blocks/section/DisplayComponent.js:62 msgid "Width" msgstr "" @@ -1005,16 +1004,16 @@ msgstr "" msgid "Posts" msgstr "" -#: src/scripts/blocks/section/DisplayComponent.js:30 +#: src/scripts/blocks/section/DisplayComponent.js:47 msgid "Padding" msgstr "" -#: src/scripts/blocks/section/DisplayComponent.js:50 +#: src/scripts/blocks/section/DisplayComponent.js:67 #: src/scripts/blocks/tweet/index.js:90 msgid "Narrow" msgstr "" -#: src/scripts/blocks/section/DisplayComponent.js:60 +#: src/scripts/blocks/section/DisplayComponent.js:77 msgid "Id (scroll location)" msgstr "" diff --git a/src/scripts/blocks/section/DisplayComponent.js b/src/scripts/blocks/section/DisplayComponent.js index 0ce70f0..f51e904 100644 --- a/src/scripts/blocks/section/DisplayComponent.js +++ b/src/scripts/blocks/section/DisplayComponent.js @@ -1,4 +1,5 @@ import classNames from 'classnames'; +import PostMediaSelector from '../PostMediaSelector'; const { __ } = wp.i18n; const { Component, Fragment } = wp.element; @@ -8,8 +9,24 @@ const { InspectorControls, InnerBlocks } = wp.editor; class DisplayComponent extends Component { createUpdateAttribute = key => value => this.props.setAttributes({ [key]: value }); + onMediaChange = (media) => { + if (media) { + this.props.setAttributes({ mediaId: media.id }); + this.props.setAttributes({ mediaUrl: media.source_url }); + return; + } + + this.props.setAttributes({ mediaId: null }); + this.props.setAttributes({ mediaUrl: null }); + }; + render() { const { attributes } = this.props; + const styles = { + backgroundImage: `url(${attributes.mediaUrl})`, + backgroundSize: 'cover', + backgroundPosition: 'center center', + }; return ( @@ -62,12 +79,18 @@ class DisplayComponent extends Component { value={ attributes.id } /> + + +
+ }) } style={ attributes.mediaUrl ? styles : null }>
diff --git a/src/scripts/blocks/section/index.js b/src/scripts/blocks/section/index.js index def271a..1d93907 100644 --- a/src/scripts/blocks/section/index.js +++ b/src/scripts/blocks/section/index.js @@ -30,6 +30,12 @@ registerBlockType('benenson/block-section', { background: { type: 'string', }, + mediaUrl: { + type: 'string', + }, + mediaId: { + type: 'integer', + }, padding: { type: 'string', }, From c31f7452f726c4e37b55c9056cc6438bd3088640 Mon Sep 17 00:00:00 2001 From: Connor Brough Date: Mon, 7 Jan 2019 14:57:07 +0000 Subject: [PATCH 2/4] Frontend section background image. --- src/scripts/blocks/section/index.js | 30 +++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/scripts/blocks/section/index.js b/src/scripts/blocks/section/index.js index 1d93907..5704379 100644 --- a/src/scripts/blocks/section/index.js +++ b/src/scripts/blocks/section/index.js @@ -50,16 +50,22 @@ registerBlockType('benenson/block-section', { edit: DisplayComponent, // Returns null due to the component being rendered server side - save: ({ attributes }) => ( -
-
- -
-
- ), + save: ({ attributes }) => { + const styles = { + backgroundImage: `url(${attributes.mediaUrl})`, + backgroundSize: 'cover', + backgroundPosition: 'center center', + }; + + return (
+
+ +
+
); + }, }); From a07b6e5f3e805675191e8410ea511d67a79e7d2e Mon Sep 17 00:00:00 2001 From: Connor Brough Date: Tue, 8 Jan 2019 12:45:37 +0000 Subject: [PATCH 3/4] pr changes. generate translation file and combine setAttributes. --- block-languages/benenson-blocks.pot | 26 ++-- includes/block-translations.php | 132 ++++++++++++++---- .../blocks/section/DisplayComponent.js | 12 +- 3 files changed, 123 insertions(+), 47 deletions(-) diff --git a/block-languages/benenson-blocks.pot b/block-languages/benenson-blocks.pot index b25cb65..5e76693 100644 --- a/block-languages/benenson-blocks.pot +++ b/block-languages/benenson-blocks.pot @@ -41,7 +41,7 @@ msgid "Standard" msgstr "" #: src/scripts/blocks/action/BlockEdit.js:62 -#: src/scripts/blocks/section/DisplayComponent.js:70 +#: src/scripts/blocks/section/DisplayComponent.js:74 msgid "Wide" msgstr "" @@ -103,7 +103,7 @@ msgstr "" #: src/scripts/blocks/blockquote/index.js:238 #: src/scripts/blocks/header/DisplayComponent.js:102 #: src/scripts/blocks/menu/DisplayComponent.js:10 -#: src/scripts/blocks/section/DisplayComponent.js:37 +#: src/scripts/blocks/section/DisplayComponent.js:41 msgid "White" msgstr "" @@ -122,7 +122,7 @@ msgstr "" #: src/scripts/blocks/link/DisplayComponent.js:16 #: src/scripts/blocks/menu/DisplayComponent.js:91 #: src/scripts/blocks/post-list/DisplayComponent.js:54 -#: src/scripts/blocks/section/DisplayComponent.js:33 +#: src/scripts/blocks/section/DisplayComponent.js:37 #: src/scripts/blocks/slider/DisplayComponent.js:203 msgid "Options" msgstr "" @@ -221,7 +221,7 @@ msgstr "" #: src/scripts/blocks/header/DisplayComponent.js:117 #: src/scripts/blocks/links-with-icons/InnerBlockEdit.js:228 #: src/scripts/blocks/logo-list/InnerBlockEdit.js:145 -#: src/scripts/blocks/section/DisplayComponent.js:52 +#: src/scripts/blocks/section/DisplayComponent.js:56 msgid "Small" msgstr "" @@ -247,7 +247,7 @@ msgstr "" #: src/scripts/blocks/links-with-icons/BlockEdit.js:67 #: src/scripts/blocks/logo-list/BlockEdit.js:58 #: src/scripts/blocks/menu/DisplayComponent.js:11 -#: src/scripts/blocks/section/DisplayComponent.js:40 +#: src/scripts/blocks/section/DisplayComponent.js:44 #: src/scripts/blocks/section/index.js:27 msgid "Grey" msgstr "" @@ -439,7 +439,7 @@ msgid "Edit File" msgstr "" #: src/scripts/blocks/header/DisplayComponent.js:114 -#: src/scripts/blocks/section/DisplayComponent.js:64 +#: src/scripts/blocks/section/DisplayComponent.js:68 msgid "Normal" msgstr "" @@ -470,7 +470,7 @@ msgid "" msgstr "" #: src/scripts/blocks/header/DisplayComponent.js:144 -#: src/scripts/blocks/section/DisplayComponent.js:82 +#: src/scripts/blocks/section/DisplayComponent.js:86 msgid "Background Image" msgstr "" @@ -505,7 +505,7 @@ msgstr "" #: src/scripts/blocks/links-with-icons/BlockEdit.js:62 #: src/scripts/blocks/logo-list/BlockEdit.js:53 #: src/scripts/blocks/menu/DisplayComponent.js:102 -#: src/scripts/blocks/section/DisplayComponent.js:35 +#: src/scripts/blocks/section/DisplayComponent.js:39 msgid "Background Colour" msgstr "" @@ -518,7 +518,7 @@ msgstr "" #: src/scripts/blocks/link/DisplayComponent.js:45 #: src/scripts/blocks/links-with-icons/BlockEdit.js:66 #: src/scripts/blocks/logo-list/BlockEdit.js:57 -#: src/scripts/blocks/section/DisplayComponent.js:55 +#: src/scripts/blocks/section/DisplayComponent.js:59 msgid "None" msgstr "" @@ -568,7 +568,7 @@ msgid "Write caption…" msgstr "" #: src/scripts/blocks/iframe/DisplayComponent.js:91 -#: src/scripts/blocks/section/DisplayComponent.js:62 +#: src/scripts/blocks/section/DisplayComponent.js:66 msgid "Width" msgstr "" @@ -1004,16 +1004,16 @@ msgstr "" msgid "Posts" msgstr "" -#: src/scripts/blocks/section/DisplayComponent.js:47 +#: src/scripts/blocks/section/DisplayComponent.js:51 msgid "Padding" msgstr "" -#: src/scripts/blocks/section/DisplayComponent.js:67 +#: src/scripts/blocks/section/DisplayComponent.js:71 #: src/scripts/blocks/tweet/index.js:90 msgid "Narrow" msgstr "" -#: src/scripts/blocks/section/DisplayComponent.js:77 +#: src/scripts/blocks/section/DisplayComponent.js:81 msgid "Id (scroll location)" msgstr "" diff --git a/includes/block-translations.php b/includes/block-translations.php index f5eb97d..6241fa9 100644 --- a/includes/block-translations.php +++ b/includes/block-translations.php @@ -11,7 +11,8 @@ // Reference: src/scripts/blocks/action/BlockEdit.js:78 // Reference: src/scripts/blocks/image/BlockEdit.js:224 // Reference: src/scripts/blocks/post-list/components/editable/GridItem.js:60 - // Reference: src/scripts/blocks/post-list/components/editable/PostItem.js:60 + // Reference: src/scripts/blocks/post-list/components/editable/PostItem.js:103 + // Reference: src/scripts/blocks/post-list/components/editable/SplitGridItem.js:68 __( 'Remove Image', 'benenson' ), // Reference: src/scripts/blocks/action/BlockEdit.js:102 @@ -31,7 +32,7 @@ __( 'Standard', 'benenson' ), // Reference: src/scripts/blocks/action/BlockEdit.js:62 - // Reference: src/scripts/blocks/section/DisplayComponent.js:53 + // Reference: src/scripts/blocks/section/DisplayComponent.js:74 __( 'Wide', 'benenson' ), // Reference: src/scripts/blocks/action/BlockEdit.js:66 @@ -79,7 +80,7 @@ // Reference: src/scripts/blocks/blockquote/index.js:238 // Reference: src/scripts/blocks/header/DisplayComponent.js:102 // Reference: src/scripts/blocks/menu/DisplayComponent.js:10 - // Reference: src/scripts/blocks/section/DisplayComponent.js:20 + // Reference: src/scripts/blocks/section/DisplayComponent.js:41 __( 'White', 'benenson' ), // Reference: src/scripts/blocks/appearance-options/index.js:47 @@ -93,9 +94,10 @@ // Reference: src/scripts/blocks/columns/DisplayComponent.js:28 // Reference: src/scripts/blocks/header/DisplayComponent.js:75 // Reference: src/scripts/blocks/iframe/DisplayComponent.js:89 + // Reference: src/scripts/blocks/link/DisplayComponent.js:16 // Reference: src/scripts/blocks/menu/DisplayComponent.js:91 // Reference: src/scripts/blocks/post-list/DisplayComponent.js:54 - // Reference: src/scripts/blocks/section/DisplayComponent.js:16 + // Reference: src/scripts/blocks/section/DisplayComponent.js:37 // Reference: src/scripts/blocks/slider/DisplayComponent.js:203 __( 'Options', 'benenson' ), @@ -141,6 +143,7 @@ // Reference: src/scripts/blocks/blockquote/index.js:163 // Reference: src/scripts/blocks/header/DisplayComponent.js:80 // Reference: src/scripts/blocks/image/BlockEdit.js:205 + // Reference: src/scripts/blocks/link/DisplayComponent.js:60 // Reference: src/scripts/blocks/slider/DisplayComponent.js:35 /* translators: text alignment. for RTL languages, localise as 'Right' */ __( 'Left', 'benenson' ), @@ -153,6 +156,7 @@ // Reference: src/scripts/blocks/blockquote/index.js:169 // Reference: src/scripts/blocks/header/DisplayComponent.js:87 // Reference: src/scripts/blocks/image/BlockEdit.js:208 + // Reference: src/scripts/blocks/link/DisplayComponent.js:66 // Reference: src/scripts/blocks/slider/DisplayComponent.js:38 /* translators: text alignment. for RTL languages, localise as 'Left' */ __( 'Right', 'benenson' ), @@ -172,7 +176,7 @@ // Reference: src/scripts/blocks/header/DisplayComponent.js:117 // Reference: src/scripts/blocks/links-with-icons/InnerBlockEdit.js:228 // Reference: src/scripts/blocks/logo-list/InnerBlockEdit.js:145 - // Reference: src/scripts/blocks/section/DisplayComponent.js:35 + // Reference: src/scripts/blocks/section/DisplayComponent.js:56 __( 'Small', 'benenson' ), // Reference: src/scripts/blocks/blockquote/index.js:227 @@ -194,7 +198,8 @@ // Reference: src/scripts/blocks/links-with-icons/BlockEdit.js:67 // Reference: src/scripts/blocks/logo-list/BlockEdit.js:58 // Reference: src/scripts/blocks/menu/DisplayComponent.js:11 - // Reference: src/scripts/blocks/section/DisplayComponent.js:23 + // Reference: src/scripts/blocks/section/DisplayComponent.js:44 + // Reference: src/scripts/blocks/section/DisplayComponent.js:40 // Reference: src/scripts/blocks/section/index.js:27 __( 'Grey', 'benenson' ), @@ -245,6 +250,7 @@ __( '(Content)', 'benenson' ), // Reference: src/scripts/blocks/call-to-action/DisplayComponent.js:87 + // Reference: src/scripts/blocks/post-list/components/editable/PostItem.js:83 // Reference: src/scripts/blocks/slider/DisplayComponent.js:334 __( '(Button Text)', 'benenson' ), @@ -339,7 +345,7 @@ __( 'Edit File', 'benenson' ), // Reference: src/scripts/blocks/header/DisplayComponent.js:114 - // Reference: src/scripts/blocks/section/DisplayComponent.js:47 + // Reference: src/scripts/blocks/section/DisplayComponent.js:68 __( 'Normal', 'benenson' ), // Reference: src/scripts/blocks/header/DisplayComponent.js:125 @@ -355,12 +361,14 @@ __( 'Video', 'benenson' ), // Reference: src/scripts/blocks/header/DisplayComponent.js:138 + // Reference: src/scripts/blocks/media-aside/DisplayComponent.js:43 __( 'Embed url', 'benenson' ), // Reference: src/scripts/blocks/header/DisplayComponent.js:142 __( 'Setting this will override the cta link and will now open a modal with the embed in the hero.', 'benenson' ), // Reference: src/scripts/blocks/header/DisplayComponent.js:144 + // Reference: src/scripts/blocks/section/DisplayComponent.js:86 __( 'Background Image', 'benenson' ), // Reference: src/scripts/blocks/header/DisplayComponent.js:144 @@ -388,7 +396,7 @@ // Reference: src/scripts/blocks/links-with-icons/BlockEdit.js:62 // Reference: src/scripts/blocks/logo-list/BlockEdit.js:53 // Reference: src/scripts/blocks/menu/DisplayComponent.js:102 - // Reference: src/scripts/blocks/section/DisplayComponent.js:18 + // Reference: src/scripts/blocks/section/DisplayComponent.js:39 __( 'Background Colour', 'benenson' ), // Reference: src/scripts/blocks/header/DisplayComponent.js:96 @@ -396,9 +404,10 @@ // Reference: src/scripts/blocks/header/DisplayComponent.js:99 // Reference: src/scripts/blocks/key-facts/index.js:58 + // Reference: src/scripts/blocks/link/DisplayComponent.js:45 // Reference: src/scripts/blocks/links-with-icons/BlockEdit.js:66 // Reference: src/scripts/blocks/logo-list/BlockEdit.js:57 - // Reference: src/scripts/blocks/section/DisplayComponent.js:38 + // Reference: src/scripts/blocks/section/DisplayComponent.js:59 __( 'None', 'benenson' ), // Reference: src/scripts/blocks/header/PostFeaturedVideo.js:6 @@ -436,7 +445,7 @@ __( 'Write caption…', 'benenson' ), // Reference: src/scripts/blocks/iframe/DisplayComponent.js:91 - // Reference: src/scripts/blocks/section/DisplayComponent.js:45 + // Reference: src/scripts/blocks/section/DisplayComponent.js:66 __( 'Width', 'benenson' ), // Reference: src/scripts/blocks/iframe/DisplayComponent.js:95 @@ -502,14 +511,18 @@ // Reference: src/scripts/blocks/key-facts/fact.js:30 // Reference: src/scripts/blocks/key-facts/index.js:68 // Reference: src/scripts/blocks/links-with-icons/InnerBlockEdit.js:253 + // Reference: src/scripts/blocks/media-aside/DisplayComponent.js:62 // Reference: src/scripts/blocks/post-list/components/editable/GridItem.js:30 // Reference: src/scripts/blocks/post-list/components/editable/LinkList.js:27 - // Reference: src/scripts/blocks/post-list/components/editable/PostItem.js:30 + // Reference: src/scripts/blocks/post-list/components/editable/PostItem.js:55 + // Reference: src/scripts/blocks/post-list/components/editable/SplitGridItem.js:38 __( '(Insert Title)', 'benenson' ), // Reference: src/scripts/blocks/key-facts/fact.js:39 + // Reference: src/scripts/blocks/media-aside/DisplayComponent.js:73 // Reference: src/scripts/blocks/post-list/components/editable/GridItem.js:46 - // Reference: src/scripts/blocks/post-list/components/editable/PostItem.js:46 + // Reference: src/scripts/blocks/post-list/components/editable/PostItem.js:71 + // Reference: src/scripts/blocks/post-list/components/editable/SplitGridItem.js:54 __( '(Insert Content)', 'benenson' ), // Reference: src/scripts/blocks/key-facts/index.js:16 @@ -523,6 +536,45 @@ // Reference: src/scripts/blocks/logo-list/BlockEdit.js:46 __( 'Quantity', 'benenson' ), + // Reference: src/scripts/blocks/link/DisplayComponent.js:18 + __( 'Link text', 'benenson' ), + + // Reference: src/scripts/blocks/link/DisplayComponent.js:23 + __( 'Link url', 'benenson' ), + + // Reference: src/scripts/blocks/link/DisplayComponent.js:28 + __( 'Link style', 'benenson' ), + + // Reference: src/scripts/blocks/link/DisplayComponent.js:30 + __( 'Primary', 'benenson' ), + + // Reference: src/scripts/blocks/link/DisplayComponent.js:33 + __( 'Primary Outline', 'benenson' ), + + // Reference: src/scripts/blocks/link/DisplayComponent.js:36 + __( 'Primary Solid', 'benenson' ), + + // Reference: src/scripts/blocks/link/DisplayComponent.js:43 + __( 'Link icon', 'benenson' ), + + // Reference: src/scripts/blocks/link/DisplayComponent.js:48 + __( 'Up arrow', 'benenson' ), + + // Reference: src/scripts/blocks/link/DisplayComponent.js:51 + __( 'Down arrow', 'benenson' ), + + // Reference: src/scripts/blocks/link/DisplayComponent.js:58 + __( 'Link alignment', 'benenson' ), + + // Reference: src/scripts/blocks/link/DisplayComponent.js:63 + __( 'Center', 'benenson' ), + + // Reference: src/scripts/blocks/link/index.js:15 + __( 'Link', 'benenson' ), + + // Reference: src/scripts/blocks/link/index.js:16 + __( 'Add a link to section within page, another page or an external URL.', 'benenson' ), + // Reference: src/scripts/blocks/links-with-icons/BlockEdit.js:53 __( 'Orientation', 'benenson' ), @@ -599,6 +651,18 @@ // Reference: src/scripts/blocks/logo-list/index.js:21 __( 'Add a repeatable logo block', 'benenson' ), + // Reference: src/scripts/blocks/media-aside/DisplayComponent.js:47 + __( 'Image/Video Poster', 'benenson' ), + + // Reference: src/scripts/blocks/media-aside/DisplayComponent.js:83 + __( '(Insert Link text)', 'benenson' ), + + // Reference: src/scripts/blocks/media-aside/index.js:27 + __( 'Media aside', 'benenson' ), + + // Reference: src/scripts/blocks/media-aside/index.js:34 + __( 'Media', 'benenson' ), + // Reference: src/scripts/blocks/menu/DisplayComponent.js:110 __( 'Select a menu in the sidebar', 'benenson' ), @@ -618,13 +682,13 @@ // Reference: src/scripts/blocks/menu/index.js:32 __( 'Navigation', 'benenson' ), - // Reference: src/scripts/blocks/post-list/DisplayComponent.js:100 + // Reference: src/scripts/blocks/post-list/DisplayComponent.js:104 __( 'Use related categories where supported', 'benenson' ), - // Reference: src/scripts/blocks/post-list/DisplayComponent.js:105 + // Reference: src/scripts/blocks/post-list/DisplayComponent.js:109 __( 'Hide Preview', 'benenson' ), - // Reference: src/scripts/blocks/post-list/DisplayComponent.js:105 + // Reference: src/scripts/blocks/post-list/DisplayComponent.js:109 __( 'Show Preview', 'benenson' ), // Reference: src/scripts/blocks/post-list/DisplayComponent.js:58 @@ -636,48 +700,52 @@ // Reference: src/scripts/blocks/post-list/DisplayComponent.js:64 __( 'Post', 'benenson' ), - // Reference: src/scripts/blocks/post-list/DisplayComponent.js:71 + // Reference: src/scripts/blocks/post-list/DisplayComponent.js:68 + __( 'Split Grid', 'benenson' ), + + // Reference: src/scripts/blocks/post-list/DisplayComponent.js:75 __( 'Type', 'benenson' ), - // Reference: src/scripts/blocks/post-list/DisplayComponent.js:73 + // Reference: src/scripts/blocks/post-list/DisplayComponent.js:77 __( 'Category', 'benenson' ), - // Reference: src/scripts/blocks/post-list/DisplayComponent.js:76 + // Reference: src/scripts/blocks/post-list/DisplayComponent.js:80 __( 'Object Selection', 'benenson' ), - // Reference: src/scripts/blocks/post-list/DisplayComponent.js:79 + // Reference: src/scripts/blocks/post-list/DisplayComponent.js:83 __( 'Custom', 'benenson' ), - // Reference: src/scripts/blocks/post-list/DisplayComponent.js:86 + // Reference: src/scripts/blocks/post-list/DisplayComponent.js:90 __( 'Category:', 'benenson' ), - // Reference: src/scripts/blocks/post-list/DisplayComponent.js:93 + // Reference: src/scripts/blocks/post-list/DisplayComponent.js:97 __( 'Number of posts to show:', 'benenson' ), // Reference: src/scripts/blocks/post-list/components/CategorySelect.js:78 __( 'Select a category', 'benenson' ), - // Reference: src/scripts/blocks/post-list/components/DisplayCategories.js:161 - // Reference: src/scripts/blocks/post-list/components/SelectPreview.js:9 + // Reference: src/scripts/blocks/post-list/components/DisplayCategories.js:167 + // Reference: src/scripts/blocks/post-list/components/SelectPreview.js:10 // Reference: src/scripts/blocks/post-list/components/post-selector/PostList.js:41 // Reference: src/scripts/blocks/post-list/components/post-selector/PostSelector.js:36 __( 'Loading...', 'benenson' ), - // Reference: src/scripts/blocks/post-list/components/DisplayCategories.js:165 + // Reference: src/scripts/blocks/post-list/components/DisplayCategories.js:171 __( 'Select a category.', 'benenson' ), - // Reference: src/scripts/blocks/post-list/components/DisplayCategories.js:169 + // Reference: src/scripts/blocks/post-list/components/DisplayCategories.js:175 __( 'No Items found', 'benenson' ), - // Reference: src/scripts/blocks/post-list/components/DisplayCustom.js:140 + // Reference: src/scripts/blocks/post-list/components/DisplayCustom.js:157 __( 'Add another item', 'benenson' ), - // Reference: src/scripts/blocks/post-list/components/SelectPreview.js:13 + // Reference: src/scripts/blocks/post-list/components/SelectPreview.js:14 // Reference: src/scripts/blocks/post-list/components/post-selector/PostList.js:31 __( 'No Posts.', 'benenson' ), // Reference: src/scripts/blocks/post-list/components/editable/GridItem.js:14 - // Reference: src/scripts/blocks/post-list/components/editable/PostItem.js:14 + // Reference: src/scripts/blocks/post-list/components/editable/PostItem.js:39 + // Reference: src/scripts/blocks/post-list/components/editable/SplitGridItem.js:22 __( '(Insert Tag)', 'benenson' ), // Reference: src/scripts/blocks/post-list/components/editable/LinkList.js:12 @@ -710,13 +778,17 @@ // Reference: src/scripts/blocks/post-list/index.js:40 __( 'Posts', 'benenson' ), - // Reference: src/scripts/blocks/section/DisplayComponent.js:30 + // Reference: src/scripts/blocks/section/DisplayComponent.js:51 __( 'Padding', 'benenson' ), - // Reference: src/scripts/blocks/section/DisplayComponent.js:50 + // Reference: src/scripts/blocks/section/DisplayComponent.js:71 + // Reference: src/scripts/blocks/section/DisplayComponent.js:67 // Reference: src/scripts/blocks/tweet/index.js:90 __( 'Narrow', 'benenson' ), + // Reference: src/scripts/blocks/section/DisplayComponent.js:81 + __( 'Id (scroll location)', 'benenson' ), + // Reference: src/scripts/blocks/section/index.js:26 __( 'Section', 'benenson' ), diff --git a/src/scripts/blocks/section/DisplayComponent.js b/src/scripts/blocks/section/DisplayComponent.js index f51e904..2300dd2 100644 --- a/src/scripts/blocks/section/DisplayComponent.js +++ b/src/scripts/blocks/section/DisplayComponent.js @@ -11,13 +11,17 @@ class DisplayComponent extends Component { onMediaChange = (media) => { if (media) { - this.props.setAttributes({ mediaId: media.id }); - this.props.setAttributes({ mediaUrl: media.source_url }); + this.props.setAttributes({ + mediaId: media.id, + mediaUrl: media.source_url, + }); return; } - this.props.setAttributes({ mediaId: null }); - this.props.setAttributes({ mediaUrl: null }); + this.props.setAttributes({ + mediaId: null, + mediaUrl: null, + }); }; render() { From edafc26ead47d07c7dca2f2d58af06d0d2858ae6 Mon Sep 17 00:00:00 2001 From: Connor Brough Date: Tue, 8 Jan 2019 17:39:38 +0000 Subject: [PATCH 4/4] simplify background position. --- block-languages/benenson-blocks.pot | 7 +------ src/scripts/blocks/section/DisplayComponent.js | 2 +- src/scripts/blocks/section/index.js | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/block-languages/benenson-blocks.pot b/block-languages/benenson-blocks.pot index 76ba8f5..5f08888 100644 --- a/block-languages/benenson-blocks.pot +++ b/block-languages/benenson-blocks.pot @@ -121,13 +121,8 @@ msgstr "" #: src/scripts/blocks/iframe/DisplayComponent.js:89 #: src/scripts/blocks/link/DisplayComponent.js:16 #: src/scripts/blocks/menu/DisplayComponent.js:91 -<<<<<<< HEAD -#: src/scripts/blocks/post-list/DisplayComponent.js:54 -#: src/scripts/blocks/section/DisplayComponent.js:37 -======= #: src/scripts/blocks/post-list/DisplayComponent.js:58 -#: src/scripts/blocks/section/DisplayComponent.js:16 ->>>>>>> develop +#: src/scripts/blocks/section/DisplayComponent.js:37 #: src/scripts/blocks/slider/DisplayComponent.js:203 msgid "Options" msgstr "" diff --git a/src/scripts/blocks/section/DisplayComponent.js b/src/scripts/blocks/section/DisplayComponent.js index 2300dd2..61f5f83 100644 --- a/src/scripts/blocks/section/DisplayComponent.js +++ b/src/scripts/blocks/section/DisplayComponent.js @@ -29,7 +29,7 @@ class DisplayComponent extends Component { const styles = { backgroundImage: `url(${attributes.mediaUrl})`, backgroundSize: 'cover', - backgroundPosition: 'center center', + backgroundPosition: 'center', }; return ( diff --git a/src/scripts/blocks/section/index.js b/src/scripts/blocks/section/index.js index 5704379..e1f5449 100644 --- a/src/scripts/blocks/section/index.js +++ b/src/scripts/blocks/section/index.js @@ -54,7 +54,7 @@ registerBlockType('benenson/block-section', { const styles = { backgroundImage: `url(${attributes.mediaUrl})`, backgroundSize: 'cover', - backgroundPosition: 'center center', + backgroundPosition: 'center', }; return (