<!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][3808] trunk/bp-themes/bp-default/members/single: Clean up single member root template files</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>3808</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-22 08:58:56 +0000 (Sat, 22 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up single member root template files</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultmemberssingleactivityphp">trunk/bp-themes/bp-default/members/single/activity.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssingleblogsphp">trunk/bp-themes/bp-default/members/single/blogs.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglefriendsphp">trunk/bp-themes/bp-default/members/single/friends.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglegroupsphp">trunk/bp-themes/bp-default/members/single/groups.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglehomephp">trunk/bp-themes/bp-default/members/single/home.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglememberheaderphp">trunk/bp-themes/bp-default/members/single/member-header.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglemessagesphp">trunk/bp-themes/bp-default/members/single/messages.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglepluginsphp">trunk/bp-themes/bp-default/members/single/plugins.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssingleprofilephp">trunk/bp-themes/bp-default/members/single/profile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefaultmemberssingleactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/activity.php (3807 => 3808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/activity.php 2011-01-22 08:42:46 UTC (rev 3807)
+++ trunk/bp-themes/bp-default/members/single/activity.php 2011-01-22 08:58:56 UTC (rev 3808)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> <div class="item-list-tabs no-ajax" id="subnav" role="navigation">
</span><span class="cx"> <ul>
</span><ins>+
</ins><span class="cx"> <?php bp_get_options_nav() ?>
</span><span class="cx">
</span><span class="cx"> <li id="activity-filter-select" class="last">
</span><span class="lines">@@ -7,44 +8,58 @@
</span><span class="cx"> <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
</span><span class="cx"> <option value="activity_update"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
</span><span class="cx">
</span><del>- <?php if ( 'groups' != bp_current_action() ) : ?>
- <?php if ( bp_is_active( 'blogs' ) ) : ?>
</del><ins>+ <?php
+ if ( 'groups' != bp_current_action() ) :
+ if ( bp_is_active( 'blogs' ) ) : ?>
+
</ins><span class="cx"> <option value="new_blog_post"><?php _e( 'Show Blog Posts', 'buddypress' ) ?></option>
</span><span class="cx"> <option value="new_blog_comment"><?php _e( 'Show Blog Comments', 'buddypress' ) ?></option>
</span><del>- <?php endif; ?>
</del><span class="cx">
</span><del>- <?php if ( bp_is_active( 'friends' ) ) : ?>
</del><ins>+ <?php
+ endif;
+
+ if ( bp_is_active( 'friends' ) ) : ?>
+
</ins><span class="cx"> <option value="friendship_accepted,friendship_created"><?php _e( 'Show Friendship Connections', 'buddypress' ) ?></option>
</span><del>- <?php endif; ?>
- <?php endif; ?>
</del><span class="cx">
</span><del>- <?php if ( bp_is_active( 'forums' ) ) : ?>
</del><ins>+ <?php endif;
+
+ endif;
+
+ if ( bp_is_active( 'forums' ) ) : ?>
+
</ins><span class="cx"> <option value="new_forum_topic"><?php _e( 'Show New Forum Topics', 'buddypress' ) ?></option>
</span><span class="cx"> <option value="new_forum_post"><?php _e( 'Show Forum Replies', 'buddypress' ) ?></option>
</span><del>- <?php endif; ?>
</del><span class="cx">
</span><del>- <?php if ( bp_is_active( 'groups' ) ) : ?>
</del><ins>+ <?php endif;
+
+ if ( bp_is_active( 'groups' ) ) : ?>
+
</ins><span class="cx"> <option value="created_group"><?php _e( 'Show New Groups', 'buddypress' ) ?></option>
</span><span class="cx"> <option value="joined_group"><?php _e( 'Show New Group Memberships', 'buddypress' ) ?></option>
</span><del>- <?php endif; ?>
</del><span class="cx">
</span><del>- <?php do_action( 'bp_member_activity_filter_options' ) ?>
</del><ins>+ <?php endif;
+
+ do_action( 'bp_member_activity_filter_options' ); ?>
+
</ins><span class="cx"> </select>
</span><span class="cx"> </li>
</span><span class="cx"> </ul>
</span><span class="cx"> </div><!-- .item-list-tabs -->
</span><span class="cx">
</span><del>-<?php do_action( 'bp_before_member_activity_post_form' ) ?>
</del><ins>+<?php do_action( 'bp_before_member_activity_post_form' ); ?>
</ins><span class="cx">
</span><del>-<?php if ( is_user_logged_in() && bp_is_my_profile() && ( '' == bp_current_action() || 'just-me' == bp_current_action() ) ) : ?>
- <?php locate_template( array( 'activity/post-form.php'), true ) ?>
-<?php endif; ?>
</del><ins>+<?php
+if ( is_user_logged_in() && bp_is_my_profile() && ( !bp_is_current_action() || bp_is_current_action( 'just-me' ) ) )
+ locate_template( array( 'activity/post-form.php'), true );
</ins><span class="cx">
</span><del>-<?php do_action( 'bp_after_member_activity_post_form' ) ?>
-<?php do_action( 'bp_before_member_activity_content' ) ?>
</del><ins>+do_action( 'bp_after_member_activity_post_form' );
+do_action( 'bp_before_member_activity_content' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div class="activity" role="main">
</span><del>- <?php locate_template( array( 'activity/activity-loop.php' ), true ) ?>
</del><ins>+
+ <?php locate_template( array( 'activity/activity-loop.php' ), true ); ?>
+
</ins><span class="cx"> </div><!-- .activity -->
</span><span class="cx">
</span><del>-<?php do_action( 'bp_after_member_activity_content' ) ?>
</del><ins>+<?php do_action( 'bp_after_member_activity_content' ); ?>
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssingleblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/blogs.php (3807 => 3808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/blogs.php 2011-01-22 08:42:46 UTC (rev 3807)
+++ trunk/bp-themes/bp-default/members/single/blogs.php 2011-01-22 08:58:56 UTC (rev 3808)
</span><span class="lines">@@ -1,24 +1,30 @@
</span><span class="cx"> <div class="item-list-tabs" id="subnav" role="navigation">
</span><span class="cx"> <ul>
</span><del>- <?php bp_get_options_nav() ?>
</del><span class="cx">
</span><ins>+ <?php bp_get_options_nav(); ?>
+
</ins><span class="cx"> <li id="blogs-order-select" class="last filter">
</span><del>- <?php _e( 'Order By:', 'buddypress' ) ?>
</del><ins>+
+ <?php _e( 'Order By:', 'buddypress' ); ?>
+
</ins><span class="cx"> <select id="blogs-all">
</span><del>- <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>
- <option value="newest"><?php _e( 'Newest', 'buddypress' ) ?></option>
- <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>
</del><ins>+ <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option>
+ <option value="newest"><?php _e( 'Newest', 'buddypress' ); ?></option>
+ <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_member_blog_order_options' ) ?>
</del><ins>+ <?php do_action( 'bp_member_blog_order_options' ); ?>
+
</ins><span class="cx"> </select>
</span><span class="cx"> </li>
</span><span class="cx"> </ul>
</span><span class="cx"> </div><!-- .item-list-tabs -->
</span><span class="cx">
</span><del>-<?php do_action( 'bp_before_member_blogs_content' ) ?>
</del><ins>+<?php do_action( 'bp_before_member_blogs_content' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div class="blogs myblogs" role="main">
</span><del>- <?php locate_template( array( 'blogs/blogs-loop.php' ), true ) ?>
</del><ins>+
+ <?php locate_template( array( 'blogs/blogs-loop.php' ), true ); ?>
+
</ins><span class="cx"> </div><!-- .blogs.myblogs -->
</span><span class="cx">
</span><del>-<?php do_action( 'bp_after_member_blogs_content' ) ?>
</del><ins>+<?php do_action( 'bp_after_member_blogs_content' ); ?>
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglefriendsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/friends.php (3807 => 3808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/friends.php 2011-01-22 08:42:46 UTC (rev 3807)
+++ trunk/bp-themes/bp-default/members/single/friends.php 2011-01-22 08:58:56 UTC (rev 3808)
</span><span class="lines">@@ -1,34 +1,37 @@
</span><span class="cx"> <div class="item-list-tabs no-ajax" id="subnav" role="navigation">
</span><span class="cx"> <ul>
</span><del>- <?php if ( bp_is_my_profile() ) : ?>
- <?php bp_get_options_nav() ?>
- <?php endif; ?>
</del><ins>+ <?php if ( bp_is_my_profile() ) bp_get_options_nav(); ?>
</ins><span class="cx">
</span><span class="cx"> <li id="members-order-select" class="last filter">
</span><span class="cx">
</span><span class="cx"> <?php _e( 'Order By:', 'buddypress' ) ?>
</span><ins>+
</ins><span class="cx"> <select id="members-all">
</span><span class="cx"> <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>
</span><span class="cx"> <option value="newest"><?php _e( 'Newest Registered', 'buddypress' ) ?></option>
</span><span class="cx"> <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_member_blog_order_options' ) ?>
</span><ins>+
</ins><span class="cx"> </select>
</span><span class="cx"> </li>
</span><span class="cx"> </ul>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<?php if ( 'requests' == bp_current_action() ) : ?>
- <?php locate_template( array( 'members/single/friends/requests.php' ), true ) ?>
</del><ins>+<?php
</ins><span class="cx">
</span><del>-<?php else : ?>
</del><ins>+if ( bp_is_current_action( 'requests' ) ) :
+ locate_template( array( 'members/single/friends/requests.php' ), true );
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_before_member_friends_content' ) ?>
</del><ins>+else :
+ do_action( 'bp_before_member_friends_content' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div class="members friends">
</span><del>- <?php locate_template( array( 'members/members-loop.php' ), true ) ?>
</del><ins>+
+ <?php locate_template( array( 'members/members-loop.php' ), true ); ?>
+
</ins><span class="cx"> </div><!-- .members.friends -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_member_friends_content' ) ?>
</del><ins>+ <?php do_action( 'bp_after_member_friends_content' ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglegroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/groups.php (3807 => 3808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/groups.php 2011-01-22 08:42:46 UTC (rev 3807)
+++ trunk/bp-themes/bp-default/members/single/groups.php 2011-01-22 08:58:56 UTC (rev 3808)
</span><span class="lines">@@ -1,37 +1,43 @@
</span><span class="cx"> <div class="item-list-tabs no-ajax" id="subnav" role="navigation">
</span><span class="cx"> <ul>
</span><del>- <?php if ( bp_is_my_profile() ) : ?>
- <?php bp_get_options_nav() ?>
- <?php endif; ?>
</del><ins>+ <?php if ( bp_is_my_profile() ) bp_get_options_nav(); ?>
</ins><span class="cx">
</span><del>- <?php if ( 'invites' != bp_current_action() ) : ?>
- <li id="groups-order-select" class="last filter">
</del><ins>+ <?php if ( !bp_is_current_action( 'invites' ) ) : ?>
</ins><span class="cx">
</span><del>- <?php _e( 'Order By:', 'buddypress' ) ?>
- <select id="groups-sort-by">
- <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>
- <option value="popular"><?php _e( 'Most Members', 'buddypress' ) ?></option>
- <option value="newest"><?php _e( 'Newly Created', 'buddypress' ) ?></option>
- <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>
</del><ins>+ <li id="groups-order-select" class="last filter">
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_member_group_order_options' ) ?>
- </select>
- </li>
</del><ins>+ <?php _e( 'Order By:', 'buddypress' ) ?>
+
+ <select id="groups-sort-by">
+ <option value="active"><?php _e( 'Last Active', 'buddypress' ); ?></option>
+ <option value="popular"><?php _e( 'Most Members', 'buddypress' ); ?></option>
+ <option value="newest"><?php _e( 'Newly Created', 'buddypress' ); ?></option>
+ <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
+
+ <?php do_action( 'bp_member_group_order_options' ) ?>
+
+ </select>
+ </li>
+
</ins><span class="cx"> <?php endif; ?>
</span><ins>+
</ins><span class="cx"> </ul>
</span><span class="cx"> </div><!-- .item-list-tabs -->
</span><span class="cx">
</span><del>-<?php if ( 'invites' == bp_current_action() ) : ?>
- <?php locate_template( array( 'members/single/groups/invites.php' ), true ) ?>
</del><ins>+<?php
</ins><span class="cx">
</span><del>-<?php else : ?>
</del><ins>+if ( bp_is_current_action( 'invites' ) ) :
+ locate_template( array( 'members/single/groups/invites.php' ), true );
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_before_member_groups_content' ) ?>
</del><ins>+else :
+ do_action( 'bp_before_member_groups_content' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div class="groups mygroups">
</span><del>- <?php locate_template( array( 'groups/groups-loop.php' ), true ) ?>
</del><ins>+
+ <?php locate_template( array( 'groups/groups-loop.php' ), true ); ?>
+
</ins><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_member_groups_content' ) ?>
</del><ins>+ <?php do_action( 'bp_after_member_groups_content' ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglehomephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/home.php (3807 => 3808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/home.php 2011-01-22 08:42:46 UTC (rev 3807)
+++ trunk/bp-themes/bp-default/members/single/home.php 2011-01-22 08:58:56 UTC (rev 3808)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>-<?php get_header() ?>
</del><ins>+<?php get_header(); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="content">
</span><span class="cx"> <div class="padder">
</span><span class="cx">
</span><del>- <?php do_action( 'bp_before_member_home_content' ) ?>
</del><ins>+ <?php do_action( 'bp_before_member_home_content' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="item-header" role="complementary">
</span><span class="cx">
</span><span class="lines">@@ -15,44 +15,43 @@
</span><span class="cx"> <div class="item-list-tabs no-ajax" id="object-nav" role="navigation">
</span><span class="cx"> <ul>
</span><span class="cx">
</span><del>- <?php bp_get_displayed_user_nav() ?>
</del><ins>+ <?php bp_get_displayed_user_nav(); ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_member_options_nav' ) ?>
</del><ins>+ <?php do_action( 'bp_member_options_nav' ); ?>
</ins><span class="cx">
</span><span class="cx"> </ul>
</span><span class="cx"> </div>
</span><span class="cx"> </div><!-- #item-nav -->
</span><span class="cx">
</span><span class="cx"> <div id="item-body">
</span><del>- <?php do_action( 'bp_before_member_body' ); ?>
</del><ins>+ <?php do_action( 'bp_before_member_body' );
</ins><span class="cx">
</span><del>- <?php if ( bp_is_user_activity() || !bp_current_component() ) : ?>
- <?php locate_template( array( 'members/single/activity.php' ), true ); ?>
</del><ins>+ if ( bp_is_user_activity() || !bp_current_component() ) :
+ locate_template( array( 'members/single/activity.php' ), true );
</ins><span class="cx">
</span><del>- <?php elseif ( bp_is_user_blogs() ) : ?>
- <?php locate_template( array( 'members/single/blogs.php' ), true ); ?>
</del><ins>+ elseif ( bp_is_user_blogs() ) :
+ locate_template( array( 'members/single/blogs.php' ), true );
</ins><span class="cx">
</span><del>- <?php elseif ( bp_is_user_friends() ) : ?>
- <?php locate_template( array( 'members/single/friends.php' ), true ); ?>
</del><ins>+ elseif ( bp_is_user_friends() ) :
+ locate_template( array( 'members/single/friends.php' ), true );
</ins><span class="cx">
</span><del>- <?php elseif ( bp_is_user_groups() ) : ?>
- <?php locate_template( array( 'members/single/groups.php' ), true ); ?>
</del><ins>+ elseif ( bp_is_user_groups() ) :
+ locate_template( array( 'members/single/groups.php' ), true );
</ins><span class="cx">
</span><del>- <?php elseif ( bp_is_user_messages() ) : ?>
- <?php locate_template( array( 'members/single/messages.php' ), true ); ?>
</del><ins>+ elseif ( bp_is_user_messages() ) :
+ locate_template( array( 'members/single/messages.php' ), true );
</ins><span class="cx">
</span><del>- <?php elseif ( bp_is_user_profile() ) : ?>
- <?php locate_template( array( 'members/single/profile.php' ), true ); ?>
</del><ins>+ elseif ( bp_is_user_profile() ) :
+ locate_template( array( 'members/single/profile.php' ), true );
</ins><span class="cx">
</span><del>- <?php else : ?>
- <?php
- // If nothing sticks, load a generic template
- locate_template( array( 'members/single/front.php' ), true );
- ?>
- <?php endif; ?>
</del><ins>+ // If nothing sticks, load a generic template
+ else :
+ locate_template( array( 'members/single/front.php' ), true );
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_after_member_body' ); ?>
</del><ins>+ endif;
</ins><span class="cx">
</span><ins>+ do_action( 'bp_after_member_body' ); ?>
+
</ins><span class="cx"> </div><!-- #item-body -->
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_member_home_content' ); ?>
</span><span class="lines">@@ -61,4 +60,4 @@
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><del>-<?php get_footer() ?>
</del><ins>+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglememberheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/member-header.php (3807 => 3808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/member-header.php 2011-01-22 08:42:46 UTC (rev 3807)
+++ trunk/bp-themes/bp-default/members/single/member-header.php 2011-01-22 08:58:56 UTC (rev 3808)
</span><span class="lines">@@ -1,23 +1,33 @@
</span><del>-<?php do_action( 'bp_before_member_header' ) ?>
</del><ins>+<?php do_action( 'bp_before_member_header' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="item-header-avatar">
</span><del>- <a href="<?php bp_user_link() ?>">
- <?php bp_displayed_user_avatar( 'type=full' ) ?>
</del><ins>+ <a href="<?php bp_user_link(); ?>">
+
+ <?php bp_displayed_user_avatar( 'type=full' ); ?>
+
</ins><span class="cx"> </a>
</span><span class="cx"> </div><!-- #item-header-avatar -->
</span><span class="cx">
</span><span class="cx"> <div id="item-header-content">
</span><span class="cx">
</span><del>- <h2 class="fn"><a href="<?php bp_displayed_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>+ <h2 class="fn">
+ <a href="<?php bp_displayed_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>- <?php do_action( 'bp_before_member_header_meta' ) ?>
</del><ins>+ <?php do_action( 'bp_before_member_header_meta' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="item-meta">
</span><ins>+
</ins><span class="cx"> <?php if ( bp_is_active( 'activity' ) ) : ?>
</span><ins>+
</ins><span class="cx"> <div id="latest-update">
</span><del>- <?php bp_activity_latest_update( bp_displayed_user_id() ) ?>
</del><ins>+
+ <?php bp_activity_latest_update( bp_displayed_user_id() ); ?>
+
</ins><span class="cx"> </div>
</span><ins>+
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <div id="item-buttons">
</span><span class="lines">@@ -27,18 +37,18 @@
</span><span class="cx"> </div><!-- #item-buttons -->
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- /***
- * 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>+ /***
+ * If you'd like to show specific profile fields here use:
+ * bp_profile_field_data( 'field=About Me' ); -- Pass the name of the field
+ */
+ do_action( 'bp_profile_header_meta' );
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_profile_header_meta' ) ?>
</del><ins>+ ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- #item-meta -->
</span><span class="cx">
</span><span class="cx"> </div><!-- #item-header-content -->
</span><span class="cx">
</span><del>-<?php do_action( 'bp_after_member_header' ) ?>
</del><ins>+<?php do_action( 'bp_after_member_header' ); ?>
</ins><span class="cx">
</span><del>-<?php do_action( 'template_notices' ) ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php do_action( 'template_notices' ); ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglemessagesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/messages.php (3807 => 3808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/messages.php 2011-01-22 08:42:46 UTC (rev 3807)
+++ trunk/bp-themes/bp-default/members/single/messages.php 2011-01-22 08:58:56 UTC (rev 3808)
</span><span class="lines">@@ -8,10 +8,10 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>- if ( 'compose' == bp_current_action() ) :
</del><ins>+ if ( bp_is_current_action( 'compose' ) ) :
</ins><span class="cx"> locate_template( array( 'members/single/messages/compose.php' ), true );
</span><span class="cx">
</span><del>- elseif ( 'view' == bp_current_action() ) :
</del><ins>+ elseif ( bp_is_current_action( 'view' ) ) :
</ins><span class="cx"> locate_template( array( 'members/single/messages/single.php' ), true );
</span><span class="cx">
</span><span class="cx"> else :
</span><span class="lines">@@ -20,13 +20,10 @@
</span><span class="cx"> <div class="messages" role="main">
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- if ( 'notices' == bp_current_action() ) :
</del><ins>+ if ( bp_is_current_action( 'notices' ) )
</ins><span class="cx"> locate_template( array( 'members/single/messages/notices-loop.php' ), true );
</span><del>-
- else :
</del><ins>+ else
</ins><span class="cx"> locate_template( array( 'members/single/messages/messages-loop.php' ), true );
</span><del>-
- endif;
</del><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- .messages -->
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglepluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/plugins.php (3807 => 3808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/plugins.php 2011-01-22 08:42:46 UTC (rev 3807)
+++ trunk/bp-themes/bp-default/members/single/plugins.php 2011-01-22 08:58:56 UTC (rev 3808)
</span><span class="lines">@@ -1,48 +1,54 @@
</span><del>-<?php get_header() ?>
</del><ins>+<?php get_header(); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="content">
</span><span class="cx"> <div class="padder">
</span><span class="cx">
</span><del>- <?php do_action( 'bp_before_member_plugin_template' ) ?>
</del><ins>+ <?php do_action( 'bp_before_member_plugin_template' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="item-header">
</span><del>- <?php locate_template( array( 'members/single/member-header.php' ), true ) ?>
</del><ins>+
+ <?php locate_template( array( 'members/single/member-header.php' ), true ); ?>
+
</ins><span class="cx"> </div><!-- #item-header -->
</span><span class="cx">
</span><span class="cx"> <div id="item-nav">
</span><span class="cx"> <div class="item-list-tabs no-ajax" id="object-nav" role="navigation">
</span><span class="cx"> <ul>
</span><del>- <?php bp_get_displayed_user_nav() ?>
</del><span class="cx">
</span><del>- <?php do_action( 'bp_member_options_nav' ) ?>
</del><ins>+ <?php bp_get_displayed_user_nav(); ?>
+
+ <?php do_action( 'bp_member_options_nav' ); ?>
+
</ins><span class="cx"> </ul>
</span><span class="cx"> </div>
</span><span class="cx"> </div><!-- #item-nav -->
</span><span class="cx">
</span><span class="cx"> <div id="item-body" role="main">
</span><del>- <?php do_action( 'bp_before_member_body' ) ?>
</del><span class="cx">
</span><ins>+ <?php do_action( 'bp_before_member_body' ); ?>
+
</ins><span class="cx"> <div class="item-list-tabs no-ajax" id="subnav">
</span><span class="cx"> <ul>
</span><del>- <?php bp_get_options_nav() ?>
</del><span class="cx">
</span><del>- <?php do_action( 'bp_member_plugin_options_nav' ) ?>
</del><ins>+ <?php bp_get_options_nav(); ?>
+
+ <?php do_action( 'bp_member_plugin_options_nav' ); ?>
+
</ins><span class="cx"> </ul>
</span><span class="cx"> </div><!-- .item-list-tabs -->
</span><span class="cx">
</span><del>- <h3><?php do_action( 'bp_template_title' ) ?></h3>
</del><ins>+ <h3><?php do_action( 'bp_template_title' ); ?></h3>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_template_content' ) ?>
</del><ins>+ <?php do_action( 'bp_template_content' ); ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_after_member_body' ) ?>
</del><ins>+ <?php do_action( 'bp_after_member_body' ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- #item-body -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_member_plugin_template' ) ?>
</del><ins>+ <?php do_action( 'bp_after_member_plugin_template' ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- .padder -->
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx">
</span><del>- <?php get_sidebar() ?>
-
-<?php get_footer() ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php get_sidebar(); ?>
+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssingleprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/profile.php (3807 => 3808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/profile.php 2011-01-22 08:42:46 UTC (rev 3807)
+++ trunk/bp-themes/bp-default/members/single/profile.php 2011-01-22 08:58:56 UTC (rev 3808)
</span><span class="lines">@@ -15,19 +15,14 @@
</span><span class="cx"> <div class="profile" role="main">
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- if ( 'edit' == bp_current_action() ) :
</del><ins>+ if ( bp_is_current_action( 'edit' ) )
</ins><span class="cx"> locate_template( array( 'members/single/profile/edit.php' ), true );
</span><del>-
- elseif ( 'change-avatar' == bp_current_action() ) :
</del><ins>+ elseif ( bp_is_current_action( 'change-avatar' ) )
</ins><span class="cx"> locate_template( array( 'members/single/profile/change-avatar.php' ), true );
</span><del>-
- elseif ( bp_is_active( 'profile' ) ) :
</del><ins>+ elseif ( bp_is_active( 'profile' ) )
</ins><span class="cx"> locate_template( array( 'members/single/profile/profile-loop.php' ), true );
</span><del>-
- else :
</del><ins>+ else
</ins><span class="cx"> locate_template( array( 'members/single/profile/profile-wp.php' ), true );
</span><del>-
- endif;
</del><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- .profile -->
</span></span></pre>
</div>
</div>
</body>
</html>