diff --git a/source/wp-content/themes/wporg-main-2022/functions.php b/source/wp-content/themes/wporg-main-2022/functions.php index 50c80ed0..cf159651 100644 --- a/source/wp-content/themes/wporg-main-2022/functions.php +++ b/source/wp-content/themes/wporg-main-2022/functions.php @@ -19,6 +19,7 @@ /** * Actions and filters. */ +add_filter( 'document_title_parts', __NAMESPACE__ . '\document_title' ); add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\enqueue_assets' ); add_action( 'init', __NAMESPACE__ . '\register_shortcodes' ); add_filter( 'wp_img_tag_add_loading_attr', __NAMESPACE__ . '\override_lazy_loading', 10, 2 ); @@ -27,6 +28,12 @@ add_filter( 'render_block_data', __NAMESPACE__ . '\update_header_template_part_class' ); add_filter( 'wporg_block_navigation_menus', __NAMESPACE__ . '\add_site_navigation_menus' ); +// Remove table of contents. +add_filter( 'wporg_handbook_toc_should_add_toc', '__return_false' ); + +// Remove the edit link from handbook titles. +add_filter( 'wporg_markdown_should_filter_title', '__return_false' ); + /** * Enqueue scripts and styles. */ @@ -138,6 +145,25 @@ function override_lazy_loading( $value, $image ) { * Use the page heirarchy to display breadcrumbs. */ function update_site_breadcrumbs( $breadcrumbs ) { + + // Handle breadcrumbs for the data liberation section. + if ( is_singular( 'and-handbook' ) ) { + return array( + array( + 'url' => home_url( '/data-liberation' ), + 'title' => __( 'Home', 'wporg' ), + ), + array( + 'url' => home_url( '/data-liberation/and' ), + 'title' => __( 'Guides', 'wporg' ), + ), + array( + 'url' => false, + 'title' => get_the_title(), + ), + ); + } + $parent = get_post_parent(); if ( ! $parent ) { return $breadcrumbs; @@ -263,6 +289,16 @@ function add_site_navigation_menus( $menus ) { * @param WP_Block $instance The block instance. */ function use_parent_page_title( $block_content, $block, $instance ) { + + // Handle the site title for data liberation. + if ( is_post_type_archive( 'and-handbook' ) || is_singular( 'and-handbook' ) ) { + return str_replace( + array( home_url(), get_bloginfo( 'name' ) ), + array( home_url( '/data-liberation' ), __( 'Data Liberation', 'wporg' ) ), + $block_content + ); + } + if ( is_home() || is_single() || is_archive() ) { return str_replace( array( home_url(), get_bloginfo( 'name' ) ), @@ -323,3 +359,26 @@ function update_header_template_part_class( $block ) { } return $block; } + +/** + * Append an optimized site name. + * + * @param array $parts { + * The document title parts. + * + * @type string $title Title of the viewed page. + * @type string $page Optional. Page number if paginated. + * @type string $tagline Optional. Site description when on home page. + * @type string $site Optional. Site title when not on home page. + * } + * @return array Filtered title parts. + */ +function document_title( $parts ) { + + if ( is_singular( 'and-handbook' ) ) { + // translators: %s: Name of the guide. + $parts['title'] = sprintf( __( '%s - Data Liberation', 'wporg' ), $parts['title'] ); + } + + return $parts; +} diff --git a/source/wp-content/themes/wporg-main-2022/patterns/_nav-data-liberation-single.php b/source/wp-content/themes/wporg-main-2022/patterns/_nav-data-liberation-single.php new file mode 100644 index 00000000..5748ad93 --- /dev/null +++ b/source/wp-content/themes/wporg-main-2022/patterns/_nav-data-liberation-single.php @@ -0,0 +1,15 @@ + + + + +
+ +
diff --git a/source/wp-content/themes/wporg-main-2022/patterns/_nav-data-liberation.php b/source/wp-content/themes/wporg-main-2022/patterns/_nav-data-liberation.php new file mode 100644 index 00000000..b6d3322b --- /dev/null +++ b/source/wp-content/themes/wporg-main-2022/patterns/_nav-data-liberation.php @@ -0,0 +1,14 @@ + + + + + + diff --git a/source/wp-content/themes/wporg-main-2022/patterns/data-liberation-guides-single.php b/source/wp-content/themes/wporg-main-2022/patterns/data-liberation-guides-single.php new file mode 100644 index 00000000..b3ebd37a --- /dev/null +++ b/source/wp-content/themes/wporg-main-2022/patterns/data-liberation-guides-single.php @@ -0,0 +1,19 @@ + + +
+
+ + + + + +
+
+ diff --git a/source/wp-content/themes/wporg-main-2022/patterns/data-liberation-guides.php b/source/wp-content/themes/wporg-main-2022/patterns/data-liberation-guides.php new file mode 100644 index 00000000..92520023 --- /dev/null +++ b/source/wp-content/themes/wporg-main-2022/patterns/data-liberation-guides.php @@ -0,0 +1,38 @@ + + + +
+
+

