<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][4849] trunk: Align avatars in members' activity streams.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/4849">4849</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-07-25 19:55:01 +0000 (Mon, 25 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Align avatars in members' activity streams. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3364">#3364</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultrtlcss">trunk/bp-themes/bp-default/_inc/css/default-rtl.css</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultactivitycommentphp">trunk/bp-themes/bp-default/activity/comment.php</a></li>
<li><a href="#trunkbpthemesbpdefaultactivityentryphp">trunk/bp-themes/bp-default/activity/entry.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (4848 => 4849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2011-07-25 00:30:53 UTC (rev 4848)
+++ trunk/bp-activity/bp-activity-template.php 2011-07-25 19:55:01 UTC (rev 4849)
</span><span class="lines">@@ -562,21 +562,37 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function bp_get_activity_avatar( $args = '' ) {
</span><del>- global $bp, $activities_template;
</del><ins>+ global $activities_template, $bp;
</ins><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'type' => 'thumb',
- 'width' => 20,
- 'height' => 20,
</del><ins>+ 'alt' => __( 'Profile picture of %s', 'buddypress' ),
</ins><span class="cx"> 'class' => 'avatar',
</span><del>- 'alt' => __( 'Profile picture of %s', 'buddypress' ),
</del><span class="cx"> 'email' => false,
</span><ins>+ 'type' => 'thumb',
</ins><span class="cx"> 'user_id' => false
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><ins>+ 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;
+
</ins><span class="cx"> // Within the loop, we the current activity should be set first to the
</span><span class="cx"> // current_comment, if available
</span><span class="cx"> $current_activity_item = isset( $activities_template->activity->current_comment ) ? $activities_template->activity->current_comment : $activities_template->activity;
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default-rtl.css (4848 => 4849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default-rtl.css 2011-07-25 00:30:53 UTC (rev 4848)
+++ trunk/bp-themes/bp-default/_inc/css/default-rtl.css 2011-07-25 19:55:01 UTC (rev 4849)
</span><span class="lines">@@ -417,16 +417,6 @@
</span><span class="cx"> margin-right: 30px;
</span><span class="cx"> margin-left: 0;
</span><span class="cx"> }
</span><del>-.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;
-}
</del><span class="cx"> body.activity-permalink .activity-list li .activity-header > p {
</span><span class="cx"> margin-left: auto;
</span><span class="cx"> margin-right: -35px;
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (4848 => 4849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2011-07-25 00:30:53 UTC (rev 4848)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2011-07-25 19:55:01 UTC (rev 4849)
</span><span class="lines">@@ -1126,21 +1126,9 @@
</span><span class="cx"> margin-left: 30px;
</span><span class="cx"> width: 20px;
</span><span class="cx"> }
</span><del>-.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;
-}
</del><span class="cx"> body.activity-permalink .activity-list > li:first-child {
</span><span class="cx"> padding-top: 0;
</span><span class="cx"> }
</span><del>-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;
-}
</del><span class="cx"> .activity-list li .activity-content {
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="lines">@@ -1175,14 +1163,6 @@
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> padding: 0;
</span><span class="cx"> }
</span><del>-.activity-list .activity-avatar img {
- width: 50px;
- height: 50px;
-}
-body.activity-permalink .activity-list .activity-avatar img {
- width: 100px;
- height: 100px;
-}
</del><span class="cx"> .activity-list .activity-content {
</span><span class="cx"> margin-left: 70px;
</span><span class="cx"> margin-bottom: 15px;
</span><span class="lines">@@ -1383,7 +1363,9 @@
</span><span class="cx"> div.activity-comments div.acomment-avatar img {
</span><span class="cx"> border-width: 2px !important;
</span><span class="cx"> float: left;
</span><ins>+ height: 25px;
</ins><span class="cx"> margin-right: 10px;
</span><ins>+ width: 25px;
</ins><span class="cx"> }
</span><span class="cx"> div.activity-comments div.acomment-content {
</span><span class="cx"> font-size: 11px;
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultactivitycommentphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/activity/comment.php (4848 => 4849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/comment.php 2011-07-25 00:30:53 UTC (rev 4848)
+++ trunk/bp-themes/bp-default/activity/comment.php 2011-07-25 19:55:01 UTC (rev 4849)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> <li id="acomment-<?php bp_activity_comment_id(); ?>">
</span><span class="cx"> <div class="acomment-avatar">
</span><span class="cx"> <a href="<?php bp_activity_comment_user_link(); ?>">
</span><del>- <?php bp_activity_avatar( 'type=full&width=25&height=25&user_id=' . bp_get_activity_comment_user_id() ); ?>
</del><ins>+ <?php bp_activity_avatar( 'type=thumb&user_id=' . bp_get_activity_comment_user_id() ); ?>
</ins><span class="cx"> </a>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultactivityentryphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/activity/entry.php (4848 => 4849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/entry.php 2011-07-25 00:30:53 UTC (rev 4848)
+++ trunk/bp-themes/bp-default/activity/entry.php 2011-07-25 19:55:01 UTC (rev 4849)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> <div class="activity-avatar">
</span><span class="cx"> <a href="<?php bp_activity_user_link(); ?>">
</span><span class="cx">
</span><del>- <?php bp_activity_avatar( 'type=full&width=100&height=100' ); ?>
</del><ins>+ <?php bp_activity_avatar( 'type=thumb' ); ?>
</ins><span class="cx">
</span><span class="cx"> </a>
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>