From 318bde68596ee6a297908802f546a2a70d8183cf Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Wed, 8 Nov 2023 14:49:22 +0900 Subject: [PATCH 01/13] Add a remembers block. --- .../themes/wporg-main-2022/functions.php | 1 + .../wporg-main-2022/patterns/remembers.php | 252 +----------------- .../src/remembers-list/block.json | 35 +++ .../src/remembers-list/edit.js | 17 ++ .../src/remembers-list/index.js | 16 ++ .../src/remembers-list/index.php | 76 ++++++ .../src/remembers-list/style.scss | 9 + 7 files changed, 161 insertions(+), 245 deletions(-) create mode 100644 source/wp-content/themes/wporg-main-2022/src/remembers-list/block.json create mode 100644 source/wp-content/themes/wporg-main-2022/src/remembers-list/edit.js create mode 100644 source/wp-content/themes/wporg-main-2022/src/remembers-list/index.js create mode 100644 source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php create mode 100644 source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss diff --git a/source/wp-content/themes/wporg-main-2022/functions.php b/source/wp-content/themes/wporg-main-2022/functions.php index 72ae61d0..d0054e71 100644 --- a/source/wp-content/themes/wporg-main-2022/functions.php +++ b/source/wp-content/themes/wporg-main-2022/functions.php @@ -13,6 +13,7 @@ require_once __DIR__ . '/src/google-search-embed/index.php'; require_once __DIR__ . '/src/random-heading/index.php'; require_once __DIR__ . '/src/release-tables/index.php'; +require_once __DIR__ . '/src/remembers-list/index.php'; /** * Actions and filters. diff --git a/source/wp-content/themes/wporg-main-2022/patterns/remembers.php b/source/wp-content/themes/wporg-main-2022/patterns/remembers.php index 5ecb96c0..cfde1411 100644 --- a/source/wp-content/themes/wporg-main-2022/patterns/remembers.php +++ b/source/wp-content/themes/wporg-main-2022/patterns/remembers.php @@ -17,259 +17,21 @@

- - - -
- - - - -
-

Kim Parsell passed away in 2015.', 'wporg' ); ?>

- - - -

Kim was an active and well-loved member of the WordPress community. Lovingly referred to as #wpmom, she leaves behind a legacy of service.', 'wporg' ); ?>

- - - -
-

Kim's Profile', 'wporg' ); ?>

- - - -

Memorial Scholarship', 'wporg' ); ?>

-
- -

- - -
-

Alex King passed away in 2015.', 'wporg' ); ?>

- - - -

Alex was one of the original WordPress developers. He helped with what later became the plugin directory and hugely influenced the path to themes.', 'wporg' ); ?>

- - - -
-

Alex's Profile', 'wporg' ); ?>

- - - -

Remembering Alex', 'wporg' ); ?>

-
-
- - +
-

- - - -
-

Jesse Petersen passed away in 2017.

Jesse was a valued contributor to the WordPress community, Genesis Preferred Developer, theme and plugin developer, and WordCamp Speaker. ', 'wporg' ); ?>

- - - -
-

Jesse's Profile', 'wporg' ); ?>

+

❦

- -

WordCamp US memorial', 'wporg' ); ?>

-
-
- - + +
-

+

❦

- - -
-

Efrain Rivera passed away in 2018.

Efrain was a Longtime Community Member, WordCamp Organizer, and Volunteer.', 'wporg' ); ?>

+ +

This memorial is volunteer maintained and managed. To add a tribute for a lost contributor please contact us: memorials@wordpress.org

- - -
-

Efrain's Profile', 'wporg' ); ?>

-
-
- - - -

- - - -
-

Todrick Moore passed away in 2018.

Todrick was a member of the Miami WordPress community and volunteer organizer of WordCamp Miami 2015 and 2016.', 'wporg' ); ?>

- - - -
-

Todrick's Profile', 'wporg' ); ?>

-
-
- - - -

- - - -
-

Alex Mills passed away in 2019.

Alex was active in the WordPress community contributing to WordPress and writing plugins.', 'wporg' ); ?>

- - - -
-

Alex's Profile', 'wporg' ); ?>

- - - -

alex.blog', 'wporg' ); ?>

-
-
- - - -

- - - -
-

Joseph Karr O’Connor passed away in 2020.

Joseph was a patient and passionate caretaker for WordPress Accessibility from 2013 to 2016. He supported accessibility through the WordPress ecosystem, leaving a legacy of compassion for all WordPress users and creators.', 'wporg' ); ?>

- - - -
-

Joseph's Profile', 'wporg' ); ?>

- - - -

WP Accessibility team memorial', 'wporg' ); ?>

-
-
- - - -

- - - -
-

David de Boer passed away in 2020.

David was a valued contributor from the Netherlands and loved and respected within the Dutch WordPress community. He spoke at multiple WordCamps and contributed to 2 very popular payment plugins.', 'wporg' ); ?>

- - - -
-

David's Profile', 'wporg' ); ?>

-
-
- - - -

- - - -
-

Ujwal Thapa passed away in 2021.

Ujwal started and led numerous notable initiatives for the betterment of society and people; one of them was co-founding the WordPress Nepal community.', 'wporg' ); ?>

- - - -
-

Ujwal's Profile', 'wporg' ); ?>

- - - -

Ujwal Thapa Foundation', 'wporg' ); ?>

-
-
- - - -

- - - -
-

Puneet Sahalot passed away in 2021.

Puneet was a Core contributor, Meetup/Chapter Organizer for the Udaipur Community, where his dedicated contributions helped foster a collaborative and innovative atmosphere.', 'wporg' ); ?>

- - - -
-

Puneet's Profile', 'wporg' ); ?>

- - - -

Puneet on HeroPress', 'wporg' ); ?>

-
-
- - - -

- - - -
-

Dan Beil passed away in 2021.

Dan was an active member of the Minneapolis WordPress community, and a dear friend to many in the larger WordPress community. Dan was frequently involved in the Minneapolis WordPress User Group, was a WordCamp Minneapolis Organizer, and was a prolific speaker at many WordCamps around the US.', 'wporg' ); ?>

- - - -
-

Dan's Profile', 'wporg' ); ?>

-
-
- - - -

- - - -
-

Paolo Valenti passed away in 2022.

Wolly was the first to translate WordPress into Italian. He helped people get involved in the Polyglots team and the International Community, generously providing direction and support. His contributions helped shape the Italian community as it is today.', 'wporg' ); ?>

- - - -
-

Paolo's Profile', 'wporg' ); ?>

-
-
- - - -

- - - -
-

José Luis Losada passed away in 2023.

José was an exceptionally active member of the Spanish community. It was impossible to go to a WordCamp in Spain where he was not collaborating as a volunteer or organizer.', 'wporg' ); ?>

- - - -
-

José Luis' Profile', 'wporg' ); ?>

-
-
- - - -
- - - -
-

memorials@wordpress.org', 'wporg' ); ?>

-
diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/block.json b/source/wp-content/themes/wporg-main-2022/src/remembers-list/block.json new file mode 100644 index 00000000..d5df7a85 --- /dev/null +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/block.json @@ -0,0 +1,35 @@ +{ + "$schema": "https://schemas.wp.org/trunk/block.json", + "apiVersion": 2, + "name": "wporg/remembers-list", + "version": "0.1.0", + "title": "Remembers Contributor List", + "category": "design", + "icon": "heading", + "description": "Remembers Contributor List", + "textdomain": "wporg", + "attributes": { + "columns": { + "type": "number", + "default": 3 + } + }, + "supports": { + "align": true, + "color": { + "background": true, + "text": true + }, + "spacing": { + "margin": [ "top", "bottom" ], + "padding": true, + "blockGap": false + }, + "typography": { + "fontSize": true, + "lineHeight": true + } + }, + "editorScript": "file:./index.js", + "style": "file:./style-index.css" +} diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/edit.js b/source/wp-content/themes/wporg-main-2022/src/remembers-list/edit.js new file mode 100644 index 00000000..bbd0bf80 --- /dev/null +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/edit.js @@ -0,0 +1,17 @@ +/** + * WordPress dependencies + */ + +import { useBlockProps } from '@wordpress/block-editor'; +import { Disabled } from '@wordpress/components'; +import ServerSideRender from '@wordpress/server-side-render'; + +export default function Edit( { attributes, name } ) { + return ( +
+ + + +
+ ); +} diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.js b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.js new file mode 100644 index 00000000..5d6da2ae --- /dev/null +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.js @@ -0,0 +1,16 @@ +/** + * WordPress dependencies + */ +import { registerBlockType } from '@wordpress/blocks'; + +/** + * Internal dependencies + */ +import Edit from './edit'; +import metadata from './block.json'; +import './style.scss'; + +registerBlockType( metadata.name, { + edit: Edit, + save: () => null, +} ); diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php new file mode 100644 index 00000000..18bfe4f3 --- /dev/null +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php @@ -0,0 +1,76 @@ + __NAMESPACE__ . '\render', + ) + ); +} + +/** + * Render the block content. + * + * @param array $attributes Block attributes. + * @param string $content Block default content. + * @param WP_Block $block Block instance. + * + * @return string Returns the block markup. + */ +function render( $attributes, $content, $block ) { + + // Replace with query + $profiles = [ 'Kim Parsell', 'Alex King', 'Jesse Petersen', 'Efrain Rivera', 'Todrick Moore', 'Alex Mills', 'Joseph Karr O’Connor', 'David de Boer' ]; + + $columns = $attributes['columns']; + $group_count = ceil( count( $profiles ) / $columns ); + + $groups = []; + for ( $i = 0; $i < $group_count; $i++ ) { + $groups[] = array_slice( $profiles, $i * $columns, $columns ); + } + + $block_content = ''; + foreach ( $groups as $group ) { + $block_content .= '
'; + + foreach ( $group as $name ) { + $block_content .= '
'; + $block_content .= ''; + $block_content .= '

'; + $block_content .= ''; + $block_content .= '' . esc_html( $name ) . ''; + $block_content .= ''; + $block_content .= '

'; + $block_content .= ''; + $block_content .= '
'; + } + + $block_content .= '
'; + } + + $wrapper_attributes = get_block_wrapper_attributes(); + return sprintf( + '

%2$s

', + $wrapper_attributes, + do_blocks( $block_content ) + ); +} diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss b/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss new file mode 100644 index 00000000..64401cb3 --- /dev/null +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss @@ -0,0 +1,9 @@ +.wp-block-wporg-remembers-list a { + display: inline-block; + color: inherit; + text-decoration: none; + + &:hover { + text-decoration: underline; + } +} \ No newline at end of file From 2e9120471a41378846802595e642fb53d2344ced Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Wed, 8 Nov 2023 14:53:26 +0900 Subject: [PATCH 02/13] Add hover styles. --- .../themes/wporg-main-2022/src/remembers-list/style.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss b/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss index 64401cb3..9fc08c78 100644 --- a/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss @@ -4,6 +4,7 @@ text-decoration: none; &:hover { + color: var(--wp--custom--link--color--text); text-decoration: underline; } } \ No newline at end of file From 9c4ab2c9872c154221e43419b719343fd89d2ec2 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Wed, 8 Nov 2023 14:57:30 +0900 Subject: [PATCH 03/13] Use associative array. --- .../themes/wporg-main-2022/src/remembers-list/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php index 18bfe4f3..a2ef8b0f 100644 --- a/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php @@ -38,7 +38,7 @@ function init() { function render( $attributes, $content, $block ) { // Replace with query - $profiles = [ 'Kim Parsell', 'Alex King', 'Jesse Petersen', 'Efrain Rivera', 'Todrick Moore', 'Alex Mills', 'Joseph Karr O’Connor', 'David de Boer' ]; + $profiles = [ [ "name" => 'Kim Parsell', "link" => "https://google.com" ], [ "name" => 'Alex King', "link" => "https://google.com" ], [ "name" => 'Jesse Petersen', "link" => "https://google.com" ], [ "name" => 'Efrain Rivera', "link" => "https://google.com" ] ]; $columns = $attributes['columns']; $group_count = ceil( count( $profiles ) / $columns ); @@ -52,12 +52,12 @@ function render( $attributes, $content, $block ) { foreach ( $groups as $group ) { $block_content .= '
'; - foreach ( $group as $name ) { + foreach ( $group as $profile ) { $block_content .= '
'; $block_content .= ''; $block_content .= '

'; $block_content .= ''; - $block_content .= '' . esc_html( $name ) . ''; + $block_content .= '' . esc_html( $profile["name"] ) . ''; $block_content .= ''; $block_content .= '

'; $block_content .= ''; From 4162d7ae10f9fa5f8125ea13571f2cfcf26130cd Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Wed, 8 Nov 2023 15:03:04 +0900 Subject: [PATCH 04/13] Update icon. --- .../themes/wporg-main-2022/src/remembers-list/block.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/block.json b/source/wp-content/themes/wporg-main-2022/src/remembers-list/block.json index d5df7a85..4123cca3 100644 --- a/source/wp-content/themes/wporg-main-2022/src/remembers-list/block.json +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/block.json @@ -5,7 +5,7 @@ "version": "0.1.0", "title": "Remembers Contributor List", "category": "design", - "icon": "heading", + "icon": "list-view", "description": "Remembers Contributor List", "textdomain": "wporg", "attributes": { From 6bab98ce50c4a8a15c51cb3b0b980d885ec635bc Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Wed, 8 Nov 2023 15:10:19 +0900 Subject: [PATCH 05/13] Add a control to allow columns to be changed. --- .../src/remembers-list/edit.js | 19 ++++++++++++++++--- .../src/remembers-list/style.scss | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/edit.js b/source/wp-content/themes/wporg-main-2022/src/remembers-list/edit.js index bbd0bf80..e0cc2128 100644 --- a/source/wp-content/themes/wporg-main-2022/src/remembers-list/edit.js +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/edit.js @@ -2,13 +2,26 @@ * WordPress dependencies */ -import { useBlockProps } from '@wordpress/block-editor'; -import { Disabled } from '@wordpress/components'; +import { Disabled, PanelBody, RangeControl } from '@wordpress/components'; import ServerSideRender from '@wordpress/server-side-render'; +import { InspectorControls, useBlockProps } from '@wordpress/block-editor'; +import { __ } from '@wordpress/i18n'; -export default function Edit( { attributes, name } ) { +export default function Edit( { attributes, name, setAttributes } ) { + const { columns } = attributes; return (
+ + + setAttributes( { columns: parseInt( newNumber ) } ) } + min={ Math.max( 1, 1 ) } + max={ Math.max( 6, 10 ) } + /> + + diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss b/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss index 9fc08c78..9d66299c 100644 --- a/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss @@ -7,4 +7,4 @@ color: var(--wp--custom--link--color--text); text-decoration: underline; } -} \ No newline at end of file +} From 6f4e99ef73f67fbd9c50a74d9c0018180e8ce126 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Wed, 8 Nov 2023 15:11:29 +0900 Subject: [PATCH 06/13] Update the description. --- .../themes/wporg-main-2022/src/remembers-list/block.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/block.json b/source/wp-content/themes/wporg-main-2022/src/remembers-list/block.json index 4123cca3..21cc7bb9 100644 --- a/source/wp-content/themes/wporg-main-2022/src/remembers-list/block.json +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/block.json @@ -6,7 +6,7 @@ "title": "Remembers Contributor List", "category": "design", "icon": "list-view", - "description": "Remembers Contributor List", + "description": "Displays a list of memorialized contributors.", "textdomain": "wporg", "attributes": { "columns": { From 257a13eb3d5e276c0c70172d6d7833cd00eff05e Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 24 Nov 2023 09:30:19 +0900 Subject: [PATCH 07/13] Connect using function. --- .../wporg-main-2022/src/remembers-list/index.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php index a2ef8b0f..05c71f1d 100644 --- a/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php @@ -8,6 +8,8 @@ namespace WordPressdotorg\Theme\Main_2022\Remembers_List_Block; +use function WordPressdotorg\MemorialProfiles\get_memorial_profiles; + add_action( 'init', __NAMESPACE__ . '\init' ); /** @@ -37,8 +39,11 @@ function init() { */ function render( $attributes, $content, $block ) { - // Replace with query - $profiles = [ [ "name" => 'Kim Parsell', "link" => "https://google.com" ], [ "name" => 'Alex King', "link" => "https://google.com" ], [ "name" => 'Jesse Petersen', "link" => "https://google.com" ], [ "name" => 'Efrain Rivera', "link" => "https://google.com" ] ]; + if ( ! function_exists( 'get_memorial_profiles' ) ) { + return __('Memorial Profiles plugin is not active.', 'wporg'); + } + + $profiles = get_memorial_profiles(); $columns = $attributes['columns']; $group_count = ceil( count( $profiles ) / $columns ); @@ -57,7 +62,7 @@ function render( $attributes, $content, $block ) { $block_content .= ''; $block_content .= '

'; $block_content .= ''; - $block_content .= '' . esc_html( $profile["name"] ) . ''; + $block_content .= '' . esc_html( $profile->display_name ) . ''; $block_content .= ''; $block_content .= '

'; $block_content .= ''; From 97af779c736cbc89a69f96ed182d359b30fb9dae Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 24 Nov 2023 09:33:27 +0900 Subject: [PATCH 08/13] Fix linting errors. --- .../themes/wporg-main-2022/src/remembers-list/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php index 05c71f1d..7f000075 100644 --- a/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php @@ -40,7 +40,7 @@ function init() { function render( $attributes, $content, $block ) { if ( ! function_exists( 'get_memorial_profiles' ) ) { - return __('Memorial Profiles plugin is not active.', 'wporg'); + return __( 'Memorial Profiles plugin is not active.', 'wporg' ); } $profiles = get_memorial_profiles(); @@ -62,7 +62,7 @@ function render( $attributes, $content, $block ) { $block_content .= ''; $block_content .= '

'; $block_content .= ''; - $block_content .= '' . esc_html( $profile->display_name ) . ''; + $block_content .= '' . esc_html( $profile->display_name ) . ''; $block_content .= ''; $block_content .= '

'; $block_content .= ''; From 3855177b1546b144d55ea24bc8b1ef8d963bcac0 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 24 Nov 2023 11:18:22 +0900 Subject: [PATCH 09/13] Make control respond better. --- .../wporg-main-2022/src/remembers-list/index.php | 11 +++++------ .../wporg-main-2022/src/remembers-list/style.scss | 6 ++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php index 7f000075..2d650c51 100644 --- a/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php @@ -8,8 +8,6 @@ namespace WordPressdotorg\Theme\Main_2022\Remembers_List_Block; -use function WordPressdotorg\MemorialProfiles\get_memorial_profiles; - add_action( 'init', __NAMESPACE__ . '\init' ); /** @@ -39,11 +37,11 @@ function init() { */ function render( $attributes, $content, $block ) { - if ( ! function_exists( 'get_memorial_profiles' ) ) { - return __( 'Memorial Profiles plugin is not active.', 'wporg' ); + if ( ! function_exists( '\WordPressdotorg\MemorialProfiles\get_profiles' ) ) { + return __( 'Memorial Profiles mu-plugin is missing.', 'wporg' ); } - $profiles = get_memorial_profiles(); + $profiles = \WordPressdotorg\MemorialProfiles\get_profiles(); $columns = $attributes['columns']; $group_count = ceil( count( $profiles ) / $columns ); @@ -55,7 +53,8 @@ function render( $attributes, $content, $block ) { $block_content = ''; foreach ( $groups as $group ) { - $block_content .= '
'; + // Set isStackedOnMobile to false so that the columns are not stacked on mobile. We override this in CSS to stack them. + $block_content .= '
'; foreach ( $group as $profile ) { $block_content .= '
'; diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss b/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss index 9d66299c..15c86c15 100644 --- a/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/style.scss @@ -8,3 +8,9 @@ text-decoration: underline; } } + +@media ( max-width: 500px) { + .wp-block-wporg-remembers-list .wp-block-columns { + flex-direction: column !important; + } +} From 41c904cec78300ccd223af12beaabfdae4954a1c Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Mon, 27 Nov 2023 09:58:37 +0900 Subject: [PATCH 10/13] Update the remembers blocks. --- .../wporg-main-2022/src/remembers-list/index.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php index 2d650c51..f48300a3 100644 --- a/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php +++ b/source/wp-content/themes/wporg-main-2022/src/remembers-list/index.php @@ -43,10 +43,10 @@ function render( $attributes, $content, $block ) { $profiles = \WordPressdotorg\MemorialProfiles\get_profiles(); - $columns = $attributes['columns']; + $columns = $attributes['columns']; $group_count = ceil( count( $profiles ) / $columns ); - $groups = []; + $groups = array(); for ( $i = 0; $i < $group_count; $i++ ) { $groups[] = array_slice( $profiles, $i * $columns, $columns ); } @@ -58,10 +58,10 @@ function render( $attributes, $content, $block ) { foreach ( $group as $profile ) { $block_content .= '
'; - $block_content .= ''; - $block_content .= '

'; + $block_content .= ''; + $block_content .= '

'; $block_content .= ''; - $block_content .= '' . esc_html( $profile->display_name ) . ''; + $block_content .= '' . esc_html( $profile->display_name ) . ''; $block_content .= ''; $block_content .= '

'; $block_content .= ''; @@ -73,7 +73,7 @@ function render( $attributes, $content, $block ) { $wrapper_attributes = get_block_wrapper_attributes(); return sprintf( - '

%2$s

', + '
%2$s
', $wrapper_attributes, do_blocks( $block_content ) ); From 428f654143784c23fd50f78793433d695d84dfad Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Mon, 27 Nov 2023 10:25:55 +0900 Subject: [PATCH 11/13] Update template spacing. --- .../wporg-main-2022/patterns/remembers.php | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/source/wp-content/themes/wporg-main-2022/patterns/remembers.php b/source/wp-content/themes/wporg-main-2022/patterns/remembers.php index cfde1411..041fd8e8 100644 --- a/source/wp-content/themes/wporg-main-2022/patterns/remembers.php +++ b/source/wp-content/themes/wporg-main-2022/patterns/remembers.php @@ -10,8 +10,8 @@

- -
+ +

@@ -20,18 +20,21 @@
- -
- -

❦

- + +
+ +

❦

+
+ -
- -

❦

- - -

This memorial is volunteer maintained and managed. To add a tribute for a lost contributor please contact us: memorials@wordpress.org

+ + +

❦

- + + +
+

memorials@wordpress.org', 'wporg' ); ?>

+
+ \ No newline at end of file From 92adb8a5ae82fa7b265468850ed574c2200f6b46 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Mon, 27 Nov 2023 10:48:36 +0900 Subject: [PATCH 12/13] Add newline chracter. --- source/wp-content/themes/wporg-main-2022/patterns/remembers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/wp-content/themes/wporg-main-2022/patterns/remembers.php b/source/wp-content/themes/wporg-main-2022/patterns/remembers.php index 041fd8e8..bf7bf69d 100644 --- a/source/wp-content/themes/wporg-main-2022/patterns/remembers.php +++ b/source/wp-content/themes/wporg-main-2022/patterns/remembers.php @@ -37,4 +37,4 @@

memorials@wordpress.org', 'wporg' ); ?>

- \ No newline at end of file + From f4f7b5c3028a7428638d3c22acbfeff602f710e7 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Mon, 27 Nov 2023 11:14:02 +0900 Subject: [PATCH 13/13] Add some padding to the remember list content. --- .../wp-content/themes/wporg-main-2022/patterns/remembers.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/wp-content/themes/wporg-main-2022/patterns/remembers.php b/source/wp-content/themes/wporg-main-2022/patterns/remembers.php index bf7bf69d..f342ae24 100644 --- a/source/wp-content/themes/wporg-main-2022/patterns/remembers.php +++ b/source/wp-content/themes/wporg-main-2022/patterns/remembers.php @@ -27,7 +27,10 @@
+ +
+

❦