Changeset 4804
- Timestamp:
- 07/22/2011 05:02:46 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 18 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity/bp-activity-filters.php
r4738 r4804 192 192 193 193 if ( strlen( $excerpt ) > $excerpt_length ) 194 $excerpt = sprintf( '%1$s<span class="activity-read-more" id="%2$s"><a href="%3$s" rel="nofollow">%4$s</a> <span class="ajax-loader"></span></span>', bp_create_excerpt( $excerpt, $excerpt_length, true, '…' ), $id, bp_get_activity_thread_permalink(), $append_text );194 $excerpt = sprintf( '%1$s<span class="activity-read-more" id="%2$s"><a href="%3$s" rel="nofollow">%4$s</a></span>', bp_create_excerpt( $excerpt, $excerpt_length, true, '…' ), $id, bp_get_activity_thread_permalink(), $append_text ); 195 195 196 196 return apply_filters( 'bp_activity_truncate_entry', $excerpt, $text, $append_text ); -
trunk/bp-activity/bp-activity-template.php
r4786 r4804 399 399 $total = bp_core_number_format( $activities_template->total_activity_count ); 400 400 401 return sprintf( __( 'Viewing item %1$s to %2$s (of %3$s items)', 'buddypress' ), $from_num, $to_num, $total ) . ' <span class="ajax-loader"></span>';401 return sprintf( __( 'Viewing item %1$s to %2$s (of %3$s items)', 'buddypress' ), $from_num, $to_num, $total ); 402 402 } 403 403 -
trunk/bp-blogs/bp-blogs-template.php
r4780 r4804 254 254 $total = bp_core_number_format( $blogs_template->total_blog_count ); 255 255 256 echo sprintf( __( 'Viewing site %1$s to %2$s (of %3$s sites)', 'buddypress' ), $from_num, $to_num, $total ); ?> 257 <span class="ajax-loader"></span><?php 256 echo sprintf( __( 'Viewing site %1$s to %2$s (of %3$s sites)', 'buddypress' ), $from_num, $to_num, $total ); 258 257 } 259 258 -
trunk/bp-core/bp-core-widgets.php
r4211 r4804 52 52 53 53 <?php endif; ?> 54 55 <span class="ajax-loader" id="ajax-loader-members"></span>56 54 </div> 57 55 -
trunk/bp-core/js/widget-members.dev.js
r3771 r4804 2 2 jQuery(".widget div#members-list-options a").live('click', 3 3 function() { 4 jQuery('#ajax-loader-members').toggle(); 4 var link = this; 5 jQuery(link).addClass('loading'); 5 6 6 7 jQuery(".widget div#members-list-options a").removeClass("selected"); … … 16 17 function(response) 17 18 { 18 jQuery( '#ajax-loader-members').toggle();19 jQuery(link).removeClass('loading'); 19 20 member_wiget_response(response); 20 21 }); -
trunk/bp-core/js/widget-members.js
r3771 r4804 1 jQuery(document).ready(function(){jQuery(".widget div#members-list-options a").live("click",function(){ jQuery("#ajax-loader-members").toggle();jQuery(".widget div#members-list-options a").removeClass("selected");jQuery(this).addClass("selected");jQuery.post(ajaxurl,{action:"widget_members",cookie:encodeURIComponent(document.cookie),_wpnonce:jQuery("input#_wpnonce-members").val(),"max-members":jQuery("input#members_widget_max").val(),filter:jQuery(this).attr("id")},function(a){jQuery("#ajax-loader-members").toggle();member_wiget_response(a)});return false})});function member_wiget_response(a){a=a.substr(0,a.length-1);a=a.split("[[SPLIT]]");if(a[0]!="-1"){jQuery(".widget ul#members-list").fadeOut(200,function(){jQuery(".widget ul#members-list").html(a[1]);jQuery(".widget ul#members-list").fadeIn(200)})}else{jQuery(".widget ul#members-list").fadeOut(200,function(){var b="<p>"+a[1]+"</p>";jQuery(".widget ul#members-list").html(b);jQuery(".widget ul#members-list").fadeIn(200)})}};1 jQuery(document).ready(function(){jQuery(".widget div#members-list-options a").live("click",function(){var a=this;jQuery(a).addClass("loading");jQuery(".widget div#members-list-options a").removeClass("selected");jQuery(this).addClass("selected");jQuery.post(ajaxurl,{action:"widget_members",cookie:encodeURIComponent(document.cookie),_wpnonce:jQuery("input#_wpnonce-members").val(),"max-members":jQuery("input#members_widget_max").val(),filter:jQuery(this).attr("id")},function(b){jQuery(a).removeClass("loading");member_wiget_response(b)});return false})});function member_wiget_response(a){a=a.substr(0,a.length-1);a=a.split("[[SPLIT]]");if(a[0]!="-1"){jQuery(".widget ul#members-list").fadeOut(200,function(){jQuery(".widget ul#members-list").html(a[1]);jQuery(".widget ul#members-list").fadeIn(200)})}else{jQuery(".widget ul#members-list").fadeOut(200,function(){var b="<p>"+a[1]+"</p>";jQuery(".widget ul#members-list").html(b);jQuery(".widget ul#members-list").fadeIn(200)})}}; -
trunk/bp-forums/bp-forums-template.php
r4787 r4804 894 894 $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms ); 895 895 896 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 ) . '<span class="ajax-loader"></span>');896 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 ) ); 897 897 } 898 898 … … 1228 1228 1229 1229 echo apply_filters( 'bp_the_topic_pagination_count', sprintf( __( 'Viewing post %1$s to %2$s (%3$s total posts)', 'buddypress' ), $from_num, $to_num, $total ) ); 1230 ?>1231 <span class="ajax-loader"></span>1232 <?php1233 1230 } 1234 1231 -
trunk/bp-groups/bp-groups-functions.php
r4801 r4804 124 124 125 125 if ( $notify_members ) { 126 require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );127 126 groups_notification_group_updated( $group->id ); 128 127 } … … 520 519 'item_id' => $group_id 521 520 ) ); 522 523 // Require the notifications code so email notifications can be set on524 // the 'bp_activity_posted_update' action.525 require( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );526 521 527 522 groups_update_groupmeta( $group_id, 'last_activity', bp_core_current_time() ); … … 774 769 $admins = groups_get_group_admins( $group_id ); 775 770 776 require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );777 778 771 // Saved okay, now send the email notification 779 772 for ( $i = 0, $count = count( $admins ); $i < $count; ++$i ) … … 819 812 820 813 // Send a notification to the user. 821 require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );822 814 groups_notification_membership_request_completed( $membership->user_id, $membership->group_id, true ); 823 815 … … 832 824 833 825 // Send a notification to the user. 834 require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );835 826 groups_notification_membership_request_completed( $membership->user_id, $membership->group_id, false ); 836 827 -
trunk/bp-groups/bp-groups-template.php
r4786 r4804 732 732 $total = bp_core_number_format( $groups_template->total_group_count ); 733 733 734 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 ) . '<span class="ajax-loader"></span>');734 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 ) ); 735 735 } 736 736 -
trunk/bp-groups/bp-groups-widgets.php
r4678 r4804 49 49 <a href="<?php echo site_url( bp_get_groups_root_slug() ); ?>" id="recently-active-groups"<?php if ( $instance['group_default'] == 'active' ) : ?> class="selected"<?php endif; ?>><?php _e("Active", 'buddypress') ?></a> | 50 50 <a href="<?php echo site_url( bp_get_groups_root_slug() ); ?>" id="popular-groups" <?php if ( $instance['group_default'] == 'popular' ) : ?> class="selected"<?php endif; ?>><?php _e("Popular", 'buddypress') ?></a> 51 <span class="ajax-loader" id="ajax-loader-groups"></span>52 51 </div> 53 52 -
trunk/bp-groups/js/widget-groups.dev.js
r3771 r4804 2 2 jQuery(".widget div#groups-list-options a").live('click', 3 3 function() { 4 jQuery('#ajax-loader-groups').toggle(); 4 var link = this; 5 jQuery(link).addClass('loading'); 5 6 6 7 jQuery(".widget div#groups-list-options a").removeClass("selected"); … … 16 17 function(response) 17 18 { 18 jQuery( '#ajax-loader-groups').toggle();19 jQuery(link).removeClass('loading'); 19 20 groups_wiget_response(response); 20 21 }); -
trunk/bp-groups/js/widget-groups.js
r3771 r4804 1 jQuery(document).ready(function(){jQuery(".widget div#groups-list-options a").live("click",function(){ jQuery("#ajax-loader-groups").toggle();jQuery(".widget div#groups-list-options a").removeClass("selected");jQuery(this).addClass("selected");jQuery.post(ajaxurl,{action:"widget_groups_list",cookie:encodeURIComponent(document.cookie),_wpnonce:jQuery("input#_wpnonce-groups").val(),max_groups:jQuery("input#groups_widget_max").val(),filter:jQuery(this).attr("id")},function(a){jQuery("#ajax-loader-groups").toggle();groups_wiget_response(a)});return false})});function groups_wiget_response(a){a=a.substr(0,a.length-1);a=a.split("[[SPLIT]]");if(a[0]!="-1"){jQuery(".widget ul#groups-list").fadeOut(200,function(){jQuery(".widget ul#groups-list").html(a[1]);jQuery(".widget ul#groups-list").fadeIn(200)})}else{jQuery(".widget ul#groups-list").fadeOut(200,function(){var b="<p>"+a[1]+"</p>";jQuery(".widget ul#groups-list").html(b);jQuery(".widget ul#groups-list").fadeIn(200)})}};1 jQuery(document).ready(function(){jQuery(".widget div#groups-list-options a").live("click",function(){var a=this;jQuery(a).addClass("loading");jQuery(".widget div#groups-list-options a").removeClass("selected");jQuery(this).addClass("selected");jQuery.post(ajaxurl,{action:"widget_groups_list",cookie:encodeURIComponent(document.cookie),_wpnonce:jQuery("input#_wpnonce-groups").val(),max_groups:jQuery("input#groups_widget_max").val(),filter:jQuery(this).attr("id")},function(b){jQuery(a).removeClass("loading");groups_wiget_response(b)});return false})});function groups_wiget_response(a){a=a.substr(0,a.length-1);a=a.split("[[SPLIT]]");if(a[0]!="-1"){jQuery(".widget ul#groups-list").fadeOut(200,function(){jQuery(".widget ul#groups-list").html(a[1]);jQuery(".widget ul#groups-list").fadeIn(200)})}else{jQuery(".widget ul#groups-list").fadeOut(200,function(){var b="<p>"+a[1]+"</p>";jQuery(".widget ul#groups-list").html(b);jQuery(".widget ul#groups-list").fadeIn(200)})}}; -
trunk/bp-members/bp-members-template.php
r4786 r4804 358 358 $pag = sprintf( __( 'Viewing member %1$s to %2$s (of %3$s members)', 'buddypress' ), $from_num, $to_num, $total ); 359 359 360 return apply_filters( 'bp_members_pagination_count', $pag . '<span class="ajax-loader"></span>');360 return apply_filters( 'bp_members_pagination_count', $pag ); 361 361 } 362 362 -
trunk/bp-messages/bp-messages-template.php
r4779 r4804 340 340 $total = bp_core_number_format( $messages_template->total_thread_count ); 341 341 342 echo sprintf( __( 'Viewing message %1$s to %2$s (of %3$s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?> 343 <span class="ajax-loader"></span><?php 342 echo sprintf( __( 'Viewing message %1$s to %2$s (of %3$s messages)', 'buddypress' ), $from_num, $to_num, $total ); ?><?php 344 343 } 345 344 -
trunk/bp-themes/bp-default/_inc/css/default-rtl.css
r4708 r4804 576 576 5.3 - Ajax Loading 577 577 --------------------------------------------------------------*/ 578 .ajax-loader {579 background-position: right center !important;580 }581 578 a.loading { 582 579 background-position: 5% 50% !important; -
trunk/bp-themes/bp-default/_inc/css/default.css
r4775 r4804 1481 1481 6.3 - Ajax Loading 1482 1482 --------------------------------------------------------------*/ 1483 .ajax-loader {1484 background: url( ../images/ajax-loader.gif ) center left no-repeat !important;1485 display: none;1486 padding: 8px 8px 3px 8px;1487 }1488 1483 a.loading, 1489 1484 input.loading { -
trunk/bp-themes/bp-default/_inc/global.js
r4800 r4804 279 279 var inner_class = type == 'acomment' ? 'acomment-content' : 'activity-inner'; 280 280 var a_inner = jq('li#' + type + '-' + a_id + ' .' + inner_class + ':first' ); 281 target.parent().children('.ajax-loader').show();281 jq(target).addClass('loading'); 282 282 283 283 jq.post( ajaxurl, { -
trunk/bp-themes/bp-default/activity/activity-loop.php
r4193 r4804 39 39 40 40 <li class="load-more"> 41 <a href="#more"><?php _e( 'Load More', 'buddypress' ); ?></a> <span class="ajax-loader"></span>41 <a href="#more"><?php _e( 'Load More', 'buddypress' ); ?></a> 42 42 </li> 43 43
Note: See TracChangeset
for help on using the changeset viewer.