Changeset 2077 for trunk/bp-core/bp-core-widgets.php

Timestamp:

11/02/2009 07:54:21 PM (16 years ago)

Author:

apeatling

Message:

Merging 1.1 branch changes and syncing.

File:

• trunk/bp-core/bp-core-widgets.php (modified) (15 diffs)

trunk/bp-core/bp-core-widgets.php

@@ -31 +31 @@
         <div class="create-account"><div class="visit generic-button"><a href="<?php bp_signup_page() ?>" title="<?php _e('Create Account', 'buddypress') ?>"><?php _e('Create Account', 'buddypress') ?></a></div></div>
         <?php } ?>
-    
+
         <?php echo $after_widget; ?>
     <?php
@@ -74 +74 @@
 
         if ( is_active_widget( false, false, $this->id_base ) )
-            wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . '/bp-core/js/widget-members.js', array('jquery', 'jquery-livequery-pack') );        
+            wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . '/bp-core/js/widget-members.js', array('jquery', 'jquery-livequery-pack') );
     }
 
     function widget($args, $instance) {
         global $bp;
-        
+
         extract( $args );
-        
+
         echo $before_widget;
         echo $before_title
-           . $widget_name 
+           . $widget_name
            . $after_title; ?>
 
@@ -90 +90 @@
             <div class="item-options" id="members-list-options">
                 <span class="ajax-loader" id="ajax-loader-members"></span>
-                <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="newest-members" class="selected"><?php _e( 'Newest', 'buddypress' ) ?></a> | 
-                <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="recently-active-members"><?php _e( 'Active', 'buddypress' ) ?></a> | 
+                <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="newest-members" class="selected"><?php _e( 'Newest', 'buddypress' ) ?></a> |
+                <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="recently-active-members"><?php _e( 'Active', 'buddypress' ) ?></a> |
                 <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="popular-members"><?php _e( 'Popular', 'buddypress' ) ?></a>
             </div>
-            
+
             <ul id="members-list" class="item-list">
                 <?php while ( bp_site_members() ) : bp_the_site_member(); ?>
@@ -109 +109 @@
 
                 <?php endwhile; ?>
-            </ul>       
+            </ul>
             <?php wp_nonce_field( 'bp_core_widget_members', '_wpnonce-members' ); ?>
             <input type="hidden" name="members_widget_max" id="members_widget_max" value="<?php echo attribute_escape( $instance['max_members'] ); ?>" />
-            
+
         <?php else: ?>
 
@@ -120 +120 @@
 
         <?php endif; ?>
-            
+
         <?php echo $after_widget; ?>
     <?php
@@ -151 +151 @@
     function widget($args, $instance) {
         global $bp;
-        
+
         extract( $args );
-        
+
         echo $before_widget;
         echo $before_title
-           . $widget_name 
+           . $widget_name
            . $after_title; ?>
-        
-        <?php if ( bp_has_site_members( 'type=online&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] ) ) : ?>            
+
+        <?php if ( bp_has_site_members( 'type=online&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] ) ) : ?>
             <div class="avatar-block">
                 <?php while ( bp_site_members() ) : bp_the_site_member(); ?>
@@ -166 +166 @@
                     </div>
                 <?php endwhile; ?>
-            </div>                  
+            </div>
         <?php else: ?>
 
@@ -174 +174 @@
 
         <?php endif; ?>
-            
+
         <?php echo $after_widget; ?>
     <?php
@@ -205 +205 @@
     function widget($args, $instance) {
         global $bp;
-        
+
         extract( $args );
-        
+
         echo $before_widget;
         echo $before_title
-           . $widget_name 
+           . $widget_name
            . $after_title; ?>
-            
-        <?php if ( bp_has_site_members( 'type=active&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] ) ) : ?>            
+
+        <?php if ( bp_has_site_members( 'type=active&per_page=' . $instance['max_members'] . '&max=' . $instance['max_members'] ) ) : ?>
             <div class="avatar-block">
                 <?php while ( bp_site_members() ) : bp_the_site_member(); ?>
@@ -220 +220 @@
                     </div>
                 <?php endwhile; ?>
-            </div>                  
+            </div>
         <?php else: ?>
 
@@ -228 +228 @@
 
         <?php endif; ?>
-            
+
         <?php echo $after_widget; ?>
     <?php
@@ -256 +256 @@
 
     check_ajax_referer('bp_core_widget_members');
-    
+
     switch ( $_POST['filter'] ) {
         case 'newest-members':
@@ -277 +277 @@
         break;
     }
-    
+
     if ( $users['users'] ) {
         echo '0[[SPLIT]]'; // return valid result.
-    
+
         foreach ( (array) $users['users'] as $user ) {
         ?>
@@ -292 +292 @@
                     <div class="item-meta">
                         <span class="activity">
-                            <?php 
+                            <?php
                             if ( 'newest-members' == $_POST['filter'] ) {
                                 echo bp_core_get_last_activity( $user->user_registered, __( 'registered %s ago', 'buddypress' ) );
@@ -308 +308 @@
                 </div>
             </li>
-            <?php   
+            <?php
         }
     } else {