Changeset 2950

Timestamp:

04/24/2010 03:34:25 PM (16 years ago)

Author:

apeatling

Message:

Return and echo functions for pagination counts.

Location:

trunk

Files:

• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-forums/bp-forums-templatetags.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (3 diffs)

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

@@ -174 +174 @@
 
 function bp_members_pagination_count() {
-        global $bp, $members_template;
-
-        $from_num = bp_core_number_format( intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1 );
-        $to_num = bp_core_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) );
-        $total = bp_core_number_format( $members_template->total_member_count );
-
-        if ( 'active' == $members_template->type )
-                echo sprintf( __( 'Viewing member %1$s to %2$s (of %3$s active members)', 'buddypress' ), $from_num, $to_num, $total );
-        else if ( 'popular' == $members_template->type )
-                echo sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members with friends)', 'buddypress' ), $from_num, $to_num, $total );
-        else if ( 'online' == $members_template->type )
-                echo sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members online)', 'buddypress' ), $from_num, $to_num, $total );
-        else
-                echo sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members)', 'buddypress' ), $from_num, $to_num, $total );
-
-        ?><span class="ajax-loader"></span><?php
-}
+        echo bp_get_members_pagination_count();
+}
+        function bp_get_members_pagination_count() {
+                global $bp, $members_template;
+
+                $from_num = bp_core_number_format( intval( ( $members_template->pag_page - 1 ) * $members_template->pag_num ) + 1 );
+                $to_num = bp_core_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) );
+                $total = bp_core_number_format( $members_template->total_member_count );
+
+                if ( 'active' == $members_template->type )
+                        $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s active members)', 'buddypress' ), $from_num, $to_num, $total );
+                else if ( 'popular' == $members_template->type )
+                        $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members with friends)', 'buddypress' ), $from_num, $to_num, $total );
+                else if ( 'online' == $members_template->type )
+                        $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members online)', 'buddypress' ), $from_num, $to_num, $total );
+                else
+                        $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members)', 'buddypress' ), $from_num, $to_num, $total );
+
+                return apply_filters( 'bp_members_pagination_count', $pag );
+        }
 
 function bp_members_pagination_links() {

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

@@ -662 +662 @@
 
 function bp_forum_pagination_count() {
-        global $bp, $forum_template;
-
-        $from_num = bp_core_number_format( intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1 );
-        $to_num = bp_core_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 ) );
-        $total = bp_core_number_format( $forum_template->total_topic_count );
-
-        $pag_filter = false;
-        if ( 'tags' == $forum_template->type && !empty( $forum_template->search_terms ) )
-                $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );
-
-        echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (%s total topics%s)', 'buddypress' ), $from_num, $to_num, $total, $pag_filter ) );
-?>
-<span class="ajax-loader"></span>
-<?php
-}
+        echo bp_get_forum_pagination_count();
+}
+        function bp_get_forum_pagination_count() {
+                global $bp, $forum_template;
+
+                $from_num = bp_core_number_format( intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1 );
+                $to_num = bp_core_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 ) );
+                $total = bp_core_number_format( $forum_template->total_topic_count );
+
+                $pag_filter = false;
+                if ( 'tags' == $forum_template->type && !empty( $forum_template->search_terms ) )
+                        $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );
+
+                return apply_filters( 'bp_get_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (of %s total topics%s)', 'buddypress' ), $from_num, $to_num, $total, $pag_filter ) );
+        }
 
 function bp_is_edit_topic() {

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

@@ -19 +19 @@
 
         var $single_group = false;
-
-        var $sort_by;
-        var $order;
 
         function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $include, $populate_extras ) {
@@ -65 +62 @@
 
                 $this->pag_links = paginate_links( array(
-                        'base' => add_query_arg( array( 'grpage' => '%#%', 'num' => $this->pag_num, 's' => $search_terms, 'sortby' => $this->sort_by, 'order' => $this->order ) ),
+                        'base' => add_query_arg( array( 'grpage' => '%#%' ) ),
                         'format' => '',
                         'total' => ceil($this->total_group_count / $this->pag_num),
@@ -551 +548 @@
 
 function bp_groups_pagination_count() {
-        global $bp, $groups_template;
-
-        $from_num = bp_core_number_format( intval( ( $groups_template->pag_page - 1 ) * $groups_template->pag_num ) + 1 );
-        $to_num = bp_core_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 ) );
-        $total = bp_core_number_format( $groups_template->total_group_count );
-
-        echo sprintf( __( 'Viewing group %1$s to %2$s (of %3$s groups)', 'buddypress' ), $from_num, $to_num, $total ); ?>  
-        <span class="ajax-loader"></span><?php
-}
+        echo bp_get_groups_pagination_count();
+}
+        function bp_get_groups_pagination_count() {
+                global $bp, $groups_template;
+
+                $from_num = bp_core_number_format( intval( ( $groups_template->pag_page - 1 ) * $groups_template->pag_num ) + 1 );
+                $to_num = bp_core_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 ) );
+                $total = bp_core_number_format( $groups_template->total_group_count );
+
+                return apply_filters( 'bp_get_groups_pagination_count', sprintf( __( 'Viewing group %1$s to %2$s (of %3$s groups)', 'buddypress' ), $from_num, $to_num, $total ) );
+        }
 
 function bp_group_total_members() {