<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2321] trunk:
Making sure the options_nav is always present for plugins,
but stopping the displayed_user nav showing in the new default when not logged in
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2321</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-17 20:02:09 +0000 (Sun, 17 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Making sure the options_nav is always present for plugins, but stopping the displayed_user nav showing in the new default when not logged in.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssingleactivityphp">trunk/bp-themes/bp-default/members/single/activity.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssingleblogsphp">trunk/bp-themes/bp-default/members/single/blogs.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglefriendsphp">trunk/bp-themes/bp-default/members/single/friends.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2320 => 2321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-01-17 19:42:57 UTC (rev 2320)
+++ trunk/bp-core/bp-core-templatetags.php 2010-01-17 20:02:09 UTC (rev 2321)
</span><span class="lines">@@ -537,8 +537,9 @@
</span><span class="cx"> echo apply_filters( 'bp_get_options_nav_' . $subnav_item['css_id'], '<li id="li-subnav-' . $subnav_item['css_id'] . '" ' . $selected . '><a id="' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>', $subnav_item );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- /* If we get here we are viewing another user, so show the displayed user's nav items */
- bp_get_displayed_user_nav();
</del><ins>+ /* If we're using the classic template structure, show the displayed user nav instead */
+ if ( 'bp-sn-parent' == basename( TEMPLATEPATH ) || defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
+ bp_get_displayed_user_nav();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssingleactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/activity.php (2320 => 2321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/activity.php 2010-01-17 19:42:57 UTC (rev 2320)
+++ trunk/bp-themes/bp-default/members/single/activity.php 2010-01-17 20:02:09 UTC (rev 2321)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> <div class="item-list-tabs no-ajax" id="subnav">
</span><span class="cx"> <ul>
</span><ins>+ <?php bp_get_options_nav() ?>
+
</ins><span class="cx"> <li class="feed"><a href="<?php bp_activities_member_rss_link() ?>" title="RSS Feed"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_member_activity_syndication_options' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssingleblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/blogs.php (2320 => 2321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/blogs.php 2010-01-17 19:42:57 UTC (rev 2320)
+++ trunk/bp-themes/bp-default/members/single/blogs.php 2010-01-17 20:02:09 UTC (rev 2321)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> <div class="item-list-tabs" id="subnav">
</span><span class="cx"> <ul>
</span><ins>+ <?php bp_get_options_nav() ?>
+
</ins><span class="cx"> <li id="blogs-filter-select" class="last filter">
</span><span class="cx"> <?php _e( 'Order By:', 'buddypress' ) ?>
</span><span class="cx"> <select id="blogs-all">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglefriendsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/friends.php (2320 => 2321)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/friends.php 2010-01-17 19:42:57 UTC (rev 2320)
+++ trunk/bp-themes/bp-default/members/single/friends.php 2010-01-17 20:02:09 UTC (rev 2321)
</span><span class="lines">@@ -26,7 +26,12 @@
</span><span class="cx"> <?php do_action( 'bp_before_member_friends_content' ) ?>
</span><span class="cx">
</span><span class="cx"> <div class="members friends">
</span><del>- <?php // 'members/members-loop.php' loaded here via AJAX. ?>
</del><ins>+ <?php
+ // The loop will be loaded here via AJAX on page load to retain selected settings and not waste cycles.
+ // If you're concerned about no-script functionality, uncomment the following line.
+
+ // locate_template( array( 'members/members-loop.php' ), true );
+ ?>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_member_friends_content' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>