Skip to:
Content

BuddyPress.org

Changeset 4994


Ignore:
Timestamp:
08/17/2011 08:34:53 PM (13 years ago)
Author:
johnjamesjacoby
Message:

Normalize index actions in bp-default. Fixes regression from 1.2.9. Fixes #3484.

Location:
trunk/bp-themes/bp-default
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-themes/bp-default/activity/index.php

    r4676 r4994  
    1010?>
    1111
    12 <?php get_header( 'buddypress' ) ?>
     12<?php get_header( 'buddypress' ); ?>
     13
     14    <?php do_action( 'bp_before_directory_activity_page' ); ?>
    1315
    1416    <div id="content">
    1517        <div class="padder">
    1618
     19            <?php do_action( 'bp_before_directory_activity' ); ?>
     20
    1721            <?php if ( !is_user_logged_in() ) : ?>
    1822
    19                 <h3><?php _e( 'Site Activity', 'buddypress' ) ?></h3>
     23                <h3><?php _e( 'Site Activity', 'buddypress' ); ?></h3>
    2024
    2125            <?php endif; ?>
    2226
    23             <?php do_action( 'bp_before_directory_activity_content' ) ?>
     27            <?php do_action( 'bp_before_directory_activity_content' ); ?>
    2428
    2529            <?php if ( is_user_logged_in() ) : ?>
    2630
    27                 <?php locate_template( array( 'activity/post-form.php'), true ) ?>
     31                <?php locate_template( array( 'activity/post-form.php'), true ); ?>
    2832
    2933            <?php endif; ?>
    3034
    31             <?php do_action( 'template_notices' ) ?>
     35            <?php do_action( 'template_notices' ); ?>
    3236
    3337            <div class="item-list-tabs activity-type-tabs" role="navigation">
    3438                <ul>
    35                     <?php do_action( 'bp_before_activity_type_tab_all' ) ?>
     39                    <?php do_action( 'bp_before_activity_type_tab_all' ); ?>
    3640
    37                     <li class="selected" id="activity-all"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ) ?>"><?php printf( __( 'All Members <span>%s</span>', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
     41                    <li class="selected" id="activity-all"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/'; ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ); ?>"><?php printf( __( 'All Members <span>%s</span>', 'buddypress' ), bp_get_total_site_member_count() ); ?></a></li>
    3842
    3943                    <?php if ( is_user_logged_in() ) : ?>
     
    4549                            <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
    4650
    47                                 <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/' ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ) ?>"><?php printf( __( 'My Friends <span>%s</span>', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
     51                                <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/'; ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ); ?>"><?php printf( __( 'My Friends <span>%s</span>', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ); ?></a></li>
    4852
    4953                            <?php endif; ?>
     
    5761                            <?php if ( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
    5862
    59                                 <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/' ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ) ?>"><?php printf( __( 'My Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
     63                                <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/'; ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ); ?>"><?php printf( __( 'My Groups <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
    6064
    6165                            <?php endif; ?>
     
    6367                        <?php endif; ?>
    6468
    65                         <?php do_action( 'bp_before_activity_type_tab_favorites' ) ?>
     69                        <?php do_action( 'bp_before_activity_type_tab_favorites' ); ?>
    6670
    6771                        <?php if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) : ?>
    6872
    69                             <li id="activity-favorites"><a href="<?php echo bp_loggedin_user_domain() . bp_get_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>
     73                            <li id="activity-favorites"><a href="<?php echo bp_loggedin_user_domain() . bp_get_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>
    7074
    7175                        <?php endif; ?>
    7276
    73                         <?php do_action( 'bp_before_activity_type_tab_mentions' ) ?>
     77                        <?php do_action( 'bp_before_activity_type_tab_mentions' ); ?>
    7478
    75                         <li id="activity-mentions"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/' ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ) ?>"><?php _e( 'Public Mentions', 'buddypress' ); ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( '<span>%s new</span>', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ?></strong><?php endif; ?></a></li>
     79                        <li id="activity-mentions"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/'; ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ); ?>"><?php _e( 'Public Mentions', 'buddypress' ); ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( '<span>%s new</span>', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ); ?></strong><?php endif; ?></a></li>
    7680
    7781                    <?php endif; ?>
    7882
    79                     <?php do_action( 'bp_activity_type_tabs' ) ?>
     83                    <?php do_action( 'bp_activity_type_tabs' ); ?>
    8084                </ul>
    8185            </div><!-- .item-list-tabs -->
     
    8387            <div class="item-list-tabs no-ajax" id="subnav" role="navigation">
    8488                <ul>
    85                     <li class="feed"><a href="<?php bp_sitewide_activity_feed_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ); ?>"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
     89                    <li class="feed"><a href="<?php bp_sitewide_activity_feed_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ); ?>"><?php _e( 'RSS', 'buddypress' ); ?></a></li>
    8690
    87                     <?php do_action( 'bp_activity_syndication_options' ) ?>
     91                    <?php do_action( 'bp_activity_syndication_options' ); ?>
    8892
    8993                    <li id="activity-filter-select" class="last">
    9094                        <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
    9195                        <select id="activity-filter-by">
    92                             <option value="-1"><?php _e( 'Everything', 'buddypress' ) ?></option>
    93                             <option value="activity_update"><?php _e( 'Updates', 'buddypress' ) ?></option>
     96                            <option value="-1"><?php _e( 'Everything', 'buddypress' ); ?></option>
     97                            <option value="activity_update"><?php _e( 'Updates', 'buddypress' ); ?></option>
    9498
    9599                            <?php if ( bp_is_active( 'blogs' ) ) : ?>
    96100
    97                                 <option value="new_blog_post"><?php _e( 'Posts', 'buddypress' ) ?></option>
    98                                 <option value="new_blog_comment"><?php _e( 'Comments', 'buddypress' ) ?></option>
     101                                <option value="new_blog_post"><?php _e( 'Posts', 'buddypress' ); ?></option>
     102                                <option value="new_blog_comment"><?php _e( 'Comments', 'buddypress' ); ?></option>
    99103
    100104                            <?php endif; ?>
     
    129133            </div><!-- .item-list-tabs -->
    130134
    131             <?php do_action( 'bp_before_directory_activity_list' ) ?>
     135            <?php do_action( 'bp_before_directory_activity_list' ); ?>
    132136
    133137            <div class="activity" role="main">
    134138
    135                 <?php locate_template( array( 'activity/activity-loop.php' ), true ) ?>
     139                <?php locate_template( array( 'activity/activity-loop.php' ), true ); ?>
    136140
    137141            </div><!-- .activity -->
    138142
    139             <?php do_action( 'bp_directory_activity_content' ) ?>
     143            <?php do_action( 'bp_after_directory_activity_list' ); ?>
    140144
    141             <?php do_action( 'bp_after_directory_activity_content' ) ?>
     145            <?php do_action( 'bp_directory_activity_content' ); ?>
     146
     147            <?php do_action( 'bp_after_directory_activity_content' ); ?>
     148
     149            <?php do_action( 'bp_after_directory_activity' ); ?>
    142150
    143151        </div><!-- .padder -->
    144152    </div><!-- #content -->
    145153
    146 <?php get_sidebar( 'buddypress' ) ?>
     154    <?php do_action( 'bp_after_directory_activity_page' ); ?>
    147155
    148 <?php get_footer( 'buddypress' ) ?>
     156<?php get_sidebar( 'buddypress' ); ?>
     157<?php get_footer( 'buddypress' ); ?>
  • trunk/bp-themes/bp-default/blogs/index.php

    r4676 r4994  
    1212<?php get_header( 'buddypress' ); ?>
    1313
    14     <?php do_action( 'bp_before_directory_blogs_content' ); ?>
     14    <?php do_action( 'bp_before_directory_blogs_page' ); ?>
    1515
    1616    <div id="content">
    1717        <div class="padder">
    1818
     19        <?php do_action( 'bp_before_directory_blogs' ); ?>
     20
    1921        <form action="" method="post" id="blogs-directory-form" class="dir-form">
    2022
    2123            <h3><?php _e( 'Site Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() && bp_blog_signup_enabled() ) : ?> &nbsp;<a class="button" href="<?php echo bp_get_root_domain() . '/' . bp_get_blogs_slug() . '/create/' ?>"><?php _e( 'Create a Site', 'buddypress' ); ?></a><?php endif; ?></h3>
     24
     25            <?php do_action( 'bp_before_directory_blogs_content' ); ?>
    2226
    2327            <div id="blog-dir-search" class="dir-search" role="search">
     
    7175
    7276            <?php wp_nonce_field( 'directory_blogs', '_wpnonce-blogs-filter' ); ?>
     77           
     78            <?php do_action( 'bp_after_directory_blogs_content' ); ?>
    7379
    7480        </form><!-- #blogs-directory-form -->
     81
     82        <?php do_action( 'bp_after_directory_blogs' ); ?>
    7583
    7684        </div><!-- .padder -->
    7785    </div><!-- #content -->
    7886
    79     <?php do_action( 'bp_after_directory_blogs_content' ); ?>
     87    <?php do_action( 'bp_after_directory_blogs_page' ); ?>
    8088
    8189<?php get_sidebar( 'buddypress' ); ?>
  • trunk/bp-themes/bp-default/forums/index.php

    r4831 r4994  
    1212<?php get_header( 'buddypress' ); ?>
    1313
    14     <?php do_action( 'bp_before_directory_forums_content' ); ?>
     14    <?php do_action( 'bp_before_directory_forums_page' ); ?>
    1515
    1616    <div id="content">
     
    2222
    2323                <h3><?php _e( '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>
     24
     25                <?php do_action( 'bp_before_directory_forums_content' ); ?>
    2426
    2527                <div id="forums-dir-search" class="dir-search" role="search">
     
    149151                <?php endif; ?>
    150152            </div><!-- #new-topic-post -->
     153           
     154            <?php do_action( 'bp_after_new_topic_form' ); ?>
     155           
     156            <?php do_action( 'bp_after_directory_forums_content' ); ?>
     157
    151158        </div><!-- .padder -->
    152159    </div><!-- #content -->
    153160
    154     <?php do_action( 'bp_after_directory_forums_content' ); ?>
     161    <?php do_action( 'bp_after_directory_forums_page' ); ?>
    155162
    156163<?php get_sidebar( 'buddypress' ); ?>
  • trunk/bp-themes/bp-default/groups/index.php

    r4923 r4994  
    1212<?php get_header( 'buddypress' ); ?>
    1313
    14     <?php do_action( 'bp_before_directory_groups_content' ); ?>
     14    <?php do_action( 'bp_before_directory_groups_page' ); ?>
    1515
    1616    <div id="content">
    1717        <div class="padder">
    1818
     19        <?php do_action( 'bp_before_directory_groups' ); ?>
     20
    1921        <form action="" method="post" id="groups-directory-form" class="dir-form">
    2022
    2123            <h3><?php _e( 'Groups Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() && bp_user_can_create_groups() ) : ?> &nbsp;<a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create' ); ?>"><?php _e( 'Create a Group', 'buddypress' ); ?></a><?php endif; ?></h3>
     24
     25            <?php do_action( 'bp_before_directory_groups_content' ); ?>
    2226
    2327            <div id="group-dir-search" class="dir-search" role="search">
     
    7579            <?php wp_nonce_field( 'directory_groups', '_wpnonce-groups-filter' ); ?>
    7680
     81            <?php do_action( 'bp_after_directory_groups_content' ); ?>
     82
    7783        </form><!-- #groups-directory-form -->
     84
     85        <?php do_action( 'bp_after_directory_groups' ); ?>
    7886
    7987        </div><!-- .padder -->
    8088    </div><!-- #content -->
    8189
    82     <?php do_action( 'bp_after_directory_groups_content' ); ?>
     90    <?php do_action( 'bp_after_directory_groups_page' ); ?>
    8391
    8492<?php get_sidebar( 'buddypress' ); ?>
  • trunk/bp-themes/bp-default/members/index.php

    r4676 r4994  
    1212<?php get_header( 'buddypress' ); ?>
    1313
    14     <?php do_action( 'bp_before_directory_members_content' ); ?>
     14    <?php do_action( 'bp_before_directory_members_page' ); ?>
    1515
    1616    <div id="content">
    1717        <div class="padder">
    1818
     19        <?php do_action( 'bp_before_directory_members' ); ?>
     20
    1921        <form action="" method="post" id="members-directory-form" class="dir-form">
    2022
    2123            <h3><?php _e( 'Members Directory', 'buddypress' ); ?></h3>
     24
     25            <?php do_action( 'bp_before_directory_members_content' ); ?>
    2226
    2327            <div id="members-dir-search" class="dir-search" role="search">
     
    7781            <?php wp_nonce_field( 'directory_members', '_wpnonce-member-filter' ); ?>
    7882
     83            <?php do_action( 'bp_after_directory_members_content' ); ?>
     84
    7985        </form><!-- #members-directory-form -->
     86
     87        <?php do_action( 'bp_after_directory_members' ); ?>
    8088
    8189        </div><!-- .padder -->
    8290    </div><!-- #content -->
    8391
    84     <?php do_action( 'bp_after_directory_members_content' ); ?>
     92    <?php do_action( 'bp_after_directory_members_page' ); ?>
    8593
    8694<?php get_sidebar( 'buddypress' ); ?>
Note: See TracChangeset for help on using the changeset viewer.