Changeset 2321

Timestamp:

01/17/2010 08:02:09 PM (16 years ago)

Author:

apeatling

Message:

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.

Location:

trunk

Files:

• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/members/single/activity.php (modified) (1 diff)
• bp-themes/bp-default/members/single/blogs.php (modified) (1 diff)
• bp-themes/bp-default/members/single/friends.php (modified) (1 diff)

trunk/bp-core/bp-core-templatetags.php

@@ -538 +538 @@
         }
     } else {
-        /* If we get here we are viewing another user, so show the displayed user's nav items */
-        bp_get_displayed_user_nav();
+        /* 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();
     }
 }

trunk/bp-themes/bp-default/members/single/activity.php

@@ -1 +1 @@
 <div class="item-list-tabs no-ajax" id="subnav">
     <ul>
+        <?php bp_get_options_nav() ?>
+
         <li class="feed"><a href="<?php bp_activities_member_rss_link() ?>" title="RSS Feed"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
 

trunk/bp-themes/bp-default/members/single/blogs.php

@@ -1 +1 @@
 <div class="item-list-tabs" id="subnav">
     <ul>
+        <?php bp_get_options_nav() ?>
+
         <li id="blogs-filter-select" class="last filter">
             <?php _e( 'Order By:', 'buddypress' ) ?>

trunk/bp-themes/bp-default/members/single/friends.php

@@ -27 +27 @@
 
     <div class="members friends">
-        <?php // 'members/members-loop.php' loaded here via AJAX. ?>
+    <?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 );
+    ?>
     </div>