<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2145] trunk: Fixing up group and profile page sidebars.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2145</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-11-26 21:34:54 +0000 (Thu, 26 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing up group and profile page sidebars.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssscreencss">trunk/bp-themes/bp-default/_inc/css/screen.css</a></li>
<li><a href="#trunkbpthemesbpdefault_incimagesleftmenu_group_headergif">trunk/bp-themes/bp-default/_inc/images/leftmenu_group_header.gif</a></li>
<li><a href="#trunkbpthemesbpsnparentgroupssinglemenuphp">trunk/bp-themes/bp-sn-parent/groups/single/menu.php</a></li>
<li><a href="#trunkbpthemesbpsnparentprofileprofilemenuphp">trunk/bp-themes/bp-sn-parent/profile/profile-menu.php</a></li>
<li><a href="#trunkbpxprofilebpxprofiletemplatetagsphp">trunk/bp-xprofile/bp-xprofile-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2144 => 2145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2009-11-26 20:05:18 UTC (rev 2144)
+++ trunk/bp-core/bp-core-templatetags.php 2009-11-26 21:34:54 UTC (rev 2145)
</span><span class="lines">@@ -418,7 +418,8 @@
</span><span class="cx"> else
</span><span class="cx"> return apply_filters( 'bp_word_or_name', $youtext );
</span><span class="cx"> } else {
</span><del>- $nametext = sprintf( $nametext, $bp->displayed_user->fullname );
</del><ins>+ $fullname = (array)explode( ' ', $bp->displayed_user->fullname );
+ $nametext = sprintf( $nametext, $fullname[0] );
</ins><span class="cx"> if ( $echo )
</span><span class="cx"> echo apply_filters( 'bp_word_or_name', $nametext );
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssscreencss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/screen.css (2144 => 2145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/screen.css 2009-11-26 20:05:18 UTC (rev 2144)
+++ trunk/bp-themes/bp-default/_inc/css/screen.css 2009-11-26 21:34:54 UTC (rev 2145)
</span><span class="lines">@@ -470,15 +470,16 @@
</span><span class="cx"> }
</span><span class="cx"> div.bp-widget h4 {
</span><span class="cx"> position: relative;
</span><del>- background: url(../images/group_header.gif) repeat-x top left;
</del><ins>+ background: url(../images/group_header.gif) repeat-x bottom left;
</ins><span class="cx"> color: #fff;
</span><span class="cx"> padding: 6px 10px 15px 10px;
</span><span class="cx"> font: bold 1em "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif !important;
</span><span class="cx"> margin-bottom: 10px;
</span><span class="cx"> }
</span><span class="cx"> .left-menu div.bp-widget h4 {
</span><del>- background: url(../images/leftmenu_group_header.gif) top left no-repeat;
</del><ins>+ background: #d5d5d5 url(../images/leftmenu_group_header.gif) bottom left no-repeat;
</ins><span class="cx"> color: #555;
</span><ins>+ padding-bottom: 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* "See All" links in widget headers */
</span><span class="lines">@@ -488,6 +489,10 @@
</span><span class="cx"> color: #fff;
</span><span class="cx"> font-weight: normal;
</span><span class="cx"> }
</span><ins>+ .left-menu div.bp-widget h4 a {
+ color: inherit;
+ font-weight: inherit;
+ }
</ins><span class="cx">
</span><span class="cx"> ul.horiz-gallery {
</span><span class="cx"> list-style: none;
</span><span class="lines">@@ -1296,17 +1301,24 @@
</span><span class="cx"> margin-left: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ .activity-list li.mini .activity-content {
+ margin-right: 70px;
+ }
+
</ins><span class="cx"> .activity-list li.mini .activity-content p {
</span><span class="cx"> margin: 0;
</span><span class="cx"> float: left;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .activity-list li.mini .activity-meta {
</span><del>- float: right;
</del><ins>+ position: absolute;
+ right: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .activity-list li.mini .activity-comments {
</span><span class="cx"> clear: left;
</span><ins>+ font-size: 1.1em;
+ margin-top: 30px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .activity-list li div.activity-avatar {
</span><span class="lines">@@ -1469,8 +1481,8 @@
</span><span class="cx"> div.activity-meta a.acomment-reply {
</span><span class="cx"> font-size: 0.9em;
</span><span class="cx"> background: #FFF9DB;
</span><del>- border-bottom:1px solid #FFE8C4;
- border-right:1px solid #FFE8C4;
</del><ins>+ border-bottom: 1px solid #FFE8C4;
+ border-right: 1px solid #FFE8C4;
</ins><span class="cx"> color: #888;
</span><span class="cx"> padding: 4px 8px;
</span><span class="cx"> text-decoration: none;
</span><span class="lines">@@ -1495,12 +1507,13 @@
</span><span class="cx"> padding-left: 0;
</span><span class="cx"> margin: 0;
</span><span class="cx"> margin-bottom: 20px;
</span><ins>+ margin-left: -10px !important;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div.activity-comments ul li {
</span><span class="cx"> border-top: 1px solid #eee;
</span><del>- padding: 10px 0 !important;
- margin-left: 0;
</del><ins>+ padding: 10px 0 0 0 !important;
+ margin-left: 10px;
</ins><span class="cx"> }
</span><span class="cx"> div.activity-comments ul li p:last-child {
</span><span class="cx"> margin-bottom: 0;
</span><span class="lines">@@ -1508,7 +1521,6 @@
</span><span class="cx">
</span><span class="cx"> div.activity-comments > ul > li:first-child {
</span><span class="cx"> border-top: none;
</span><del>- margin-left: 0 !important;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div.activity-comments > ul:first-child > li:first-child {
</span><span class="lines">@@ -1516,12 +1528,8 @@
</span><span class="cx"> padding-top: 20px !important;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- div.activity-comments ul li:first-child {
- margin-left: 10px;
- }
-
</del><span class="cx"> div.activity-comments ul li:last-child {
</span><del>- margin-bottom: -8px;
</del><ins>+ margin-bottom: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div.activity-comments ul li > ul {
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incimagesleftmenu_group_headergif"></a>
<div class="binary"><h4>Modified: trunk/bp-themes/bp-default/_inc/images/leftmenu_group_header.gif</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkbpthemesbpsnparentgroupssinglemenuphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/groups/single/menu.php (2144 => 2145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/groups/single/menu.php 2009-11-26 20:05:18 UTC (rev 2144)
+++ trunk/bp-themes/bp-sn-parent/groups/single/menu.php 2009-11-26 21:34:54 UTC (rev 2145)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> <?php do_action( 'bp_before_group_member_widget' ) ?>
</span><span class="cx">
</span><span class="cx"> <div class="bp-widget">
</span><del>- <h4><?php printf( __( 'Members (%d)', 'buddypress' ), bp_get_group_total_members() ); ?> <span><a href="<?php bp_group_all_members_permalink() ?>"><?php _e( 'See All', 'buddypress' ) ?> &rarr;</a></span></h4>
</del><ins>+ <h4><a href="<?php bp_group_all_members_permalink() ?>"><?php printf( __( 'Members (%d)', 'buddypress' ), bp_get_group_total_members() ); ?></a></h4>
</ins><span class="cx">
</span><span class="cx"> <?php if ( bp_group_has_members( 'max=5&exclude_admins_mods=0' ) ) : ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpsnparentprofileprofilemenuphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/profile/profile-menu.php (2144 => 2145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/profile/profile-menu.php 2009-11-26 20:05:18 UTC (rev 2144)
+++ trunk/bp-themes/bp-sn-parent/profile/profile-menu.php 2009-11-26 21:34:54 UTC (rev 2145)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> <?php if ( bp_has_groups( 'type=random&max=15' ) ) : ?>
</span><span class="cx">
</span><span class="cx"> <div class="bp-widget">
</span><del>- <h4><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?> (<?php bp_group_total_for_member() ?>) <span><a href="<?php echo bp_displayed_user_domain() . BP_GROUPS_SLUG ?>">&rarr;</a></span></h4>
</del><ins>+ <h4><a href="<?php echo bp_displayed_user_domain() . BP_GROUPS_SLUG ?>"><?php bp_word_or_name( __( "My Groups", 'buddypress' ), __( "%s's Groups", 'buddypress' ) ) ?></a> (<?php bp_group_total_for_member() ?>)</h4>
</ins><span class="cx">
</span><span class="cx"> <ul class="horiz-gallery">
</span><span class="cx"> <?php while ( bp_groups() ) : bp_the_group(); ?>
</span><span class="lines">@@ -56,12 +56,12 @@
</span><span class="cx"> <?php if ( bp_has_friendships( 'type=random&max=15' ) ) : ?>
</span><span class="cx">
</span><span class="cx"> <div class="bp-widget">
</span><del>- <h4><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?> (<?php bp_friend_total_for_member() ?>) <span><a href="<?php echo bp_displayed_user_domain() . BP_FRIENDS_SLUG ?>">&rarr;</a></span></h4>
</del><ins>+ <h4><a href="<?php echo bp_displayed_user_domain() . BP_FRIENDS_SLUG ?>"><?php bp_word_or_name( __( "My Friends", 'buddypress' ), __( "%s's Friends", 'buddypress' ) ) ?></a> (<?php bp_friend_total_for_member() ?>)</h4>
</ins><span class="cx">
</span><span class="cx"> <ul class="horiz-gallery">
</span><span class="cx"> <?php while ( bp_user_friendships() ) : bp_the_friendship(); ?>
</span><span class="cx"> <li>
</span><del>- <a href="<?php bp_friend_url() ?>"><?php bp_friend_avatar_thumb('width=30&height=30') ?></a>
</del><ins>+ <a href="<?php bp_friend_url() ?>" title="<?php bp_friend_name() ?>"><?php bp_friend_avatar_thumb('width=30&height=30') ?></a>
</ins><span class="cx"> </li>
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx"> </ul>
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofiletemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-templatetags.php (2144 => 2145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-templatetags.php 2009-11-26 20:05:18 UTC (rev 2144)
+++ trunk/bp-xprofile/bp-xprofile-templatetags.php 2009-11-26 21:34:54 UTC (rev 2145)
</span><span class="lines">@@ -117,22 +117,15 @@
</span><span class="cx">
</span><span class="cx"> function has_fields() {
</span><span class="cx"> $has_data = false;
</span><del>- $just_name = true;
</del><span class="cx">
</span><span class="cx"> for ( $i = 0; $i < count( $this->group->fields ); $i++ ) {
</span><span class="cx"> $field = &$this->group->fields[$i];
</span><span class="cx">
</span><span class="cx"> if ( $field->data->value != null ) {
</span><span class="cx"> $has_data = true;
</span><del>-
- if ( 1 != $field->id )
- $just_name = false;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( 1 == $this->group->id && $just_name )
- return false;
-
</del><span class="cx"> if ( $has_data )
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -155,7 +148,7 @@
</span><span class="cx">
</span><span class="cx"> $field = $this->next_field();
</span><span class="cx">
</span><del>- if ( $field->data->value != '' ) {
</del><ins>+ if ( !empty( $field->data->value ) ) {
</ins><span class="cx"> $this->field_has_data = true;
</span><span class="cx"> }
</span><span class="cx"> else {
</span></span></pre>
</div>
</div>
</body>
</html>