Skip to:
Content

BuddyPress.org

Changeset 2325


Ignore:
Timestamp:
01/18/2010 10:31:29 AM (16 years ago)
Author:
apeatling
Message:

Fixes #1562 - group forum pagination links.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r2321 r2325  
    426426                /* If the current component matches the nav item id, then add a highlight CSS class. */
    427427                if ( $bp->active_components[$bp->current_component] == $nav_item['css_id'] ) {
    428                         $selected = ' class="current"';
     428                        $selected = ' class="current selected"';
    429429                } else {
    430430                        $selected = '';
    … …  
    440440                                if ( $nav_item['css_id'] == $bp->friends->id ) {
    441441                                        if ( friends_check_friendship( $bp->loggedin_user->id, $bp->displayed_user->id ) )
    442                                                 $selected = ' class="current"';
     442                                                $selected = ' class="current selected"';
    443443                                }
    444444                        }
    … …  
    479479
    480480                if ( $bp->current_component == $user_nav_item['slug'] )
    481                         $selected = ' class="current"';
     481                        $selected = ' class="current selected"';
    482482                else
    483483                        $selected = '';
    … …  
    529529                        /* If the current action or an action variable matches the nav item id, then add a highlight CSS class. */
    530530                        if ( $subnav_item['slug'] == $bp->current_action ) {
    531                                 $selected = ' class="current"';
     531                                $selected = ' class="current selected"';
    532532                        } else {
    533533                                $selected = '';

  • trunk/bp-groups.php

    r2305 r2325  
    226226
    227227                        /* Add the "Home" subnav item, as this will always be present */
    228                         bp_core_new_subnav_item( array( 'name' => __( 'Home', 'buddypress' ), 'slug' => 'home', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_home', 'position' => 10, 'item_css_id' => 'group-home' ) );
     228                        bp_core_new_subnav_item( array( 'name' => __( 'Home', 'buddypress' ), 'slug' => 'home', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_home', 'position' => 10, 'item_css_id' => 'home' ) );
    229229
    230230                        /* If the user is a group mod or more, then show the group admin nav item */
    231231                        if ( $bp->is_item_mod || $bp->is_item_admin )
    232                                 bp_core_new_subnav_item( array( 'name' => __( 'Admin', 'buddypress' ), 'slug' => 'admin', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_admin', 'position' => 20, 'user_has_access' => ( $bp->is_item_admin + (int)$bp->is_item_mod ), 'item_css_id' => 'group-admin' ) );
     232                                bp_core_new_subnav_item( array( 'name' => __( 'Admin', 'buddypress' ), 'slug' => 'admin', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_admin', 'position' => 20, 'user_has_access' => ( $bp->is_item_admin + (int)$bp->is_item_mod ), 'item_css_id' => 'admin' ) );
    233233
    234234                        // If this is a private group, and the user is not a member, show a "Request Membership" nav item.
    … …  
    237237
    238238                        if ( $bp->groups->current_group->enable_forum && function_exists('bp_forums_setup') )
    239                                 bp_core_new_subnav_item( array( 'name' => __( 'Forum', 'buddypress' ), 'slug' => 'forum', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_forum', 'position' => 40, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-forum' ) );
     239                                bp_core_new_subnav_item( array( 'name' => __( 'Forum', 'buddypress' ), 'slug' => 'forum', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_forum', 'position' => 40, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'forums' ) );
    240240
    241241                        if ( $bp->groups->current_group->enable_wire && function_exists('bp_wire_install') )
    242                                 bp_core_new_subnav_item( array( 'name' => __( 'Wire', 'buddypress' ), 'slug' => BP_WIRE_SLUG, 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_wire', 'position' => 50, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-wire'  ) );
    243 
    244                         bp_core_new_subnav_item( array( 'name' => __( 'Members', 'buddypress' ), 'slug' => 'members', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_members', 'position' => 60, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'group-members'  ) );
     242                                bp_core_new_subnav_item( array( 'name' => __( 'Wire', 'buddypress' ), 'slug' => BP_WIRE_SLUG, 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_wire', 'position' => 50, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'wire'  ) );
     243
     244                        bp_core_new_subnav_item( array( 'name' => __( 'Members', 'buddypress' ), 'slug' => 'members', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_members', 'position' => 60, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'members'  ) );
    245245
    246246                        if ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
    247247                                if ( function_exists('friends_install') )
    248                                         bp_core_new_subnav_item( array( 'name' => __( 'Send Invites', 'buddypress' ), 'slug' => 'send-invites', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_invite', 'item_css_id' => 'group-invite', 'position' => 70, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
    249 
    250                                 //bp_core_new_subnav_item( array( 'name' => __( 'Leave Group', 'buddypress' ), 'slug' => 'leave-group', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_leave', 'item_css_id' => 'group-leave', 'position' => 110, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
     248                                        bp_core_new_subnav_item( array( 'name' => __( 'Send Invites', 'buddypress' ), 'slug' => 'send-invites', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_invite', 'item_css_id' => 'invite', 'position' => 70, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
     249
     250                                //bp_core_new_subnav_item( array( 'name' => __( 'Leave Group', 'buddypress' ), 'slug' => 'leave-group', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_leave', 'item_css_id' => 'eave', 'position' => 110, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
    251251                        }
    252252                }

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

    r2323 r2325  
    1212        /* Members */
    1313        if ( j('div.members').length )
    14                 bp_filter_request( j.cookie('bp-members-type'), j.cookie('bp-members-filter'), 'members', 'div.members', j.cookie('bp-members-page'), j.cookie('bp-members-search-terms') );
     14                bp_filter_request( j.cookie('bp-members-type'), j.cookie('bp-members-filter'), 'members', 'div.members', 1, j.cookie('bp-members-search-terms') );
    1515
    1616        /* Groups */
    1717        if ( j('div.groups').length )
    18                 bp_filter_request( j.cookie('bp-groups-type'), j.cookie('bp-groups-filter'), 'groups', 'div.groups', j.cookie('bp-groups-page'), j.cookie('bp-groups-search-terms') );
     18                bp_filter_request( j.cookie('bp-groups-type'), j.cookie('bp-groups-filter'), 'groups', 'div.groups', 1, j.cookie('bp-groups-search-terms') );
    1919
    2020        /* Blogs */
    2121        if ( j('div.blogs').length )
    22                 bp_filter_request( j.cookie('bp-blogs-type'), j.cookie('bp-blogs-filter'), 'blogs', 'div.blogs', j.cookie('bp-blogs-page'), j.cookie('bp-blogs-search-terms') );
     22                bp_filter_request( j.cookie('bp-blogs-type'), j.cookie('bp-blogs-filter'), 'blogs', 'div.blogs', 1, j.cookie('bp-blogs-search-terms') );
    2323
    2424        /* Forums */
    2525        if ( j('div.forums').length ) {
    2626                j('div#new-topic-post').hide();
    27                 bp_filter_request( j.cookie('bp-forums-type'), j.cookie('bp-forums-filter'), 'forums', 'div.forums', j.cookie('bp-forums-page'), j.cookie('bp-forums-search-terms') );
     27                bp_filter_request( j.cookie('bp-forums-type'), j.cookie('bp-forums-filter'), 'forums', 'div.forums', 1, j.cookie('bp-forums-search-terms') );
    2828        }
    2929
    … …  
    231231                });
    232232                j('li#activity-' + type).addClass('selected');
    233                 j('div.item-list-tabs li.selected, div.item-list-tabs li.current').addClass('loading');
     233                j('div.item-list-tabs li.selected, div.item-list-tabs li.selected').addClass('loading');
    234234                j('#activity-filter-select select option[value=' + filter + ']').attr( 'selected', 'selected' );
    235235
    … …  
    258258                                j('div#subnav li.feed a').attr('href', response.feed_url);
    259259
    260                         j('div.item-list-tabs li.selected, div.item-list-tabs li.current').removeClass('loading');
     260                        j('div.item-list-tabs li.selected, div.item-list-tabs li.selected').removeClass('loading');
    261261
    262262                        /* Selectively hide comments */
    … …  
    586586                        j(this).removeClass('selected');
    587587                });
    588                 j('div.item-list-tabs li#' + id + '-' + type).addClass('selected');
    589                 j('div.item-list-tabs li.selected, div.item-list-tabs li.current').addClass('loading');
     588                j('div.item-list-tabs li#' + id + '-' + type + ', div.item-list-tabs li.current').addClass('selected');
     589                j('div.item-list-tabs li.selected, div.item-list-tabs li.selected').addClass('loading');
    590590                j('div.item-list-tabs select option[value=' + filter + ']').attr( 'selected', 'selected' );
    591591
    … …  
    606606                                j(this).fadeIn(100);
    607607                        });
    608                         j('div.item-list-tabs li.selected, div.item-list-tabs li.current').removeClass('loading');
     608                        j('div.item-list-tabs li.selected, div.item-list-tabs li.selected').removeClass('loading');
    609609                });
    610610        }
    … …  
    614614                var target = j(event.target);
    615615
    616                 if ( target.parent().parent().hasClass('pagination') ) {
     616                if ( target.parent().parent().hasClass('pagination') && !target.parent().parent().hasClass('no-ajax') ) {
    617617                        if ( j('div.item-list-tabs li.selected').length )
    618618                                var el = j('div.item-list-tabs li.selected');
    … …  
    622622                        var page_number = 1;
    623623                        var css_id = el.attr('id').split( '-' );
    624                         var object = css_id[0];
     624
     625                        /* Sub nav li ID's are slightly different */
     626                        if ( 'sub-nav' == j('div.item-list-tabs').attr('id') )
     627                                var object = css_id[2];
     628                        else
     629                                var object = css_id[0];
    625630
    626631                        if ( j(target).hasClass('next') )
Note: See TracChangeset for help on using the changeset viewer.