Changeset 3930

Timestamp:

01/25/2011 11:18:23 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Set first tabs on members and forums directories to the component root slug. Add supporting member_slug functions. Add proper empty() check to current_group is_member.

Location:

trunk

Files:

• bp-groups/bp-groups-filters.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (1 diff)
• bp-themes/bp-default/forums/index.php (modified) (2 diffs)
• bp-themes/bp-default/members/index.php (modified) (1 diff)

trunk/bp-groups/bp-groups-filters.php

@@ -69 +69 @@
             ( !empty( $bp->groups->current_group ) &&
                 ( 'public' == $bp->groups->current_group->status ) ||
-                    ( 1 == $bp->groups->current_group->is_member ) ) ) {
+                    ( !empty( $bp->groups->current_group->is_member ) ) ) ) {
 
         add_filter( 'get_topics_fields',     'groups_add_forum_fields_sql' );

trunk/bp-members/bp-members-template.php

@@ -1 +1 @@
 <?php
 
+/**
+ * Output the members component slug
+ *
+ * @package BuddyPress
+ * @subpackage Members Template
+ * @since BuddyPress {unknown}
+ *
+ * @uses bp_get_members_slug()
+ */
+function bp_members_slug() {
+    echo bp_get_members_slug();
+}
+    /**
+     * Return the members component slug
+     *
+     * @package BuddyPress
+     * @subpackage Members Template
+     * @since BuddyPress {unknown}
+     */
+    function bp_get_members_slug() {
+        global $bp;
+        return apply_filters( 'bp_get_members_slug', $bp->members->slug );
+    }
+
+/**
+ * Output the members component root slug
+ *
+ * @package BuddyPress
+ * @subpackage Members Template
+ * @since BuddyPress {unknown}
+ *
+ * @uses bp_get_members_root_slug()
+ */
+function bp_members_root_slug() {
+    echo bp_get_members_root_slug();
+}
+    /**
+     * Return the members component root slug
+     *
+     * @package BuddyPress
+     * @subpackage Members Template
+     * @since BuddyPress {unknown}
+     */
+    function bp_get_members_root_slug() {
+        global $bp;
+        return apply_filters( 'bp_get_members_root_slug', $bp->members->root_slug );
+    }
 
 /***

trunk/bp-themes/bp-default/forums/index.php

@@ -21 +21 @@
             <form action="" method="post" id="forums-search-form" class="dir-form">
 
-                <h3><?php _e( 'Group Forums Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() ) : ?> &nbsp;<a class="button" href="#new-topic" id="new-topic-button"><?php _e( 'New Topic', 'buddypress' ); ?></a><?php endif; ?></h3>
+                <h3><?php _e( 'Group Forums Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() ) : ?> &nbsp;<a class="button show-hide-new" href="#new-topic" id="new-topic-button"><?php _e( 'New Topic', 'buddypress' ); ?></a><?php endif; ?></h3>
 
                 <div id="forums-dir-search" class="dir-search" role="search">
@@ -36 +36 @@
                 <div class="item-list-tabs" role="navigation">
                     <ul>
-                        <li class="selected" id="forums-all"><a href="<?php bp_root_domain(); ?>"><?php printf( __( 'All Topics (%s)', 'buddypress' ), bp_get_forum_topic_count() ); ?></a></li>
+                        <li class="selected" id="forums-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() ); ?>"><?php printf( __( 'All Topics (%s)', 'buddypress' ), bp_get_forum_topic_count() ); ?></a></li>
 
                         <?php if ( is_user_logged_in() && bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?>

trunk/bp-themes/bp-default/members/index.php

@@ -29 +29 @@
             <div class="item-list-tabs" role="navigation">
                 <ul>
-                    <li class="selected" id="members-all"><a href="<?php bp_root_domain(); ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_member_count() ); ?></a></li>
+                    <li class="selected" id="members-all"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ); ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_member_count() ); ?></a></li>
 
                     <?php if ( is_user_logged_in() && bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>