<!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>[977] sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base: BuddyPress.org/bbPress.org: add support for displaying a custom menu in replacement of the main navigation.</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 { 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/977">977</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/977","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-12 20:36:24 +0000 (Wed, 12 Nov 2014)</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'>BuddyPress.org/bbPress.org: add support for displaying a custom menu in replacement of the main navigation.
This is a stop-gap measure to allow i18n BuddyPress sites, like es.buddypress.org, translate the labels and URLs in the main navigation.
Right now, these bits are hardcoded in English and stick out like a sore thumb on a i18n site where someone has written lots of native language content.
Fixes https://buddypress.trac.wordpress.org/ticket/5974</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbbasefunctionsphp">sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/functions.php</a></li>
<li><a href="#sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbbaseheadernavphp">sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/header-nav.php</a></li>
<li><a href="#sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbbasestylebbpresscss">sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/style-bbpress.css</a></li>
<li><a href="#sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbbasestylebuddypresscss">sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/style-buddypress.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbbasefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/functions.php 2014-11-12 18:54:56 UTC (rev 976)
+++ sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/functions.php 2014-11-12 20:36:24 UTC (rev 977)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,3 +498,8 @@
</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"> add_action( 'bbp_template_redirect', 'bb_base_recount_current_thing' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+function bb_base_register_menus() {
+ register_nav_menu( 'header-nav-menu', 'Main nav bar' );
+}
+add_action( 'init', 'bb_base_register_menus' );
</ins></span></pre></div>
<a id="sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbbaseheadernavphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/header-nav.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/header-nav.php 2014-11-12 18:54:56 UTC (rev 976)
+++ sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/header-nav.php 2014-11-12 20:36:24 UTC (rev 977)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,9 +1,18 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<ul id="nav" class="menu">
- <li <?php if ( is_page( 'about' ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'about' ); ?>">About</a></li>
- <li <?php if ( is_page( 'plugins' ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'plugins' ); ?>">Plugins</a></li>
- <li <?php if ( is_page( 'themes' ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'themes' ); ?>">Themes</a></li>
- <li><a href="<?php echo esc_url( '//codex.' . parse_url( home_url(), PHP_URL_HOST ) . '/' ); ?>">Documentation</a></li>
- <li <?php if ( is_post_type_archive( 'post' ) || is_singular( 'post' ) || is_date() || is_tag() || is_category() || is_home() ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'blog' ); ?>">Blog</a></li>
- <?php if ( function_exists( 'is_bbpress' ) ) : ?><li <?php if ( is_bbpress() ) : ?>class="current"<?php endif; ?>><a href="<?php bbp_forums_url(); ?>">Support</a></li><?php endif; ?>
- <li class="download<?php if ( is_page( 'download' ) ) : ?> current<?php endif; ?>"><a href="<?php echo home_url( 'download' ); ?>">Download</a></li>
-</ul>
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php if ( ! has_nav_menu( 'header-nav-menu' ) ) : ?>
+ <ul id="nav" class="menu">
+ <li <?php if ( is_page( 'about' ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'about' ); ?>">About</a></li>
+ <li <?php if ( is_page( 'plugins' ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'plugins' ); ?>">Plugins</a></li>
+ <li <?php if ( is_page( 'themes' ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'themes' ); ?>">Themes</a></li>
+ <li><a href="<?php echo esc_url( '//codex.' . parse_url( home_url(), PHP_URL_HOST ) . '/' ); ?>">Documentation</a></li>
+ <li <?php if ( is_post_type_archive( 'post' ) || is_singular( 'post' ) || is_date() || is_tag() || is_category() || is_home() ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'blog' ); ?>">Blog</a></li>
+ <?php if ( function_exists( 'is_bbpress' ) ) : ?><li <?php if ( is_bbpress() ) : ?>class="current"<?php endif; ?>><a href="<?php bbp_forums_url(); ?>">Support</a></li><?php endif; ?>
+ <li class="download<?php if ( is_page( 'download' ) ) : ?> current<?php endif; ?>"><a href="<?php echo home_url( 'download' ); ?>">Download</a></li>
+ </ul>
+<?php else: ?>
+ <?php wp_nav_menu( array(
+ 'container' => '',
+ 'menu_class' => 'menu',
+ 'menu_id' => 'nav',
+ 'theme_location' => 'header-nav-menu',
+ ) ); ?>
+<?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbbasestylebbpresscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/style-bbpress.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/style-bbpress.css 2014-11-12 18:54:56 UTC (rev 976)
+++ sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/style-bbpress.css 2014-11-12 20:36:24 UTC (rev 977)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,6 +34,7 @@
</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"> #nav li.current a,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#nav li.current-menu-item a,
</ins><span class="cx" style="display: block; padding: 0 10px"> #nav li a:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> .button:hover {
</span><span class="cx" style="display: block; padding: 0 10px"> color: rgba(235,255,235,0.9);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,6 +74,7 @@
</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"> #nav li.current a,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#nav li.current-menu-item a,
</ins><span class="cx" style="display: block; padding: 0 10px"> #nav li a:active,
</span><span class="cx" style="display: block; padding: 0 10px"> .button:active {
</span><span class="cx" style="display: block; padding: 0 10px"> background-image: -moz-linear-gradient(top, #009933 0%, #008800 100%);
</span></span></pre></div>
<a id="sitestrunkbuddypressorgpublic_htmlwpcontentthemesbbbasestylebuddypresscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/style-buddypress.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/style-buddypress.css 2014-11-12 18:54:56 UTC (rev 976)
+++ sites/trunk/buddypress.org/public_html/wp-content/themes/bb-base/style-buddypress.css 2014-11-12 20:36:24 UTC (rev 977)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,6 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: rgba(255,255,255,0.9);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#nav li.current-menu-item a,
</ins><span class="cx" style="display: block; padding: 0 10px"> #nav li.current a,
</span><span class="cx" style="display: block; padding: 0 10px"> #nav li a:active {
</span><span class="cx" style="display: block; padding: 0 10px"> background-color: #dd823b;
</span></span></pre>
</div>
</div>
</body>
</html>