Changeset 4849

Timestamp:

07/25/2011 07:55:01 PM (14 years ago)

Author:

djpaul

Message:

Align avatars in members' activity streams. Fixes #3364

Location:

trunk

Files:

• bp-activity/bp-activity-template.php (modified) (2 diffs)
• bp-themes/bp-default/_inc/css/default-rtl.css (modified) (1 diff)
• bp-themes/bp-default/_inc/css/default.css (modified) (3 diffs)
• bp-themes/bp-default/activity/comment.php (modified) (1 diff)
• bp-themes/bp-default/activity/entry.php (modified) (1 diff)

trunk/bp-activity/bp-activity-template.php

@@ -563 +563 @@
      */
     function bp_get_activity_avatar( $args = '' ) {
-        global $bp, $activities_template;
+        global $activities_template, $bp;
 
         $defaults = array(
+            'alt'     => __( 'Profile picture of %s', 'buddypress' ),
+            'class'   => 'avatar',
+            'email'   => false,
             'type'    => 'thumb',
-            'width'   => 20,
-            'height'  => 20,
-            'class'   => 'avatar',
-            'alt'     => __( 'Profile picture of %s', 'buddypress' ),
-            'email'   => false,
             'user_id' => false
         );
@@ -577 +575 @@
         $r = wp_parse_args( $args, $defaults );
         extract( $r, EXTR_SKIP );
+
+        if ( !isset( $height ) && !isset( $width ) ) {  // Backpat
+            if ( 'full' == $type ) {
+                $height = $bp->avatar->full->height;
+                $width  = $bp->avatar->full->width;
+
+            } elseif ( 'thumb' == $type ) {
+                $height = $bp->avatar->thumb->height;
+                $width  = $bp->avatar->thumb->width;
+            }
+        }
+
+        // Backpat
+        if ( !isset( $width ) )
+            $width = 20;
+
+        if ( !isset( $height ) )
+            $height = 20;
 
         // Within the loop, we the current activity should be set first to the

trunk/bp-themes/bp-default/_inc/css/default-rtl.css

@@ -418 +418 @@
     margin-left: 0;
 }
-.activity-list li.activity_comment .activity-avatar img.avatar,
-.activity-list li.activity_comment .activity-avatar img.FB_profile_pic {
-    margin-right: 10px;
-    margin-left: 0;
-}
-body.activity-permalink .activity-list li .activity-avatar img.avatar,
-body.activity-permalink .activity-list li .activity-avatar img.FB_profile_pic {
-    margin-left: auto;
-    margin-right: 0;
-}
 body.activity-permalink .activity-list li .activity-header > p {
     margin-left: auto;

trunk/bp-themes/bp-default/_inc/css/default.css

@@ -1127 +1127 @@
     width: 20px;
 }
-.activity-list li.activity_comment .activity-avatar img.avatar,
-.activity-list li.activity_comment .activity-avatar img.FB_profile_pic {
-    height: 40px;
-    margin-left: 20px;
-    width: 40px;
-}
 body.activity-permalink .activity-list > li:first-child {
     padding-top: 0;
-}
-body.activity-permalink .activity-list li .activity-avatar img.avatar,
-body.activity-permalink .activity-list li .activity-avatar img.FB_profile_pic {
-    height: 100px;
-    margin-left: 0;
-    width: 100px;
 }
 .activity-list li .activity-content {
@@ -1175 +1163 @@
     overflow: hidden;
     padding: 0;
-}
-.activity-list .activity-avatar img {
-    width: 50px;
-    height: 50px;
-}
-body.activity-permalink .activity-list .activity-avatar img {
-    width: 100px;
-    height: 100px;
 }
 .activity-list .activity-content {
@@ -1384 +1364 @@
     border-width: 2px !important;
     float: left;
+    height: 25px;
     margin-right: 10px;
+    width: 25px;
 }
 div.activity-comments div.acomment-content {

trunk/bp-themes/bp-default/activity/comment.php

@@ -18 +18 @@
     <div class="acomment-avatar">
         <a href="<?php bp_activity_comment_user_link(); ?>">
-            <?php bp_activity_avatar( 'type=full&width=25&height=25&user_id=' . bp_get_activity_comment_user_id() ); ?>
+            <?php bp_activity_avatar( 'type=thumb&user_id=' . bp_get_activity_comment_user_id() ); ?>
         </a>
     </div>

trunk/bp-themes/bp-default/activity/entry.php

@@ -19 +19 @@
         <a href="<?php bp_activity_user_link(); ?>">
 
-            <?php bp_activity_avatar( 'type=full&width=100&height=100' ); ?>
+            <?php bp_activity_avatar( 'type=thumb' ); ?>
 
         </a>