Skip to:
Content

BuddyPress.org

Changeset 2198


Ignore:
Timestamp:
12/18/2009 10:20:35 AM (17 years ago)
Author:
apeatling
Message:

Applying number formatting to pagination and tabs.

Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

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

    r2189 r2198  
    171171        global $bp, $activities_template;
    172172
    173         $from_num = intval( ( $activities_template->pag_page - 1 ) * $activities_template->pag_num ) + 1;
    174         $to_num = ( $from_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $from_num + ( $activities_template->pag_num - 1) ;
     173        $from_num = number_format( intval( ( $activities_template->pag_page - 1 ) * $activities_template->pag_num ) + 1 );
     174        $to_num = number_format( ( $from_num + ( $activities_template->pag_num - 1 ) > $activities_template->total_activity_count ) ? $activities_template->total_activity_count : $from_num + ( $activities_template->pag_num - 1 ) );
    175175
    176176        echo sprintf( __( 'Viewing item %d to %d (of %d items)', 'buddypress' ), $from_num, $to_num, $activities_template->total_activity_count ); ?>  

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

    r2168 r2198  
    170170        global $bp, $blogs_template;
    171171
    172         $from_num = intval( ( $blogs_template->pag_page - 1 ) * $blogs_template->pag_num ) + 1;
    173         $to_num = ( $from_num + ( $blogs_template->pag_num - 1 ) > $blogs_template->total_blog_count ) ? $blogs_template->total_blog_count : $from_num + ( $blogs_template->pag_num - 1 ) ;
     172        $from_num = number_format( intval( ( $blogs_template->pag_page - 1 ) * $blogs_template->pag_num ) + 1 );
     173        $to_num = number_format( ( $from_num + ( $blogs_template->pag_num - 1 ) > $blogs_template->total_blog_count ) ? $blogs_template->total_blog_count : $from_num + ( $blogs_template->pag_num - 1 ) );
    174174
    175175        echo sprintf( __( 'Viewing blog %d to %d (of %d blogs)', 'buddypress' ), $from_num, $to_num, $blogs_template->total_blog_count ); ?>  
    … …  
    277277        }
    278278}
     279
     280function bp_total_blog_count() {
     281        echo bp_get_total_blog_count();
     282}
     283        function bp_get_total_blog_count() {
     284                return apply_filters( 'bp_get_total_blog_count', bp_blogs_total_blogs() );
     285        }
     286
     287function bp_total_blog_count_for_user( $user_id = false ) {
     288        echo bp_get_total_blog_count_for_user( $user_id );
     289}
     290        function bp_get_total_blog_count_for_user( $user_id = false ) {
     291                return apply_filters( 'bp_get_total_blog_count_for_user', bp_blogs_total_blogs_for_user( $user_id ) );
     292        }
    279293
    280294/***
    … …  
    11711185}
    11721186
    1173 function bp_total_blogs_for_user( $user_id = false ) {
    1174         global $bp;
    1175 
    1176         if ( !$user_id )
    1177                 $user_id = $bp->displayed_user->id;
    1178 
    1179         return apply_filters( 'bp_total_blogs_for_user', bp_blogs_total_blogs_for_user( $user_id ) );
    1180 }
    1181 
    1182 function bp_get_total_blog_count() {
    1183         return apply_filters( 'bp_get_total_blog_count', bp_blogs_total_blogs() );
    1184 }
    1185 
    11861187?>

  • trunk/bp-core.php

    r2175 r2198  
    11721172
    11731173        $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM " . CUSTOM_USER_TABLE . " WHERE spam = 0" ) );
    1174         return apply_filters( 'bp_core_get_total_member_count', (int)$count );
     1174        return apply_filters( 'bp_core_get_total_member_count', $count );
    11751175}
    11761176

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

    r2197 r2198  
    162162        global $bp, $members_template;
    163163
    164         $from_num = intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1;
    165         $to_num = ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1) ;
     164        $from_num = number_format( intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1 );
     165        $to_num = number_format( ( $from_num + ( $members_template->pag_num - 1 ) > $members_template->total_member_count ) ? $members_template->total_member_count : $from_num + ( $members_template->pag_num - 1) );
    166166
    167167        if ( 'active' == $members_template->type )
    … …  
    11111111}
    11121112
     1113function bp_total_member_count() {
     1114        echo bp_get_total_member_count();
     1115}
     1116        function bp_get_total_member_count() {
     1117                return apply_filters( 'bp_get_total_member_count', bp_core_get_total_member_count() );
     1118        }
     1119        add_filter( 'bp_get_total_member_count', 'number_format' );
     1120
    11131121/*** Signup form template tags **********************/
    11141122

  • trunk/bp-forums/bp-forums-filters.php

    r2077 r2198  
    3535add_filter( 'bp_get_the_topic_post_content', 'make_clickable' );
    3636
     37add_filter( 'bp_get_forum_topic_count_for_user', 'number_format' );
     38add_filter( 'bp_get_forum_topic_count', 'number_format' );
     39
    3740function bp_forums_add_allowed_tags( $allowedtags ) {
    3841        $allowedtags['p'] = array();

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

    r2194 r2198  
    642642        global $bp, $forum_template;
    643643
    644         $from_num = intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1;
    645         $to_num = ( $from_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $from_num + ( $forum_template->pag_num - 1 );
     644        $from_num = number_format( intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1 );
     645        $to_num = number_format( ( $from_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $from_num + ( $forum_template->pag_num - 1 ) );
    646646
    647647        echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %d to %d (%d total topics)', 'buddypress' ), $from_num, $to_num, $forum_template->total_topic_count ) );
    … …  
    10031003        }
    10041004
     1005function bp_forum_topic_count_for_user( $user_id = false ) {
     1006        echo bp_get_forum_topic_count_for_user( $user_id );
     1007}
     1008        function bp_get_forum_topic_count_for_user( $user_id = false ) {
     1009                return apply_filters( 'bp_get_forum_topic_count_for_user', bp_forums_total_topic_count_for_user( $user_id ) );
     1010        }
     1011
     1012function bp_forum_topic_count( $user_id = false ) {
     1013        echo bp_get_forum_topic_count( $user_id );
     1014}
     1015        function bp_get_forum_topic_count( $user_id = false ) {
     1016                return apply_filters( 'bp_get_forum_topic_count', bp_forums_total_topic_count( $user_id ) );
     1017        }
    10051018?>

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

    r2168 r2198  
    193193        }
    194194
    195 ?>
     195function bp_total_friend_count( $user_id = false ) {
     196        echo bp_get_total_friend_count( $user_id );
     197}
     198        function bp_get_total_friend_count( $user_id = false ) {
     199                return apply_filters( 'bp_get_total_friend_count', friends_get_total_friend_count( $user_id ) );
     200        }
     201        add_filter( 'bp_get_total_friend_count', 'number_format' );
     202?>

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

    r2168 r2198  
    5757add_filter( 'groups_group_news_before_save', 'force_balance_tags' );
    5858
     59add_filter( 'bp_get_total_group_count', 'number_format' );
     60add_filter( 'bp_get_group_total_for_member', 'number_format' );
     61add_filter( 'bp_get_group_total_members', 'number_format' );
     62
    5963/**** Filters for group forums ****/
    6064

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

    r2168 r2198  
    676676        global $bp, $groups_template;
    677677
    678         $from_num = intval( ( $groups_template->pag_page - 1 ) * $groups_template->pag_num ) + 1;
    679         $to_num = ( $from_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $from_num + ( $groups_template->pag_num - 1) ;
     678        $from_num = number_format( intval( ( $groups_template->pag_page - 1 ) * $groups_template->pag_num ) + 1 );
     679        $to_num = number_format( ( $from_num + ( $groups_template->pag_num - 1 ) > $groups_template->total_group_count ) ? $groups_template->total_group_count : $from_num + ( $groups_template->pag_num - 1 ) );
    680680
    681681        echo sprintf( __( 'Viewing group %d to %d (of %d groups)', 'buddypress' ), $from_num, $to_num, $groups_template->total_group_count ); ?>  
    682682        <span class="ajax-loader"></span><?php
    683683}
    684 
    685 function bp_total_group_count() {
    686         echo bp_get_total_group_count();
    687 }
    688         function bp_get_total_group_count() {
    689                 global $groups_template;
    690 
    691                 return apply_filters( 'bp_get_total_group_count', $groups_template->total_group_count );
    692         }
    693684
    694685function bp_group_total_members( $deprecated = true, $deprecated2 = false ) {
    … …  
    714705
    715706                if ( 1 == (int) $groups_template->group->total_member_count )
    716                         return apply_filters( 'bp_get_group_member_count', sprintf( __( '%d member', 'buddypress' ), (int) $groups_template->group->total_member_count ) );
     707                        return apply_filters( 'bp_get_group_member_count', sprintf( __( '%d member', 'buddypress' ), number_format( (int) $groups_template->group->total_member_count ) ) );
    717708                else
    718                         return apply_filters( 'bp_get_group_member_count', sprintf( __( '%d members', 'buddypress' ), (int) $groups_template->group->total_member_count ) );
     709                        return apply_filters( 'bp_get_group_member_count', sprintf( __( '%d members', 'buddypress' ), number_format( (int) $groups_template->group->total_member_count ) ) );
    719710        }
    720711
    … …  
    12021193        }
    12031194}
     1195
     1196function bp_total_group_count() {
     1197        echo bp_get_total_blog_count();
     1198}
     1199        function bp_get_total_group_count() {
     1200                return apply_filters( 'bp_get_total_group_count', groups_get_total_group_count() );
     1201        }
     1202
     1203function bp_total_group_count_for_user( $user_id = false ) {
     1204        echo bp_get_total_blog_count_for_user( $user_id );
     1205}
     1206        function bp_get_total_group_count_for_user( $user_id = false ) {
     1207                return apply_filters( 'bp_get_total_group_count_for_user', groups_total_groups_for_user( $user_id ) );
     1208        }
    12041209
    12051210

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

    r2191 r2198  
    274274        global $messages_template;
    275275
    276         $from_num = intval( ( $messages_template->pag_page - 1 ) * $messages_template->pag_num ) + 1;
    277         $to_num = ( $from_num + ( $messages_template->pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $from_num + ( $messages_template->pag_num - 1) ;
     276        $from_num = number_format( intval( ( $messages_template->pag_page - 1 ) * $messages_template->pag_num ) + 1 );
     277        $to_num = number_format( ( $from_num + ( $messages_template->pag_num - 1 ) > $messages_template->total_thread_count ) ? $messages_template->total_thread_count : $from_num + ( $messages_template->pag_num - 1 ) );
    278278
    279279        echo sprintf( __( 'Viewing message %d to %d (of %d messages)', 'buddypress' ), $from_num, $to_num, $messages_template->total_thread_count ); ?> &nbsp;

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

    r2170 r2198  
    2020                                <div class="item-list-tabs">
    2121                                        <ul>
    22                                                 <li class="selected" id="activity-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Members (%d)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
     22                                                <li class="selected" id="activity-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
    2323
    2424                                                <?php if ( is_user_logged_in() ) : ?>
    25                                                         <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%d)', 'buddypress' ), friends_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
    26                                                         <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%d)', 'buddypress' ), groups_total_groups_for_user( bp_loggedin_user_id() ) ) ?></a></li>
     25                                                        <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), friends_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
     26                                                        <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . BP_ACTIVITY_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), groups_total_groups_for_user( bp_loggedin_user_id() ) ) ?></a></li>
    2727                                                <?php endif; ?>
    2828

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

    r2170 r2198  
    1616                        <div class="item-list-tabs">
    1717                                <ul>
    18                                         <li class="selected" id="blogs-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Blogs (%d)', 'buddypress' ), bp_get_total_blog_count() ) ?></a></li>
     18                                        <li class="selected" id="blogs-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Blogs (%s)', 'buddypress' ), bp_get_total_blog_count() ) ?></a></li>
    1919
    20                                         <?php if ( is_user_logged_in() && bp_total_blogs_for_user( bp_loggedin_user_id() ) ) : ?>
    21                                                 <li id="blogs-myblogs"><a href="<?php echo bp_loggedin_user_domain() . BP_BLOGS_SLUG . '/my-blogs/' ?>"><?php printf( __( 'My Blogs (%d)', 'buddypress' ), bp_total_blogs_for_user( bp_loggedin_user_id() ) ) ?></a></li>
     20                                        <?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
     21                                                <li id="blogs-myblogs"><a href="<?php echo bp_loggedin_user_domain() . BP_BLOGS_SLUG . '/my-blogs/' ?>"><?php printf( __( 'My Blogs (%s)', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
    2222                                        <?php endif; ?>
    2323

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

    r2194 r2198  
    7070                        <div class="item-list-tabs">
    7171                                <ul>
    72                                         <li class="selected" id="forums-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Topics (%d)', 'buddypress' ), bp_forums_total_topic_count() ) ?></a></li>
     72                                        <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>
    7373
    74                                         <?php if ( is_user_logged_in() && bp_forums_total_topic_count_for_user( bp_loggedin_user_id() ) ) : ?>
    75                                                 <li id="forums-mytopics"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/' ?>"><?php printf( __( 'My Topics (%d)', 'buddypress' ), bp_forums_total_topic_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
     74                                        <?php if ( is_user_logged_in() && bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?>
     75                                                <li id="forums-mytopics"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/' ?>"><?php printf( __( 'My Topics (%s)', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
    7676                                        <?php endif; ?>
    7777

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

    r2170 r2198  
    1515                        <div class="item-list-tabs">
    1616                                <ul>
    17                                         <li class="selected" id="groups-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Groups (%d)', 'buddypress' ), groups_get_total_group_count() ) ?></a></li>
     17                                        <li class="selected" id="groups-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Groups (%s)', 'buddypress' ), bp_get_total_group_count() ) ?></a></li>
    1818
    19                                         <?php if ( is_user_logged_in() && groups_total_groups_for_user( bp_loggedin_user_id() ) ) : ?>
    20                                                 <li id="groups-mygroups"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%d)', 'buddypress' ), groups_total_groups_for_user( bp_loggedin_user_id() ) ) ?></a></li>
     19                                        <?php if ( is_user_logged_in() && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
     20                                                <li id="groups-mygroups"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
    2121                                        <?php endif; ?>
    2222

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

    r2170 r2198  
    1616                        <div class="item-list-tabs">
    1717                                <ul>
    18                                         <li class="selected" id="members-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Members (%d)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
     18                                        <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>
    1919
    20                                         <?php if ( is_user_logged_in() && friends_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
    21                                                 <li id="members-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_FRIENDS_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%d)', 'buddypress' ), friends_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
     20                                        <?php if ( is_user_logged_in() && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
     21                                                <li id="members-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_FRIENDS_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
    2222                                        <?php endif; ?>
    2323
Note: See TracChangeset for help on using the changeset viewer.