Skip to:
Content

BuddyPress.org

Changeset 2485


Ignore:
Timestamp:
01/31/2010 09:45:19 AM (16 years ago)
Author:
apeatling
Message:

Improved noscript support.

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-activity.php

    r2471 r2485  
    107107        bp_core_new_nav_item( array( 'name' => __( 'Activity', 'buddypress' ), 'slug' => $bp->activity->slug, 'position' => 10, 'screen_function' => 'bp_activity_screen_my_activity', 'default_subnav_slug' => 'just-me', 'item_css_id' => $bp->activity->id ) );
    108108
    109         $activity_link = $bp->loggedin_user->domain . $bp->activity->slug . '/';
     109        $activity_link = $bp->displayed_user->domain . $bp->activity->slug . '/';
    110110
    111111        /* Add the subnav items to the activity nav item if we are using a theme that supports this */
    112         bp_core_new_subnav_item( array( 'name' => __( 'Just Me', 'buddypress' ), 'slug' => 'just-me', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_my_activity', 'position' => 10 ) );
    113         bp_core_new_subnav_item( array( 'name' => __( 'My Friends', 'buddypress' ), 'slug' => 'my-friends', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_friends_activity', 'position' => 20, 'item_css_id' => 'activity-my-friends' ) );
     112        bp_core_new_subnav_item( array( 'name' => __( 'Personal', 'buddypress' ), 'slug' => 'just-me', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_my_activity', 'position' => 10 ) );
     113        bp_core_new_subnav_item( array( 'name' => __( 'Friends', 'buddypress' ), 'slug' => 'friends', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_friends', 'position' => 20, 'item_css_id' => 'activity-friends' ) );
     114        bp_core_new_subnav_item( array( 'name' => __( 'Groups', 'buddypress' ), 'slug' => 'groups', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_groups', 'position' => 30, 'item_css_id' => 'activity-groups' ) );
     115        bp_core_new_subnav_item( array( 'name' => __( 'Favorites', 'buddypress' ), 'slug' => 'favorites', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_favorites', 'position' => 40, 'item_css_id' => 'activity-favs' ) );
     116        bp_core_new_subnav_item( array( 'name' => sprintf( __( '@%s Mentions', 'buddypress' ), $bp->displayed_user->userdata->user_login ), 'slug' => 'mentions', 'parent_url' => $activity_link, 'parent_slug' => $bp->activity->slug, 'screen_function' => 'bp_activity_screen_mentions', 'position' => 50, 'item_css_id' => 'activity-mentions' ) );
    114117
    115118        if ( $bp->current_component == $bp->activity->slug ) {
    … …  
    153156}
    154157
    155 function bp_activity_screen_friends_activity() {
    156         global $bp;
    157 
    158         /* Make sure delete links do not show for friends activity items */
     158function bp_activity_screen_friends() {
     159        global $bp;
     160
     161        if ( bp_is_deactivated( 'bp-friends.php' ) )
     162                return false;
     163
    159164        if ( !is_site_admin() )
    160165                $bp->is_item_admin = false;
    161166
    162         do_action( 'bp_activity_screen_friends_activity' );
    163         bp_core_load_template( apply_filters( 'bp_activity_template_friends_activity', 'activity/my-friends' ) );
     167        do_action( 'bp_activity_screen_friends' );
     168        bp_core_load_template( apply_filters( 'bp_activity_template_friends_activity', 'members/single/home' ) );
     169}
     170
     171function bp_activity_screen_groups() {
     172        global $bp;
     173
     174        if ( bp_is_deactivated( 'bp-groups.php' ) )
     175                return false;
     176
     177        if ( !is_site_admin() )
     178                $bp->is_item_admin = false;
     179
     180        do_action( 'bp_activity_screen_groups' );
     181        bp_core_load_template( apply_filters( 'bp_activity_template_groups_activity', 'members/single/home' ) );
     182}
     183
     184function bp_activity_screen_favorites() {
     185        global $bp;
     186
     187        if ( !is_site_admin() )
     188                $bp->is_item_admin = false;
     189
     190        do_action( 'bp_activity_screen_favorites' );
     191        bp_core_load_template( apply_filters( 'bp_activity_template_favorite_activity', 'members/single/home' ) );
     192}
     193
     194function bp_activity_screen_mentions() {
     195        global $bp;
     196
     197        if ( !is_site_admin() )
     198                $bp->is_item_admin = false;
     199
     200        do_action( 'bp_activity_screen_mentions' );
     201        bp_core_load_template( apply_filters( 'bp_activity_template_mention_activity', 'members/single/home' ) );
    164202}
    165203
    … …  
    345383        global $bp, $wp_query;
    346384
    347         if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'my-friends' || $bp->action_variables[0] != 'feed' )
     385        if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'friends' || $bp->action_variables[0] != 'feed' )
    348386                return false;
    349387
    … …  
    359397        global $bp, $wp_query;
    360398
    361         if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'my-groups' || $bp->action_variables[0] != 'feed' )
     399        if ( $bp->current_component != $bp->activity->slug || !$bp->displayed_user->id || $bp->current_action != 'groups' || $bp->action_variables[0] != 'feed' )
    362400                return false;
    363401

  • trunk/bp-activity/bp-activity-classes.php

    r2471 r2485  
    145145
    146146                /* If $max is set, only return up to the max results */
    147                 if ( (int)$total_activities > (int)$max )
    148                         $total_activities = $max;
     147                if ( !empty( $max ) ) {
     148                        if ( (int)$total_activities > (int)$max )
     149                                $total_activities = $max;
     150                }
    149151
    150152                return array( 'activities' => $activities, 'total' => (int)$total_activities );

  • trunk/bp-activity/bp-activity-templatetags.php

    r2482 r2485  
    117117        global $bp, $activities_template;
    118118
    119         /* Note: any params used for filtering can be a single value, or multiple values comma separated. */
    120 
    121         $defaults = array(
    122                 'display_comments' => false, // false for none, stream/threaded - show comments in the stream or threaded under items
    123                 'include' => false, // pass an activity_id or string of ID's comma separated
    124                 'sort' => 'DESC', // sort DESC or ASC
    125                 'page' => 1, // which page to load
    126                 'per_page' => 25, // number of items per page
    127                 'max' => false, // max number to return
    128                 'show_hidden' => false, // Show activity items that are hidden site-wide?
    129 
    130                 /* Filtering */
    131                 'user_id' => false, // user_id to filter on
    132                 'object' => false, // object to filter on e.g. groups, profile, status, friends
    133                 'action' => false, // action to filter on e.g. activity_update, new_forum_post, profile_updated
    134                 'primary_id' => false, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
    135                 'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
    136 
    137                 /* Searching */
    138                 'search_terms' => false // specify terms to search on
    139         );
    140 
    141         $r = wp_parse_args( $args, $defaults );
    142         extract( $r, EXTR_SKIP );
    143 
    144         if ( ( 'personal' == $type || 'friends' == $type ) && !$user_id )
    145                 $user_id = (int)$bp->displayed_user->id;
    146 
    147         if ( $max ) {
    148                 if ( $per_page > $max )
    149                         $per_page = $max;
     119        /***
     120         * Set the defaults based on the current page. Any of these will be overridden
     121         * if arguments are directly passed into the loop. Custom plugins should always
     122         * pass their parameters directly to the loop.
     123         */
     124        $user_id = false;
     125        $include = false;
     126        $show_hidden = false;
     127        $search_terms = false;
     128        $object = false;
     129        $primary_id = false;
     130
     131        /* User filtering */
     132        if ( !empty( $bp->displayed_user->id ) )
     133                $user_id = $bp->displayed_user->id;
     134
     135        /* User activity scope filtering */
     136        if ( !empty( $user_id ) ) {
     137                switch ( $bp->current_action ) {
     138                        case 'friends':
     139                                if ( function_exists( 'friends_get_friend_user_ids' ) )
     140                                        $user_id = implode( ',', (array)friends_get_friend_user_ids( $bp->displayed_user->id ) );
     141                                break;
     142                        case 'groups':
     143                                if ( function_exists( 'groups_get_user_groups' ) ) {
     144                                        $groups = groups_get_user_groups( $bp->displayed_user->id );
     145                                        $object = $bp->groups->id;
     146                                        $primary_id = implode( ',', (array)$groups['groups'] );
     147                                        $show_hidden = ( bp_is_my_profile() ) ? 1 : 0;
     148                                }
     149                                break;
     150                        case 'favorites':
     151                                $favs = bp_activity_get_user_favorites( $bp->displayed_user->id );
     152                                $include = implode( ',', (array)$favs );
     153                                $show_hidden = ( bp_is_my_profile() ) ? 1 : 0;
     154                                break;
     155                        case 'mentions':
     156                                $search_terms = '@' . bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login );
     157                                $show_hidden = ( bp_is_my_profile() ) ? 1 : 0;
     158                                break;
     159                }
     160        }
     161
     162        /* Group filtering */
     163        if ( !empty( $bp->groups->current_group ) ) {
     164                $object = $bp->groups->id;
     165                $primary_id = $bp->groups->current_group->id;
    150166        }
    151167
    … …  
    159175        else
    160176                $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id );
     177
     178        /* Note: any params used for filtering can be a single value, or multiple values comma separated. */
     179        $defaults = array(
     180                'display_comments' => 'threaded', // false for none, stream/threaded - show comments in the stream or threaded under items
     181                'include' => $include, // pass an activity_id or string of ID's comma separated
     182                'sort' => 'DESC', // sort DESC or ASC
     183                'page' => 1, // which page to load
     184                'per_page' => 25, // number of items per page
     185                'max' => false, // max number to return
     186                'show_hidden' => $show_hidden, // Show activity items that are hidden site-wide?
     187
     188                /* Filtering */
     189                'user_id' => $user_id, // user_id to filter on
     190                'object' => $object, // object to filter on e.g. groups, profile, status, friends
     191                'action' => false, // action to filter on e.g. activity_update, new_forum_post, profile_updated
     192                'primary_id' => $primary_id, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
     193                'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
     194
     195                /* Searching */
     196                'search_terms' => $search_terms // specify terms to search on
     197        );
     198
     199        $r = wp_parse_args( $args, $defaults );
     200        extract( $r, EXTR_SKIP );
     201
     202        if ( $max ) {
     203                if ( $per_page > $max )
     204                        $per_page = $max;
     205        }
    161206
    162207        $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden );
    … …  
    759804                global $bp;
    760805
    761                 if ( ( $bp->current_component == $bp->profile->slug ) || 'just-me' == $bp->current_action )
    762                         return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/feed/' );
    763                 else
    764                         return apply_filters( 'bp_get_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed/' );
     806                if ( $bp->current_component == $bp->profile->slug || 'just-me' == $bp->current_action )
     807                        $link = $bp->displayed_user->domain . $bp->activity->slug . '/feed/';
     808                else if ( 'friends' == $bp->current_action )
     809                        $link = $bp->displayed_user->domain . $bp->activity->slug . '/friends/feed/';
     810                else if ( 'groups' == $bp->current_action )
     811                        $link = $bp->displayed_user->domain . $bp->activity->slug . '/groups/feed/';
     812                else if ( 'favorites' == $bp->current_action )
     813                        $link = $bp->displayed_user->domain . $bp->activity->slug . '/favorites/feed/';
     814                else if ( 'mentions' == $bp->current_action )
     815                        $link = $bp->displayed_user->domain . $bp->activity->slug . '/mentions/feed/';
     816
     817                return apply_filters( 'bp_get_activities_member_rss_link', $link );
    765818        }
    766819        function bp_get_activities_member_rss_link() { return bp_get_member_activity_feed_link(); }

  • trunk/bp-core.php

    r2460 r2485  
    14771477}
    14781478
    1479 
    14801479/**
    14811480 * bp_core_get_all_posts_for_user()
    … …  
    14961495        return apply_filters( 'bp_core_get_all_posts_for_user', $wpdb->get_col( $wpdb->prepare( "SELECT post_id FROM $wpdb->posts WHERE post_author = %d AND post_status = 'publish' AND post_type = 'post'", $user_id ) ) );
    14971496}
    1498 
    14991497
    15001498/**

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

    r2480 r2485  
    514514        global $bp;
    515515
    516         /***
    517          * Only render this navigation when the logged in user is looking at one of their own pages, or we are using it to display nav
    518          * menus for something like a group, or event.
    519          */
    520         if ( bp_is_my_profile() || $bp->is_single_item ) {
    521                 if ( count( $bp->bp_options_nav[$bp->current_component] ) < 1 )
    522                         return false;
    523 
    524                 /* Loop through each navigation item */
    525                 foreach ( $bp->bp_options_nav[$bp->current_component] as $subnav_item ) {
    526                         if ( !$subnav_item['user_has_access'] )
    527                                 continue;
    528 
    529                         /* If the current action or an action variable matches the nav item id, then add a highlight CSS class. */
    530                         if ( $subnav_item['slug'] == $bp->current_action ) {
    531                                 $selected = ' class="current selected"';
    532                         } else {
    533                                 $selected = '';
    534                         }
    535 
    536                         /* echo out the final list item */
    537                         echo apply_filters( 'bp_get_options_nav_' . $subnav_item['css_id'], '<li id="' . $subnav_item['css_id'] . '-personal-li" ' . $selected . '><a id="' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>', $subnav_item );
     516        if ( count( $bp->bp_options_nav[$bp->current_component] ) < 1 )
     517                return false;
     518
     519        /* Loop through each navigation item */
     520        foreach ( $bp->bp_options_nav[$bp->current_component] as $subnav_item ) {
     521                if ( !$subnav_item['user_has_access'] )
     522                        continue;
     523
     524                /* If the current action or an action variable matches the nav item id, then add a highlight CSS class. */
     525                if ( $subnav_item['slug'] == $bp->current_action ) {
     526                        $selected = ' class="current selected"';
     527                } else {
     528                        $selected = '';
    538529                }
    539         } else {
    540                 /* If we're using the classic template structure, show the displayed user nav instead */
    541                 if ( 'bp-sn-parent' == basename( TEMPLATEPATH ) || defined( 'BP_CLASSIC_TEMPLATE_STRUCTURE' ) )
    542                         bp_get_displayed_user_nav();
     530
     531                /* echo out the final list item */
     532                echo apply_filters( 'bp_get_options_nav_' . $subnav_item['css_id'], '<li id="' . $subnav_item['css_id'] . '-personal-li" ' . $selected . '><a id="' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>', $subnav_item );
    543533        }
    544534}

  • trunk/bp-messages/bp-messages-templatetags.php

    r2434 r2485  
    112112
    113113                $last_message_index = count($this->thread->messages) - 1;
    114                 $this->thread->messages = array_reverse( $this->thread->messages );
     114                $this->thread->messages = array_reverse( (array)$this->thread->messages );
    115115
    116116                /* Set up the last message data */

  • trunk/bp-themes/bp-default/_inc/ajax.php

    r2484 r2485  
    183183                                        $friend_ids = implode( ',', friends_get_friend_user_ids( $bp->loggedin_user->id ) );
    184184                                        $query_string = 'user_id=' . $friend_ids;
    185                                         $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/my-friends/feed/';
     185                                        $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/friends/feed/';
    186186                                        break;
    187187                                case 'groups':
    … …  
    189189                                        $group_ids = implode( ',', $groups['groups'] );
    190190                                        $query_string = 'object=groups&primary_id=' . $group_ids . '&show_hidden=1';
    191                                         $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/my-groups/feed/';
     191                                        $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/groups/feed/';
    192192                                        break;
    193193                                case 'favorites':

  • trunk/bp-themes/bp-default/_inc/css/default.css

    r2476 r2485  
    580580}
    581581        div.pagination#user-pag, .friends div.pagination,
    582         .mygroups div.pagination, .myblogs div.pagination {
     582        .mygroups div.pagination, .myblogs div.pagination, noscript div.pagination {
    583583                background: #f8f8f8;
    584584                border: none;
    … …  
    954954        #item-body form#whats-new-form {
    955955                margin-top: 20px;
     956                border: none;
    956957        }
    957958

  • trunk/bp-themes/bp-default/_inc/global.js

    r2478 r2485  
    10591059        });
    10601060        j('li#activity-' + scope + ', div.item-list-tabs li.current').addClass('selected');
    1061         j('div.item-list-tabs li.selected').addClass('loading');
     1061        j('div#object-nav.item-list-tabs li.selected, div.activity-type-tabs li.selected').addClass('loading');
    10621062        j('#activity-filter-select select option[value=' + filter + ']').attr( 'selected', 'selected' );
    10631063

  • trunk/bp-themes/bp-default/activity/activity-loop.php

    r2358 r2485  
    44
    55<?php if ( bp_has_activities( bp_ajax_querystring() ) ) : ?>
     6
     7        <?php /* Show pagination if JS is not enabled, since the "Load More" link will do nothing */ ?>
     8        <noscript>
     9                <div class="pagination">
     10                        <div class="pag-count"><?php bp_activity_pagination_count() ?></div>
     11                        <div class="pagination-links"><?php bp_activity_pagination_links() ?></div>
     12                </div>
     13        </noscript>
    614
    715        <?php if ( empty( $_POST['page'] ) ) : ?>

  • trunk/bp-themes/bp-default/activity/index.php

    r2474 r2485  
    1818                        <div class="item-list-tabs activity-type-tabs">
    1919                                <ul>
    20                                         <li class="selected" id="activity-all"><a href="<?php bp_root_domain() ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ) ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
     20                                        <li class="selected" id="activity-all"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/' ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ) ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
    2121
    2222                                        <?php if ( is_user_logged_in() ) : ?>
    … …  
    2424                                                <?php if ( function_exists( 'bp_get_total_friend_count' ) ) : ?>
    2525                                                        <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
    26                                                                 <li id="activity-friends"><a href="<?php echo site_url( BP_ACTIVITY_SLUG . '/#friends/' ) ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ) ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
     26                                                                <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/friends/' ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ) ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
    2727                                                        <?php endif; ?>
    2828                                                <?php endif; ?>
    … …  
    3030                                                <?php if ( function_exists( 'bp_get_total_group_count_for_user' ) ) : ?>
    3131                                                        <?php if ( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
    32                                                                 <li id="activity-groups"><a href="<?php echo site_url( BP_ACTIVITY_SLUG . '/#groups/' ) ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ) ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
     32                                                                <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/groups/' ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ) ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
    3333                                                        <?php endif; ?>
    3434                                                <?php endif; ?>
    3535
    3636                                                <?php if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) : ?>
    37                                                         <li id="activity-favorites"><a href="<?php echo site_url( BP_ACTIVITY_SLUG . '/#favorites/' ) ?>" title="<?php _e( "The activity I've marked as a favorite.", 'buddypress' ) ?>"><?php printf( __( 'My Favorites (<span>%s</span>)', 'buddypress' ), bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
     37                                                        <li id="activity-favorites"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/favorites/' ?>" title="<?php _e( "The activity I've marked as a favorite.", 'buddypress' ) ?>"><?php printf( __( 'My Favorites (<span>%s</span>)', 'buddypress' ), bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
    3838                                                <?php endif; ?>
    3939
    40                                                 <li id="activity-atme"><a href="<?php echo site_url( BP_ACTIVITY_SLUG . '/#atme/' ) ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ) ?>"><?php printf( __( '@%s Mentions', 'buddypress' ), bp_get_loggedin_user_username() ) ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( '(%s new)', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ?></strong><?php endif; ?></a></li>
     40                                                <li id="activity-atme"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/mentions/' ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ) ?>"><?php printf( __( '@%s Mentions', 'buddypress' ), bp_get_loggedin_user_username() ) ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( '(%s new)', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ?></strong><?php endif; ?></a></li>
    4141
    4242                                        <?php endif; ?>

  • trunk/bp-themes/bp-default/functions.php

    r2477 r2485  
    187187        bp_core_remove_subnav_item( $bp->blogs->slug, 'recent-posts' );
    188188        bp_core_remove_subnav_item( $bp->blogs->slug, 'recent-comments' );
    189         bp_core_remove_subnav_item( $bp->activity->slug, 'just-me' );
    190         bp_core_remove_subnav_item( $bp->activity->slug, 'my-friends' );
    191189}
    192190add_action( 'init', 'bp_dtheme_remove_redundant' );
    … …  
    217215add_action( 'wp_footer', 'bp_dtheme_js_terms' );
    218216
     217
    219218/* Show a notice when the theme is activated - workaround by Ozh (http://old.nabble.com/Activation-hook-exist-for-themes--td25211004.html) */
    220219if ( is_admin() && isset($_GET['activated'] ) && $pagenow == "themes.php" ) {

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

    r2455 r2485  
    22        <ul>
    33                <?php bp_get_options_nav() ?>
    4 
    5                 <li class="feed"><a href="<?php bp_activities_member_rss_link() ?>" title="RSS Feed"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
    6 
    7                 <?php do_action( 'bp_member_activity_syndication_options' ) ?>
    84
    95                <li id="activity-filter-select" class="last">
Note: See TracChangeset for help on using the changeset viewer.