<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14195] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024: Breathe 2024: Use Make home link on sites in local nav</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/14195">14195</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/14195","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>adamwood</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-11-24 23:49:33 +0000 (Sun, 24 Nov 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Breathe 2024: Use Make home link on sites in local nav
On the project and updates sites, update the text and link for the site title in the local nav, so that it appears as if pages from these sites belong to the home site, and not separate blogs.
See https://github.com/WordPress/wporg-make/issues/34</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgbreathe2024functionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgbreathe2024headerphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/header.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/patterns/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgbreathe2024functionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/functions.php 2024-11-22 16:31:10 UTC (rev 14194)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/functions.php 2024-11-24 23:49:33 UTC (rev 14195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,19 +171,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Register patterns from the patterns directory.
- */
-function wporg_breathe_register_patterns() {
- $pattern_directory = new \DirectoryIterator( get_stylesheet_directory() . '/patterns/' );
- foreach ( $pattern_directory as $file ) {
- if ( $file->isFile() ) {
- require $file->getPathname();
- }
- }
-}
-add_action( 'init', __NAMESPACE__ . '\wporg_breathe_register_patterns' );
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Get the primary navigation menu object if it exists.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_breathe_get_local_nav_menu_object() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,3 +677,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- #<?php echo esc_html( $nav_id ); ?> -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Modify rendering of the site-title block.
+ * Insert the team icon before the anchor tag, if it exists.
+ *
+ * On the project and updates sites, update the text and link so that in the local nav
+ * it appears as if pages from these sites belong to the home site, and not separate blogs.
+ */
+function modify_site_title_block( $block_content, $block ) {
+ ob_start();
+ do_action('wporg_breathe_before_name', 'front');
+ $icon = ob_get_clean();
+
+ // Insert the icon inside the anchor tag, before the text
+ $block_content = preg_replace(
+ '/(<a\b[^>]*>)(.*?)(<\/a>)/',
+ '$1' . $icon . '$2$3',
+ $block_content
+ );
+
+ $site = get_site();
+ // On the project and updates sites replace the link with a Make home page link
+ if ( '/project/' === $site->path || '/updates/' === $site->path ) {
+ $make_home_url = 'https://' . $site->domain;
+ $block_content = preg_replace(
+ '/<a\b[^>]*>(.*?)<\/a>/',
+ '<a target="_self" rel="home" href="' . esc_url( $make_home_url ) . '">' .
+ esc_html__( 'Make WordPress', 'wporg-breathe' ) .
+ '</a>',
+ $block_content
+ );
+ }
+
+ return $block_content;
+}
+add_filter( 'render_block_core/site-title', __NAMESPACE__ . '\modify_site_title_block', 10, 2 );
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgbreathe2024headerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/header.php 2024-11-22 16:31:10 UTC (rev 14194)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/header.php 2024-11-24 23:49:33 UTC (rev 14195)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,9 +5,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo do_blocks( '<!-- wp:wporg/global-header {"style":{"border":{"bottom":{"color":"var:preset|color|white-opacity-15","style":"solid","width":"1px"}}}} /-->' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_front_page() && is_home() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo do_blocks( '<!-- wp:pattern {"slug":"wporg-breathe/local-nav-home"} /-->' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo do_blocks( '<!-- wp:wporg/local-navigation-bar {"className":"has-display-contents","backgroundColor":"charcoal-2","style":{"elements":{"link":{"color":{"text":"var:preset|color|white"},":hover":{"color":{"text":"var:preset|color|white"}}}}},"textColor":"white","fontSize":"small"} -->
+
+ <!-- wp:site-title {"style":{"typography":{"fontStyle":"normal","fontWeight":"400"}},"fontSize":"small","fontFamily":"inter"} /-->
+
+ <!-- wp:navigation {"icon":"menu","overlayBackgroundColor":"charcoal-2","overlayTextColor":"white","layout":{"type":"flex","orientation":"horizontal"},"fontSize":"small","menuSlug":"breathe"} /-->
+
+ <!-- /wp:wporg/local-navigation-bar -->' );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo do_blocks( '<!-- wp:pattern {"slug":"wporg-breathe/local-nav"} /-->' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * On the project and updates sites, update the text and link for the site title so that
+ * it appears as if pages from these sites belong to the home site, and not separate blogs.
+ */
+ $site = get_site();
+ $make_home_url = 'https://' . $site->domain;
+ $is_updates_or_project = '/updates/' === $site->path || '/project/' === $site->path;
+
+ ob_start();
+ do_action('wporg_breathe_before_name', 'nonfront');
+ $before_name = ob_get_clean();
+
+ echo do_blocks(
+ sprintf(
+ '<!-- wp:wporg/local-navigation-bar {"className":"has-display-contents","backgroundColor":"charcoal-2","style":{"elements":{"link":{"color":{"text":"var:preset|color|white"},":hover":{"color":{"text":"var:preset|color|white"}}}}},"textColor":"white","fontSize":"small"} -->
+
+ <!-- wp:paragraph {"fontSize":"small"} -->
+ <p class="wp-block-site-title has-small-font-size"><a href="%1$s">%2$s%3$s</a></p>
+ <!-- /wp:paragraph -->
+
+ <!-- wp:navigation {"icon":"menu","overlayBackgroundColor":"charcoal-2","overlayTextColor":"white","layout":{"type":"flex","orientation":"horizontal"},"fontSize":"small","menuSlug":"breathe"} /-->
+
+ <!-- /wp:wporg/local-navigation-bar -->',
+ esc_url( $is_updates_or_project ? $make_home_url : home_url() ),
+ $before_name,
+ $is_updates_or_project
+ ? esc_html__( 'Make WordPress', 'wporg-breathe' )
+ : esc_html( get_bloginfo('name') )
+ )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wporg_breathe_after_header' );
</span></span></pre>
</div>
</div>
</body>
</html>