Guides

+ + + +
+
+
+ +
+ +
+ +
+ + + + + + + + +
+
+
+
+ diff --git a/source/wp-content/themes/wporg-main-2022/patterns/data-liberation.php b/source/wp-content/themes/wporg-main-2022/patterns/data-liberation.php index 1bc119e1..560cbdac 100644 --- a/source/wp-content/themes/wporg-main-2022/patterns/data-liberation.php +++ b/source/wp-content/themes/wporg-main-2022/patterns/data-liberation.php @@ -30,56 +30,56 @@
- +

Squarespace to WordPress', 'wporg' ); ?>

- +

Tumblr to WordPress', 'wporg' ); ?>

- +

- +

- +

Wix to WordPress', 'wporg' ); ?>

- +

Drupal to WordPress', 'wporg' ); ?>

- +

- +

-

View all guides', 'wporg' ); ?>

+

diff --git a/source/wp-content/themes/wporg-main-2022/src/style/style.scss b/source/wp-content/themes/wporg-main-2022/src/style/style.scss index 9c35a7d1..74200ef3 100644 --- a/source/wp-content/themes/wporg-main-2022/src/style/style.scss +++ b/source/wp-content/themes/wporg-main-2022/src/style/style.scss @@ -621,6 +621,10 @@ $wporg-about-breakpoint-max: 1920px; text-decoration: none; } +.single-and-handbook img { + width: 100%; +} + /* * Workaround for Gutenberg CSS4 selectors on older browsers. * diff --git a/source/wp-content/themes/wporg-main-2022/templates/archive-and-handbook.html b/source/wp-content/themes/wporg-main-2022/templates/archive-and-handbook.html new file mode 100644 index 00000000..edd68381 --- /dev/null +++ b/source/wp-content/themes/wporg-main-2022/templates/archive-and-handbook.html @@ -0,0 +1,11 @@ + + + + + +
+ +
+ + + diff --git a/source/wp-content/themes/wporg-main-2022/templates/single-and-handbook.html b/source/wp-content/themes/wporg-main-2022/templates/single-and-handbook.html new file mode 100644 index 00000000..32f42bbd --- /dev/null +++ b/source/wp-content/themes/wporg-main-2022/templates/single-and-handbook.html @@ -0,0 +1,12 @@ + + + + + + +
+ +
+ + + diff --git a/source/wp-content/themes/wporg-main-2022/theme.json b/source/wp-content/themes/wporg-main-2022/theme.json index cf914f28..30a70177 100644 --- a/source/wp-content/themes/wporg-main-2022/theme.json +++ b/source/wp-content/themes/wporg-main-2022/theme.json @@ -20,6 +20,15 @@ "name": "Newsreader" } ] + }, + "custom": { + "wporg-sidebar-container": { + "spacing": { + "margin": { + "top": "150px" + } + } + } } }, "styles": {