<!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] [2566] trunk/bp-themes/bp-default: Fixes #1783</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2566</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-03 15:25:54 +0000 (Wed, 03 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1783</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssinglegroupheaderphp">trunk/bp-themes/bp-default/groups/single/group-header.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglememberheaderphp">trunk/bp-themes/bp-default/members/single/member-header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2565 => 2566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2010-02-03 15:10:18 UTC (rev 2565)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2010-02-03 15:25:54 UTC (rev 2566)
</span><span class="lines">@@ -294,6 +294,8 @@
</span><span class="cx"> div#item-header {
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><ins>+ div#item-header div#item-header-content { margin-left: 170px; }
+
</ins><span class="cx"> div#item-header h2 {
</span><span class="cx"> font-size: 28px;
</span><span class="cx"> margin: 0 0 15px 0;
</span><span class="lines">@@ -381,7 +383,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> div#item-header div#message.info {
</span><del>- margin-left: 170px;
</del><span class="cx"> line-height: 80%;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2565 => 2566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-02-03 15:10:18 UTC (rev 2565)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-02-03 15:25:54 UTC (rev 2566)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> j("li.load-more").addClass('loading');
</span><span class="cx">
</span><span class="cx"> if ( null == j.cookie('bp-activity-oldestpage') )
</span><del>- j.cookie('bp-activity-oldestpage', 1 );
</del><ins>+ j.cookie('bp-activity-oldestpage', 1, {path: '/'} );
</ins><span class="cx">
</span><span class="cx"> var oldest_page = ( j.cookie('bp-activity-oldestpage') * 1 ) + 1;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssinglegroupheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/group-header.php (2565 => 2566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/group-header.php 2010-02-03 15:10:18 UTC (rev 2565)
+++ trunk/bp-themes/bp-default/groups/single/group-header.php 2010-02-03 15:25:54 UTC (rev 2566)
</span><span class="lines">@@ -18,22 +18,26 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><del>-</div>
</del><ins>+</div><!-- #item-actions -->
</ins><span class="cx">
</span><del>-<?php bp_group_avatar() ?>
</del><ins>+<div id="item-header-avatar">
+ <?php bp_group_avatar() ?>
+</div><!-- #item-header-avatar -->
</ins><span class="cx">
</span><del>-<h2><a href="<?php bp_group_permalink() ?>" title="<?php bp_group_name() ?>"><?php bp_group_name() ?></a></h2>
-<span class="highlight"><?php bp_group_type() ?></span> <span class="activity"><?php printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() ) ?></span>
</del><ins>+<div id="item-header-content">
+ <h2><a href="<?php bp_group_permalink() ?>" title="<?php bp_group_name() ?>"><?php bp_group_name() ?></a></h2>
+ <span class="highlight"><?php bp_group_type() ?></span> <span class="activity"><?php printf( __( 'active %s ago', 'buddypress' ), bp_get_group_last_active() ) ?></span>
</ins><span class="cx">
</span><del>-<?php do_action( 'bp_before_group_header_meta' ) ?>
</del><ins>+ <?php do_action( 'bp_before_group_header_meta' ) ?>
</ins><span class="cx">
</span><del>-<div id="item-meta">
- <?php bp_group_description() ?>
</del><ins>+ <div id="item-meta">
+ <?php bp_group_description() ?>
</ins><span class="cx">
</span><del>- <?php bp_group_join_button() ?>
</del><ins>+ <?php bp_group_join_button() ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_group_header_meta' ) ?>
-</div>
</del><ins>+ <?php do_action( 'bp_group_header_meta' ) ?>
+ </div>
+</div><!-- #item-header-content -->
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_group_header' ) ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglememberheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/member-header.php (2565 => 2566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/member-header.php 2010-02-03 15:10:18 UTC (rev 2565)
+++ trunk/bp-themes/bp-default/members/single/member-header.php 2010-02-03 15:25:54 UTC (rev 2566)
</span><span class="lines">@@ -1,48 +1,54 @@
</span><span class="cx"> <?php do_action( 'bp_before_member_header' ) ?>
</span><span class="cx">
</span><del>-<?php bp_displayed_user_avatar( 'type=full' ) ?>
</del><ins>+<div id="item-header-avatar">
+ <?php bp_displayed_user_avatar( 'type=full' ) ?>
+</div><!-- #item-header-avatar -->
</ins><span class="cx">
</span><del>-<h2 class="fn"><a href="<?php bp_user_link() ?>"><?php bp_displayed_user_fullname() ?></a> <span class="highlight">@<?php bp_displayed_user_username() ?> <span>?</span></span></h2>
-<span class="activity"><?php bp_last_activity( bp_displayed_user_id() ) ?></span>
</del><ins>+<div id="item-header-content">
</ins><span class="cx">
</span><del>-<?php do_action( 'bp_before_member_header_meta' ) ?>
</del><ins>+ <h2 class="fn"><a href="<?php bp_user_link() ?>"><?php bp_displayed_user_fullname() ?></a> <span class="highlight">@<?php bp_displayed_user_username() ?> <span>?</span></span></h2>
+ <span class="activity"><?php bp_last_activity( bp_displayed_user_id() ) ?></span>
</ins><span class="cx">
</span><del>-<div id="item-meta">
- <?php if ( function_exists( 'bp_activity_latest_update' ) ) : ?>
- <div id="latest-update">
- <?php bp_activity_latest_update( bp_displayed_user_id() ) ?>
- </div>
- <?php endif; ?>
</del><ins>+ <?php do_action( 'bp_before_member_header_meta' ) ?>
</ins><span class="cx">
</span><del>- <div id="item-buttons">
- <?php if ( function_exists( 'bp_add_friend_button' ) ) : ?>
- <?php bp_add_friend_button() ?>
- <?php endif; ?>
-
- <?php if ( is_user_logged_in() && !bp_is_my_profile() && function_exists( 'bp_send_public_message_link' ) ) : ?>
- <div class="generic-button" id="post-mention">
- <a href="<?php bp_send_public_message_link() ?>" title="<?php _e( 'Mention this user in a new public message, this will send the user a notification to get their attention.', 'buddypress' ) ?>"><?php _e( 'Mention this User', 'buddypress' ) ?></a>
</del><ins>+ <div id="item-meta">
+ <?php if ( function_exists( 'bp_activity_latest_update' ) ) : ?>
+ <div id="latest-update">
+ <?php bp_activity_latest_update( bp_displayed_user_id() ) ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php if ( is_user_logged_in() && !bp_is_my_profile() && function_exists( 'bp_send_private_message_link' ) ) : ?>
- <div class="generic-button" id="send-private-message">
- <a href="<?php bp_send_private_message_link() ?>" title="<?php _e( 'Send a private message to this user.', 'buddypress' ) ?>"><?php _e( 'Send Private Message', 'buddypress' ) ?></a>
- </div>
- <?php endif; ?>
- </div>
</del><ins>+ <div id="item-buttons">
+ <?php if ( function_exists( 'bp_add_friend_button' ) ) : ?>
+ <?php bp_add_friend_button() ?>
+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php
- /***
- * If you'd like to show specific profile fields here use:
- * bp_profile_field_data( 'field=About Me' ); -- Pass the name of the field
- */
- ?>
</del><ins>+ <?php if ( is_user_logged_in() && !bp_is_my_profile() && function_exists( 'bp_send_public_message_link' ) ) : ?>
+ <div class="generic-button" id="post-mention">
+ <a href="<?php bp_send_public_message_link() ?>" title="<?php _e( 'Mention this user in a new public message, this will send the user a notification to get their attention.', 'buddypress' ) ?>"><?php _e( 'Mention this User', 'buddypress' ) ?></a>
+ </div>
+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_profile_header_meta' ) ?>
</del><ins>+ <?php if ( is_user_logged_in() && !bp_is_my_profile() && function_exists( 'bp_send_private_message_link' ) ) : ?>
+ <div class="generic-button" id="send-private-message">
+ <a href="<?php bp_send_private_message_link() ?>" title="<?php _e( 'Send a private message to this user.', 'buddypress' ) ?>"><?php _e( 'Send Private Message', 'buddypress' ) ?></a>
+ </div>
+ <?php endif; ?>
+ </div><!-- #item-buttons -->
</ins><span class="cx">
</span><del>-</div>
</del><ins>+ <?php
+ /***
+ * If you'd like to show specific profile fields here use:
+ * bp_profile_field_data( 'field=About Me' ); -- Pass the name of the field
+ */
+ ?>
</ins><span class="cx">
</span><ins>+ <?php do_action( 'bp_profile_header_meta' ) ?>
+
+ </div><!-- #item-meta -->
+
+</div><!-- #item-header-content -->
+
</ins><span class="cx"> <?php do_action( 'bp_after_member_header' ) ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'template_notices' ) ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>