diff --git a/source/wp-content/themes/wporg-main-2022/functions.php b/source/wp-content/themes/wporg-main-2022/functions.php index 50c80ed0..ecd6d73f 100644 --- a/source/wp-content/themes/wporg-main-2022/functions.php +++ b/source/wp-content/themes/wporg-main-2022/functions.php @@ -164,73 +164,91 @@ function update_site_breadcrumbs( $breadcrumbs ) { * Provide a list of local navigation menus. */ function add_site_navigation_menus( $menus ) { - return array( - 'about-details' => array( - array( - 'label' => __( 'Domains', 'wporg' ), - 'url' => '/about/domains/', - ), - array( - 'label' => __( 'License', 'wporg' ), - 'url' => '/about/license/', - ), - array( - 'label' => __( 'Accessibility', 'wporg' ), - 'url' => '/about/accessibility/', - ), - array( - 'label' => __( 'Privacy Policy', 'wporg' ), - 'url' => '/about/privacy/', - ), - array( - 'label' => __( 'Statistics', 'wporg' ), - 'url' => '/about/stats/', - ), + $about_details = array( + array( + 'label' => __( 'Domains', 'wporg' ), + 'url' => '/about/domains/', ), - 'about-technology' => array( - array( - 'label' => __( 'Requirements', 'wporg' ), - 'url' => '/about/requirements/', - ), - array( - 'label' => __( 'Features', 'wporg' ), - 'url' => '/about/features/', - ), - array( - 'label' => __( 'Security', 'wporg' ), - 'url' => '/about/security/', - ), - array( - 'label' => __( 'Roadmap', 'wporg' ), - 'url' => '/about/roadmap/', - ), - array( - 'label' => __( 'History', 'wporg' ), - 'url' => '/about/history/', - ), + array( + 'label' => __( 'License', 'wporg' ), + 'url' => '/about/license/', ), - 'about-people' => array( - array( - 'label' => __( 'Philosophy', 'wporg' ), - 'url' => '/about/philosophy/', - ), - array( - 'label' => __( 'Etiquette', 'wporg' ), - 'url' => '/about/etiquette/', - ), - array( - 'label' => __( 'Swag', 'wporg' ), - 'url' => 'https://mercantile.wordpress.org/', - ), - array( - 'label' => __( 'Logos', 'wporg' ), - 'url' => '/about/logos/', - ), - array( - 'label' => __( 'People of WordPress', 'wporg' ), - 'url' => 'https://wordpress.org/news/category/community/', - ), + array( + 'label' => __( 'Accessibility', 'wporg' ), + 'url' => '/about/accessibility/', + ), + array( + 'label' => __( 'Privacy Policy', 'wporg' ), + 'url' => '/about/privacy/', + ), + array( + 'label' => __( 'Statistics', 'wporg' ), + 'url' => '/about/stats/', + ), + ); + $about_technology = array( + array( + 'label' => __( 'Requirements', 'wporg' ), + 'url' => '/about/requirements/', + ), + array( + 'label' => __( 'Features', 'wporg' ), + 'url' => '/about/features/', + ), + array( + 'label' => __( 'Security', 'wporg' ), + 'url' => '/about/security/', + ), + array( + 'label' => __( 'Roadmap', 'wporg' ), + 'url' => '/about/roadmap/', + ), + array( + 'label' => __( 'History', 'wporg' ), + 'url' => '/about/history/', + ), + ); + $about_people = array( + array( + 'label' => __( 'Philosophy', 'wporg' ), + 'url' => '/about/philosophy/', + ), + array( + 'label' => __( 'Etiquette', 'wporg' ), + 'url' => '/about/etiquette/', + ), + array( + 'label' => __( 'Swag', 'wporg' ), + 'url' => 'https://mercantile.wordpress.org/', ), + array( + 'label' => __( 'Logos', 'wporg' ), + 'url' => '/about/logos/', + ), + array( + 'label' => __( 'People of WordPress', 'wporg' ), + 'url' => 'https://wordpress.org/news/category/community/', + ), + ); + $about_home = array( + array( + 'label' => __( 'The technology', 'wporg' ), + 'submenu' => $about_technology, + ), + array( + 'label' => __( 'The details', 'wporg' ), + 'submenu' => $about_details, + ), + array( + 'label' => __( 'The people', 'wporg' ), + 'submenu' => $about_people, + ), + ); + return array( + 'about-home' => $about_home, + 'about-details' => $about_details, + 'about-technology' => $about_technology, + 'about-people' => $about_people, 'download' => array( array( 'label' => __( 'Releases', 'wporg' ), @@ -271,6 +289,14 @@ function use_parent_page_title( $block_content, $block, $instance ) { ); } + if ( is_page( 'about' ) ) { + return str_replace( + array( home_url(), get_bloginfo( 'name' ) ), + array( home_url( '/about/' ), __( 'About', 'wporg' ) ), + $block_content + ); + } + $parent = get_post_parent(); if ( ! $parent ) { return $block_content; diff --git a/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-home.php b/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-home.php new file mode 100644 index 00000000..934ce8a0 --- /dev/null +++ b/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-home.php @@ -0,0 +1,14 @@ + + + + + + diff --git a/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-people.php b/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-people.php deleted file mode 100644 index 3fc18b97..00000000 --- a/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-people.php +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-details.php b/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-subpage.php similarity index 71% rename from source/wp-content/themes/wporg-main-2022/patterns/_nav-about-details.php rename to source/wp-content/themes/wporg-main-2022/patterns/_nav-about-subpage.php index 89ec99a7..14e8de2c 100644 --- a/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-details.php +++ b/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-subpage.php @@ -1,8 +1,8 @@ - + diff --git a/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-technology.php b/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-technology.php deleted file mode 100644 index 98d1d132..00000000 --- a/source/wp-content/themes/wporg-main-2022/patterns/_nav-about-technology.php +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-about.html b/source/wp-content/themes/wporg-main-2022/templates/page-about.html index 4f2aeee9..57ceb972 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-about.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-about.html @@ -1,5 +1,7 @@ + +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-accessibility.html b/source/wp-content/themes/wporg-main-2022/templates/page-accessibility.html index 417effee..bfab090b 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-accessibility.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-accessibility.html @@ -1,6 +1,6 @@ - +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-domains.html b/source/wp-content/themes/wporg-main-2022/templates/page-domains.html index 9a56053a..16c1d90c 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-domains.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-domains.html @@ -1,6 +1,6 @@ - +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-etiquette.html b/source/wp-content/themes/wporg-main-2022/templates/page-etiquette.html index 9922e920..e390649a 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-etiquette.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-etiquette.html @@ -1,6 +1,6 @@ - +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-features.html b/source/wp-content/themes/wporg-main-2022/templates/page-features.html index 30a25cba..90f114a6 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-features.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-features.html @@ -1,6 +1,6 @@ - +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-history.html b/source/wp-content/themes/wporg-main-2022/templates/page-history.html index 29c1afb0..fc491d82 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-history.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-history.html @@ -1,6 +1,6 @@ - +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-license.html b/source/wp-content/themes/wporg-main-2022/templates/page-license.html index 34a6696e..28873875 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-license.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-license.html @@ -1,6 +1,6 @@ - +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-logos.html b/source/wp-content/themes/wporg-main-2022/templates/page-logos.html index 23a13a3d..31eebec6 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-logos.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-logos.html @@ -1,6 +1,6 @@ - +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-philosophy.html b/source/wp-content/themes/wporg-main-2022/templates/page-philosophy.html index b7964062..53176e10 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-philosophy.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-philosophy.html @@ -1,6 +1,6 @@ - +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-privacy.html b/source/wp-content/themes/wporg-main-2022/templates/page-privacy.html index 38c5a202..dc473e9e 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-privacy.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-privacy.html @@ -1,6 +1,6 @@ - +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-requirements.html b/source/wp-content/themes/wporg-main-2022/templates/page-requirements.html index 928c83ad..44d40d27 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-requirements.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-requirements.html @@ -1,6 +1,6 @@ - +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-roadmap.html b/source/wp-content/themes/wporg-main-2022/templates/page-roadmap.html index af2a9a7e..a23702d2 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-roadmap.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-roadmap.html @@ -1,6 +1,6 @@ - +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-security.html b/source/wp-content/themes/wporg-main-2022/templates/page-security.html index 1830569c..9606eda8 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-security.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-security.html @@ -1,6 +1,6 @@ - +
diff --git a/source/wp-content/themes/wporg-main-2022/templates/page-stats.html b/source/wp-content/themes/wporg-main-2022/templates/page-stats.html index 52d082b3..2540035e 100644 --- a/source/wp-content/themes/wporg-main-2022/templates/page-stats.html +++ b/source/wp-content/themes/wporg-main-2022/templates/page-stats.html @@ -1,6 +1,6 @@ - +