Changeset 15510

Timestamp:

11/06/2026 10:25:21 PM (4 days ago)

Author:

obenland

Message:

WordPress.tv: Use the WordPress.org global footer in wptv-27

Closes ​https://github.com/WordPress/wordpress.org/pull/1203.

Location:

sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv-27

Files:

• assets (deleted)
• functions.php (modified) (1 diff)
• inc/global-footer.php (added)
• inc/setup.php (modified) (2 diffs)
• inc/single.php (modified) (1 diff)
• parts/footer.html (modified) (1 diff)
• patterns (deleted)
• style.css (modified) (3 diffs)

sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv-27/functions.php

@@ -33 +33 @@
 require_once WPTV_THEME_DIR . '/inc/publishing.php';
 require_once WPTV_THEME_DIR . '/inc/open-graph.php';
+require_once WPTV_THEME_DIR . '/inc/global-footer.php';
 require_once WPTV_THEME_DIR . '/inc/redirects.php';
 require_once WPTV_THEME_DIR . '/inc/maintenance.php';

sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv-27/inc/setup.php

@@ -20 +20 @@
         add_editor_style( 'style.css' );
 
-        // Same location names as wptv2, so the assigned menus survive switching between both themes.
+        // Same location name as wptv2, so the assigned menu survives switching between both themes.
         register_nav_menus(
                 array(
                         'primary' => __( 'Primary Menu', 'wptv' ),
-                        'footer'  => __( 'Footer Menu', 'wptv' ),
                 )
         );
@@ -84 +83 @@
 }
 add_filter( 'render_block_data', __NAMESPACE__ . '\primary_menu_links' );
-
-/**
- * Fills the footer "Contribute" list with the classic menu assigned to `footer`.
- *
- * Only top-level items are shown, as wptv2's footer menu (depth 1). Links to
- * other sites get the decorative arrow the footer design uses. Without an
- * assigned menu, or with an empty one, the pattern's own links are kept.
- *
- * @param string $content Rendered List block.
- * @param array  $block   Parsed block.
- * @return string
- */
-function footer_menu_links( $content, $block ) {
-        $classes = preg_split( '/\s+/', $block['attrs']['className'] ?? '' );
-        if ( ! in_array( 'wptv-footer__contribute', $classes, true ) || ! preg_match( '/^\s*(<ul\b[^>]*>)/', $content, $opening ) ) {
-                return $content;
-        }
-
-        $locations = get_nav_menu_locations();
-        $menu      = wp_get_nav_menu_object( $locations['footer'] ?? 0 );
-        $items     = $menu ? wp_get_nav_menu_items( $menu->term_id ) : array();
-        if ( ! $items ) {
-                return $content;
-        }
-
-        $home_host = wp_parse_url( home_url(), PHP_URL_HOST );
-        $links     = '';
-        foreach ( $items as $item ) {
-                if ( (int) $item->menu_item_parent ) {
-                        continue;
-                }
-                $host   = wp_parse_url( $item->url, PHP_URL_HOST );
-                $arrow  = ( $host && $host !== $home_host ) ? ' <span aria-hidden="true">↗</span>' : '';
-                $target = $item->target ? ' target="' . esc_attr( $item->target ) . '" rel="noopener"' : '';
-                $links .= '<li><a href="' . esc_url( $item->url ) . '"' . $target . '>' . esc_html( $item->title ) . $arrow . '</a></li>';
-        }
-
-        return $links ? $opening[1] . $links . '</ul>' : $content;
-}
-add_filter( 'render_block_core/list', __NAMESPACE__ . '\footer_menu_links', 10, 2 );
 
 /**

sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv-27/inc/single.php

@@ -41 +41 @@
 }
 add_filter( 'render_block_core/post-excerpt', __NAMESPACE__ . '\\full_description', 10, 3 );
+
+// The pattern's Sharing Buttons block replaces Jetpack's classic buttons, which would add two more rows.
+add_filter( 'sharing_show', '__return_false' );

sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv-27/parts/footer.html

@@ -1 @@
-<!-- wp:pattern {"slug":"wptv/footer"} /-->
+<!-- wp:wptv/global-footer /-->

sites/trunk/wordpress.tv/public_html/wp-content/themes/wptv-27/style.css

@@ -27 +27 @@
 .wp-site-blocks main { padding-block: var(--wp--preset--spacing--60); }
 .wp-site-blocks main.is-flush { padding-block: 0; }
+.wp-site-blocks main.wptv-single { padding-block-end: var(--wp--preset--spacing--60); }
 :where(.wp-block-group, .wp-block-column, .wp-block-post, .wp-block-query) { min-width: 0; }
 :where(input:not([type="submit"]):not([type="checkbox"]):not([type="radio"]), textarea, select) {
@@ -71 +72 @@
 .wptv-header .is-menu-open .wp-block-navigation-item { padding-block: 12px; border-bottom: 1px solid var(--wp--preset--color--light-grey-1); }
 .wptv-header .is-menu-open .wp-block-search { width: 100%; }
-.wptv-footer { padding-block: var(--wp--preset--spacing--50) var(--wp--preset--spacing--30); font-size: var(--wp--preset--font-size--small); }
-.wptv-footer a { color: var(--wp--preset--color--white); text-decoration: none; }
-.wptv-footer a:hover { text-decoration: underline; }
-.wptv-footer a:focus { outline-color: var(--wp--preset--color--blueberry-2); }
-.wptv-footer__heading { font: 600 var(--wp--preset--font-size--small)/1.625 var(--wp--preset--font-family--inter); color: var(--wp--preset--color--white); }
-.wptv-footer__columns { gap: 30px; }
-.wptv-footer__columns > .wp-block-column:first-child { flex-grow: 2; }
-.wptv-footer__links { list-style: none; padding: 0; }
-.wptv-footer__links li + li { margin-top: 8px; }
-.wptv-footer__license { border-top: 1px solid var(--wp--preset--color--white-opacity-15); margin-top: var(--wp--preset--spacing--40); padding-top: var(--wp--preset--spacing--20); gap: 20px; }
-.wptv-footer .wp-block-site-title { font-family: var(--wp--preset--font-family--inter); font-size: var(--wp--preset--font-size--large); }
-.wptv-footer__wporg { margin: 0; }
-.wptv-footer .wp-block-site-title + p,
-.wptv-footer .wptv-footer__wporg + p { margin-block-start: 0; }
-.wptv-footer__wporg img { display: block; width: auto; max-width: 100%; height: 27px; }
+.global-footer a:focus { outline-color: var(--wp--preset--color--blueberry-2); }
+.global-footer a[href="https://wordpress.tv/"] [aria-hidden="true"] { display: none; }
 /* === cards === */
 .is-style-cards-grid { gap: var(--wp--preset--spacing--20); }
@@ -231 +219 @@
 }
 @media (max-width: 781px) {
-        .wptv-footer .wptv-footer__columns { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); }
-        .wptv-footer__columns > .wp-block-column:first-child { grid-column: 1 / -1; }
         .wptv-home__section-heading { align-items: start; }
 }