Changeset 2325
- Timestamp:
- 01/18/2010 10:31:29 AM (15 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-core/bp-core-templatetags.php
r2321 r2325 426 426 /* If the current component matches the nav item id, then add a highlight CSS class. */ 427 427 if ( $bp->active_components[$bp->current_component] == $nav_item['css_id'] ) { 428 $selected = ' class="current "';428 $selected = ' class="current selected"'; 429 429 } else { 430 430 $selected = ''; … … 440 440 if ( $nav_item['css_id'] == $bp->friends->id ) { 441 441 if ( friends_check_friendship( $bp->loggedin_user->id, $bp->displayed_user->id ) ) 442 $selected = ' class="current "';442 $selected = ' class="current selected"'; 443 443 } 444 444 } … … 479 479 480 480 if ( $bp->current_component == $user_nav_item['slug'] ) 481 $selected = ' class="current "';481 $selected = ' class="current selected"'; 482 482 else 483 483 $selected = ''; … … 529 529 /* If the current action or an action variable matches the nav item id, then add a highlight CSS class. */ 530 530 if ( $subnav_item['slug'] == $bp->current_action ) { 531 $selected = ' class="current "';531 $selected = ' class="current selected"'; 532 532 } else { 533 533 $selected = ''; -
trunk/bp-groups.php
r2305 r2325 226 226 227 227 /* 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' ) ); 229 229 230 230 /* If the user is a group mod or more, then show the group admin nav item */ 231 231 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' ) ); 233 233 234 234 // If this is a private group, and the user is not a member, show a "Request Membership" nav item. … … 237 237 238 238 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' ) ); 240 240 241 241 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' ) ); 245 245 246 246 if ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) { 247 247 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 ) ); 251 251 } 252 252 } -
trunk/bp-themes/bp-default/_inc/global.js
r2323 r2325 12 12 /* Members */ 13 13 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') ); 15 15 16 16 /* Groups */ 17 17 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') ); 19 19 20 20 /* Blogs */ 21 21 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') ); 23 23 24 24 /* Forums */ 25 25 if ( j('div.forums').length ) { 26 26 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') ); 28 28 } 29 29 … … 231 231 }); 232 232 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'); 234 234 j('#activity-filter-select select option[value=' + filter + ']').attr( 'selected', 'selected' ); 235 235 … … 258 258 j('div#subnav li.feed a').attr('href', response.feed_url); 259 259 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'); 261 261 262 262 /* Selectively hide comments */ … … 586 586 j(this).removeClass('selected'); 587 587 }); 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'); 590 590 j('div.item-list-tabs select option[value=' + filter + ']').attr( 'selected', 'selected' ); 591 591 … … 606 606 j(this).fadeIn(100); 607 607 }); 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'); 609 609 }); 610 610 } … … 614 614 var target = j(event.target); 615 615 616 if ( target.parent().parent().hasClass('pagination') ) {616 if ( target.parent().parent().hasClass('pagination') && !target.parent().parent().hasClass('no-ajax') ) { 617 617 if ( j('div.item-list-tabs li.selected').length ) 618 618 var el = j('div.item-list-tabs li.selected'); … … 622 622 var page_number = 1; 623 623 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]; 625 630 626 631 if ( j(target).hasClass('next') )
Note: See TracChangeset
for help on using the changeset viewer.