Ticket #1177: widget_control_2010_4_28.patch
| File widget_control_2010_4_28.patch, 9.0 KB (added by , 17 years ago) |
|---|
-
bp-core/bp-core-widgets.php
18 18 wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . '/bp-core/js/widget-members.js', array('jquery') ); 19 19 } 20 20 21 function widget( $args, $instance) {21 function widget( $args, $instance ) { 22 22 global $bp; 23 23 24 24 extract( $args ); 25 25 26 if ( !$instance['member_default'] ) 27 $instance['member_default'] = 'active'; 28 26 29 echo $before_widget; 27 30 echo $before_title 28 31 . $widget_name 29 32 . $after_title; ?> 30 33 31 <?php if ( bp_has_members( 'user_id=0&type= newest&max=' . $instance['max_members'] . '&populate_extras=0' ) ) : ?>34 <?php if ( bp_has_members( 'user_id=0&type=' . $instance['member_default'] . '&max=' . $instance['max_members'] . '&populate_extras=0' ) ) : ?> 32 35 <div class="item-options" id="members-list-options"> 33 36 <span class="ajax-loader" id="ajax-loader-members"></span> 34 <a href="<?php echo site_url() . '/' . $bp->members->slug ?>" id="newest-members" class="selected"><?php _e( 'Newest', 'buddypress' ) ?></a> |35 <a href="<?php echo site_url() . '/' . $bp->members->slug ?>" id="recently-active-members" ><?php _e( 'Active', 'buddypress' ) ?></a> |36 <a href="<?php echo site_url() . '/' . $bp->members->slug ?>" id="popular-members" ><?php _e( 'Popular', 'buddypress' ) ?></a>37 <a href="<?php echo site_url() . '/' . $bp->members->slug ?>" id="newest-members"<?php if ( $instance['member_default'] == 'newest' ) : ?> class="selected"<?php endif; ?>><?php _e( 'Newest', 'buddypress' ) ?></a> | 38 <a href="<?php echo site_url() . '/' . $bp->members->slug ?>" id="recently-active-members"<?php if ( $instance['member_default'] == 'active' ) : ?> class="selected"<?php endif; ?>><?php _e( 'Active', 'buddypress' ) ?></a> | 39 <a href="<?php echo site_url() . '/' . $bp->members->slug ?>" id="popular-members"<?php if ( $instance['member_default'] == 'popular' ) : ?> class="selected"<?php endif; ?>><?php _e( 'Popular', 'buddypress' ) ?></a> 37 40 </div> 38 41 39 42 <ul id="members-list" class="item-list"> … … 45 48 46 49 <div class="item"> 47 50 <div class="item-title fn"><a href="<?php bp_member_permalink() ?>" title="<?php bp_member_name() ?>"><?php bp_member_name() ?></a></div> 48 <div class="item-meta"><span class="activity"><?php bp_member_registered() ?></span></div> 51 <div class="item-meta"> 52 <span class="activity"> 53 <?php 54 if ( 'newest' == $instance['member_default'] ) 55 bp_member_registered(); 56 if ( 'active' == $instance['member_default'] ) 57 bp_member_last_active(); 58 if ( 'popular' == $instance['member_default'] ) 59 bp_member_total_friend_count(); 60 ?> 61 </span> 62 </div> 49 63 </div> 50 64 </li> 51 65 … … 69 83 function update( $new_instance, $old_instance ) { 70 84 $instance = $old_instance; 71 85 $instance['max_members'] = strip_tags( $new_instance['max_members'] ); 86 $instance['member_default'] = strip_tags( $new_instance['member_default'] ); 72 87 73 88 return $instance; 74 89 } … … 76 91 function form( $instance ) { 77 92 $instance = wp_parse_args( (array) $instance, array( 'max_members' => 5 ) ); 78 93 $max_members = strip_tags( $instance['max_members'] ); 94 $member_default = strip_tags( $instance['member_default'] ); 79 95 ?> 80 96 81 97 <p><label for="bp-core-widget-members-max"><?php _e('Max Members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo attribute_escape( $max_members ); ?>" style="width: 30%" /></label></p> 98 99 <p><label for="bp-groups-widget-member-default"><?php _e('Default members to show:', 'buddypress'); ?> 100 <ul> 101 <li><input id="<?php echo $this->get_field_id( 'member_default' )-newest; ?>" name="<?php echo $this->get_field_name( 'member_default' ); ?>" type="radio" value="newest" <?php if ($member_default == "newest") echo "checked"; ?> /> Newest</li> 102 <li><input id="<?php echo $this->get_field_id( 'member_default' )-active; ?>" name="<?php echo $this->get_field_name( 'member_default' ); ?>" type="radio" value="active" <?php if ($member_default == "active") echo "checked"; ?>/> Recently Active</li> 103 <li><input id="<?php echo $this->get_field_id( 'member_default' )-popular; ?>" name="<?php echo $this->get_field_name( 'member_default' ); ?>" type="radio" value="popular" <?php if ($member_default == "popular") echo "checked"; ?>/> Popular</li> 104 </label> 105 </p> 106 107 82 108 <?php 83 109 } 84 110 } -
bp-groups/bp-groups-widgets.php
21 21 22 22 extract( $args ); 23 23 24 if ( !$instance['group_default'] ) 25 $instance['group_default'] = 'popular'; 26 24 27 echo $before_widget; 25 28 echo $before_title 26 29 . $widget_name 27 30 . $after_title; ?> 28 31 29 <?php if ( bp_has_groups( 'type= popular&per_page=' . $instance['max_groups'] . '&max=' . $instance['max_groups'] ) ) : ?>32 <?php if ( bp_has_groups( 'type=' . $instance['group_default'] . '&max=' . $instance['max_groups'] ) ) : ?> 30 33 <div class="item-options" id="groups-list-options"> 31 34 <span class="ajax-loader" id="ajax-loader-groups"></span> 32 <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="newest-groups" ><?php _e("Newest", 'buddypress') ?></a> |33 <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="recently-active-groups" ><?php _e("Active", 'buddypress') ?></a> |34 <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="popular-groups" class="selected" ><?php _e("Popular", 'buddypress') ?></a>35 <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="newest-groups"<?php if ( $instance['group_default'] == 'newest' ) : ?> class="selected"<?php endif; ?>><?php _e("Newest", 'buddypress') ?></a> | 36 <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="recently-active-groups"<?php if ( $instance['group_default'] == 'active' ) : ?> class="selected"<?php endif; ?>><?php _e("Active", 'buddypress') ?></a> | 37 <a href="<?php echo site_url() . '/' . $bp->groups->slug ?>" id="popular-groups" class="selected"<?php if ( $instance['group_default'] == 'popular' ) : ?> class="selected"<?php endif; ?>><?php _e("Popular", 'buddypress') ?></a> 35 38 </div> 36 39 37 40 <ul id="groups-list" class="item-list"> … … 43 46 44 47 <div class="item"> 45 48 <div class="item-title"><a href="<?php bp_group_permalink() ?>" title="<?php bp_group_name() ?>"><?php bp_group_name() ?></a></div> 46 <div class="item-meta"><span class="activity"><?php bp_group_member_count() ?></span></div> 49 <div class="item-meta"> 50 <span class="activity"> 51 <?php 52 if ( 'newest' == $instance['group_default'] ) 53 printf( __( 'created %s ago', 'buddypress' ), bp_get_group_date_created() ); 54 if ( 'active' == $instance['group_default'] ) 55 printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() ); 56 else if ( 'popular' == $instance['group_default'] ) 57 bp_group_member_count(); 58 ?> 59 </span> 60 </div> 47 61 </div> 48 62 </li> 49 63 … … 67 81 function update( $new_instance, $old_instance ) { 68 82 $instance = $old_instance; 69 83 $instance['max_groups'] = strip_tags( $new_instance['max_groups'] ); 84 $instance['group_default'] = strip_tags( $new_instance['group_default'] ); 70 85 71 86 return $instance; 72 87 } … … 74 89 function form( $instance ) { 75 90 $instance = wp_parse_args( (array) $instance, array( 'max_groups' => 5 ) ); 76 91 $max_groups = strip_tags( $instance['max_groups'] ); 92 $group_default = strip_tags( $instance['group_default'] ); 77 93 ?> 78 94 79 95 <p><label for="bp-groups-widget-groups-max"><?php _e('Max groups to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_groups' ); ?>" name="<?php echo $this->get_field_name( 'max_groups' ); ?>" type="text" value="<?php echo attribute_escape( $max_groups ); ?>" style="width: 30%" /></label></p> 96 97 <p> 98 <label for="bp-groups-widget-groups-default"><?php _e('Default groups to show:', 'buddypress'); ?> 99 <ul> 100 <li><input id="<?php echo $this->get_field_id( 'group_default' )-newest; ?>" name="<?php echo $this->get_field_name( 'group_default' ); ?>" type="radio" value="newest" <?php if ($group_default == "newest") echo "checked"; ?> /> Newest</li> 101 <li><input id="<?php echo $this->get_field_id( 'group_default' )-active; ?>" name="<?php echo $this->get_field_name( 'group_default' ); ?>" type="radio" value="active" <?php if ($group_default == "active") echo "checked"; ?>/> Recently Active</li> 102 <li><input id="<?php echo $this->get_field_id( 'group_default' )-popular; ?>" name="<?php echo $this->get_field_name( 'group_default' ); ?>" type="radio" value="popular" <?php if ($group_default == "popular") echo "checked"; ?>/> Popular</li> 103 104 </ul> 105 </label> 106 </p> 107 80 108 <?php 81 109 } 82 110 }
![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png)